From 54e3a72065ec52a80a549a224f3b3e437db0c987 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Fri, 27 Jul 2012 02:47:10 +0000
Subject: [PATCH] merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/captcha/captcha.addon.php              |   8 +-
 addons/captcha/captcha.js                     |   4 +-
 addons/captcha/captcha.min.js                 |   2 +-
 .../member_communication.addon.php            |   6 +-
 .../tpl/member_communication.js               |   6 +-
 .../member_extra_info.addon.php               |   2 +-
 .../point_level_icon.addon.php                |   2 +-
 classes/cache/CacheApc.class.php              |  72 +-
 classes/cache/CacheFile.class.php             |  77 +-
 classes/cache/CacheHandler.class.php          | 128 ++-
 classes/cache/CacheMemcache.class.php         |  98 ++-
 classes/cache/CacheWincache.class.php         |  72 +-
 classes/context/Context.class.php             |  61 +-
 classes/db/DB.class.php                       | 549 ++++++++----
 classes/db/DBCubrid.class.php                 | 253 ++++--
 classes/db/DBMssql.class.php                  | 308 ++++---
 classes/db/DBMysql.class.php                  | 331 ++++---
 classes/db/DBMysql_innodb.class.php           |  96 +-
 classes/db/DBMysqli.class.php                 | 138 ++-
 classes/db/queryparts/Query.class.php         | 830 +++++++++++-------
 classes/db/queryparts/Subquery.class.php      |  26 +-
 .../queryparts/condition/Condition.class.php  |  63 +-
 .../condition/ConditionGroup.class.php        |  31 +-
 .../condition/ConditionSubquery.class.php     |  14 +-
 .../condition/ConditionWithArgument.class.php |  21 +-
 .../ConditionWithoutArgument.class.php        |  17 +-
 .../expression/ClickCountExpression.class.php |  25 +-
 .../expression/DeleteExpression.class.php     |  25 +-
 .../expression/Expression.class.php           |  24 +-
 .../expression/InsertExpression.class.php     |  19 +-
 .../expression/SelectExpression.class.php     |  26 +-
 .../expression/StarExpression.class.php       |  15 +-
 .../expression/UpdateExpression.class.php     |  31 +-
 .../UpdateExpressionWithoutArgument.class.php |  22 +-
 classes/db/queryparts/limit/Limit.class.php   |  36 +-
 .../queryparts/order/OrderByColumn.class.php  |  21 +-
 .../table/CubridTableWithHint.class.php       |  31 +-
 .../db/queryparts/table/IndexHint.class.php   |  22 +-
 .../db/queryparts/table/JoinTable.class.php   |  31 +-
 .../table/MssqlTableWithHint.class.php        |  30 +-
 .../table/MysqlTableWithHint.class.php        |  27 +-
 classes/db/queryparts/table/Table.class.php   |  22 +-
 classes/display/DisplayHandler.class.php      |  31 +-
 classes/display/HTMLDisplayHandler.php        |  47 +-
 classes/display/JSONDisplayHandler.php        |   5 +
 classes/display/VirtualXMLDisplayHandler.php  |   5 +-
 classes/display/XMLDisplayHandler.php         |  10 +-
 classes/editor/EditorHandler.class.php        |   4 +-
 classes/extravar/Extravar.class.php           | 120 ++-
 classes/file/FileHandler.class.php            | 279 +++---
 classes/file/FileObject.class.php             |  82 +-
 .../FrontEndFileHandler.class.php             | 139 ++-
 classes/handler/Handler.class.php             |   4 +-
 classes/httprequest/XEHttpRequest.class.php   |  60 +-
 classes/mail/Mail.class.php                   | 272 +++---
 classes/mobile/Mobile.class.php               |  44 +-
 classes/module/ModuleHandler.class.php        | 122 ++-
 classes/module/ModuleObject.class.php         | 131 ++-
 classes/object/Object.class.php               | 167 ++--
 classes/page/PageHandler.class.php            |  22 +-
 classes/security/Security.class.php           |  32 +-
 classes/template/TemplateHandler.class.php    |  98 ++-
 classes/validator/Validator.class.php         |  94 +-
 classes/xml/GeneralXmlParser.class.php        |  68 +-
 classes/xml/XmlGenerator.class.php            |  18 +-
 classes/xml/XmlJsFilter.class.php             |  63 +-
 classes/xml/XmlLangParser.class.php           |  94 +-
 classes/xml/XmlParser.class.php               | 136 +--
 classes/xml/XmlQueryParser.150.class.php      |  46 +-
 classes/xml/XmlQueryParser.class.php          |  89 +-
 classes/xml/xmlquery/DBParser.class.php       |  84 +-
 classes/xml/xmlquery/QueryParser.class.php    |  31 +-
 .../xml/xmlquery/argument/Argument.class.php  |  73 +-
 .../argument/ConditionArgument.class.php      |  46 +-
 .../xmlquery/argument/SortArgument.class.php  |   7 +-
 .../queryargument/DefaultValue.class.php      |  46 +-
 .../queryargument/QueryArgument.class.php     |  46 +-
 .../queryargument/SortQueryArgument.class.php |  11 +-
 .../QueryArgumentValidator.class.php          |  40 +
 .../xmlquery/tags/column/ColumnTag.class.php  |  31 +-
 .../tags/column/InsertColumnTag.class.php     |  25 +-
 .../InsertColumnTagWithoutArgument.class.php  |  31 +
 .../tags/column/InsertColumnsTag.class.php    |  35 +-
 .../tags/column/SelectColumnTag.class.php     |  31 +-
 .../tags/column/SelectColumnsTag.class.php    |  25 +-
 .../tags/column/UpdateColumnTag.class.php     |  31 +-
 .../tags/column/UpdateColumnsTag.class.php    |  35 +-
 .../condition/ConditionGroupTag.class.php     |  28 +-
 .../tags/condition/ConditionTag.class.php     |  49 +-
 .../tags/condition/ConditionsTag.class.php    |  20 +
 .../condition/JoinConditionsTag.class.php     |  16 +-
 .../xmlquery/tags/group/GroupsTag.class.php   |  17 +-
 .../tags/navigation/IndexTag.class.php        |  36 +-
 .../tags/navigation/LimitTag.class.php        |  29 +-
 .../tags/navigation/NavigationTag.class.php   |  40 +
 .../xmlquery/tags/query/QueryTag.class.php    | 133 ++-
 .../tags/table/HintTableTag.class.php         |  26 +-
 .../xmlquery/tags/table/TableTag.class.php    |  83 +-
 .../xmlquery/tags/table/TablesTag.class.php   |  40 +-
 common/css/xe.css                             |   6 +-
 common/css/xe.min.css                         |   2 +-
 common/lang/lang.info                         |   2 +-
 common/lang/lang.xml                          |   4 +
 common/tpl/common_layout.html                 |  90 +-
 config/config.inc.php                         | 258 ++++--
 config/func.inc.php                           | 403 ++++++---
 layouts/xe_official/css/default.css           |   2 +-
 modules/addon/addon.admin.controller.php      |  53 +-
 modules/addon/addon.admin.model.php           |  47 +-
 modules/addon/addon.admin.view.php            |  20 +-
 modules/addon/addon.class.php                 |  20 +-
 modules/addon/addon.controller.php            |  69 +-
 modules/addon/tpl/setup_addon.html            |   1 +
 modules/admin/admin.admin.controller.php      | 111 +--
 modules/admin/admin.admin.model.php           |  72 +-
 modules/admin/admin.admin.view.php            |  80 +-
 modules/admin/admin.class.php                 |  58 +-
 modules/admin/lang/lang.xml                   | 154 +++-
 modules/admin/tpl/css/admin.css               | 155 ++++
 modules/admin/tpl/css/admin.min.css           |   3 +-
 .../tpl/img/glyphicons-halflings-white.png    | Bin 0 -> 8777 bytes
 .../admin/tpl/img/glyphicons-halflings.png    | Bin 0 -> 13826 bytes
 modules/admin/tpl/js/admin.js                 |  35 +-
 modules/admin/tpl/js/admin.min.js             |   2 +-
 modules/adminlogging/adminlogging.class.php   |  45 +-
 .../adminlogging/adminlogging.controller.php  |  26 +-
 modules/adminlogging/adminlogging.model.php   |   9 +-
 .../autoinstall.admin.controller.php          |  62 +-
 .../autoinstall/autoinstall.admin.view.php    | 155 +++-
 modules/autoinstall/autoinstall.class.php     |  49 +-
 modules/autoinstall/autoinstall.lib.php       | 258 +++++-
 modules/autoinstall/autoinstall.model.php     | 117 ++-
 modules/autoinstall/autoinstall.view.php      |  13 +-
 modules/comment/comment.admin.controller.php  |  89 +-
 modules/comment/comment.admin.view.php        |  36 +-
 modules/comment/comment.class.php             |  43 +-
 modules/comment/comment.controller.php        | 187 ++--
 modules/comment/comment.item.php              |  74 +-
 modules/comment/comment.model.php             | 177 ++--
 modules/comment/comment.view.php              |  30 +-
 .../communication.admin.controller.php        |  13 +-
 .../communication.admin.model.php             |   5 +-
 .../communication.admin.view.php              |   7 +-
 modules/communication/communication.class.php |  14 +-
 .../communication.controller.php              |  89 +-
 modules/communication/communication.model.php |  50 +-
 modules/communication/communication.view.php  |  25 +-
 .../communication/skins/default/friends.html  |   4 +-
 .../communication/skins/default/messages.html |   2 +-
 modules/counter/counter.admin.view.php        |  14 +-
 modules/counter/counter.class.php             |  19 +-
 modules/counter/counter.controller.php        |  51 +-
 modules/counter/counter.model.php             |  35 +-
 .../document/document.admin.controller.php    | 167 ++--
 modules/document/document.admin.model.php     |  49 +-
 modules/document/document.admin.view.php      |  50 +-
 modules/document/document.class.php           | 634 ++++++-------
 modules/document/document.controller.php      | 383 +++++---
 modules/document/document.item.php            | 193 +++-
 modules/document/document.model.php           | 334 ++++---
 modules/document/document.view.php            |  55 +-
 .../queries/getDocumentListWithExtraVars.xml  |   3 +
 modules/document/queries/insertDocument.xml   |   1 +
 .../image_link/image_link.class.php           |  11 +-
 modules/editor/conf/module.xml                |   2 +-
 modules/editor/editor.admin.controller.php    |   4 +-
 modules/editor/editor.admin.view.php          |   1 -
 modules/editor/editor.controller.php          |  55 +-
 .../editor/skins/xpresseditor/css/default.css |   6 +-
 modules/editor/skins/xpresseditor/editor.html |   2 +-
 .../skins/xpresseditor/js/Xpress_Editor.js    |  20 +-
 .../skins/xpresseditor/js/xpresseditor.js     |  41 +-
 .../skins/xpresseditor/js/xpresseditor.min.js | 174 ++--
 modules/editor/tpl/admin_index.html           |   8 +-
 modules/editor/tpl/editor_module_config.html  |  16 +-
 modules/editor/tpl/setup_component.html       |   3 +-
 modules/file/file.admin.controller.php        |  58 +-
 modules/file/file.admin.model.php             |  82 +-
 modules/file/file.admin.view.php              |  15 +-
 modules/file/file.class.php                   |  20 +-
 modules/file/file.controller.php              | 176 +++-
 modules/file/file.model.php                   |  62 +-
 modules/file/file.view.php                    |  15 +-
 modules/importer/extract.class.php            | 107 ++-
 .../importer/importer.admin.controller.php    | 140 ++-
 modules/importer/importer.admin.view.php      |  39 +-
 modules/importer/importer.class.php           |  43 +-
 modules/importer/ttimport.class.php           | 111 ++-
 modules/install/lang/lang.xml                 | 202 ++---
 modules/install/tpl/css/install.css           |   2 +-
 modules/install/tpl/form.cubrid.html          |   2 +-
 modules/install/tpl/form.firebird.html        |   2 +-
 modules/install/tpl/form.mssql.html           |   2 +-
 modules/install/tpl/form.mysql.html           |   2 +-
 modules/install/tpl/form.mysql_innodb.html    |   2 +-
 modules/install/tpl/form.mysqli.html          |   2 +-
 modules/install/tpl/form.postgresql.html      |   2 +-
 modules/install/tpl/header.html               |   2 +-
 modules/install/tpl/introduce.html            |  42 +-
 modules/install/tpl/js/install.js             |  10 -
 modules/install/tpl/progress_menu.html        |  22 +-
 .../integration_search.admin.controller.php   |  42 +-
 .../integration_search.admin.view.php         |  19 +-
 .../integration_search.class.php              |  20 +-
 .../integration_search.model.php              |  71 +-
 .../integration_search.view.php               |  15 +-
 modules/layout/conf/module.xml                |   2 +-
 modules/layout/lang/lang.xml                  |   6 +
 modules/layout/layout.admin.controller.php    | 128 ++-
 modules/layout/layout.admin.view.php          | 120 ++-
 modules/layout/layout.class.php               |  14 +-
 modules/layout/layout.model.php               | 174 ++--
 modules/layout/layout.view.php                |  11 +-
 modules/layout/tpl/installed_layout_list.html |   8 +-
 .../layout/tpl/layout_all_instance_list.html  |  48 +
 modules/layout/tpl/sub_tab.html               |  14 +
 modules/member/lang/lang.xml                  |  49 +-
 modules/member/member.admin.controller.php    | 190 ++--
 modules/member/member.admin.model.php         |  61 +-
 modules/member/member.admin.view.php          |  82 +-
 modules/member/member.api.php                 |  27 +-
 modules/member/member.class.php               | 195 +++-
 modules/member/member.controller.php          | 524 +++++++----
 modules/member/member.mobile.php              |  44 +-
 modules/member/member.model.php               |  48 +-
 modules/member/member.view.php                |  24 +-
 .../member/queries/deleteLoginCountByIp.xml   |   8 +
 .../deleteLoginCountHistoryByMemberSrl.xml    |   8 +
 modules/member/queries/getLoginCountByIp.xml  |  11 +
 .../getLoginCountHistoryByMemberSrl.xml       |  11 +
 .../member/queries/insertLoginCountByIp.xml   |  11 +
 .../insertLoginCountHistoryByMemberSrl.xml    |  10 +
 .../member/queries/updateLoginCountByIp.xml   |  12 +
 .../updateLoginCountHistoryByMemberSrl.xml    |  12 +
 modules/member/ruleset/findAccount.xml        |   8 +
 modules/member/ruleset/insertConfig.xml       |   2 +
 .../member/schemas/member_count_history.xml   |   5 +
 modules/member/schemas/member_login_count.xml |   6 +
 .../skins/default/find_member_account.html    |   4 +-
 modules/member/skins/default/login_form.html  |   4 +-
 modules/member/skins/default/signup_form.html |   4 +-
 modules/member/tpl/css/mlogin.css             |   6 +
 modules/member/tpl/css/msignup.css            |   1 +
 modules/member/tpl/find_member_account.html   |  59 ++
 modules/member/tpl/find_temp_password.html    |   7 +
 modules/member/tpl/login_form.html            |  27 +-
 modules/member/tpl/member_config.html         |   8 +
 modules/member/tpl/modify_password.html       |  54 +-
 modules/member/tpl/signup_form.html           |  23 +-
 modules/menu/lang/lang.xml                    |   4 +
 modules/menu/menu.admin.controller.php        | 301 ++++---
 modules/menu/menu.admin.model.php             | 110 ++-
 modules/menu/menu.admin.view.php              |  75 +-
 modules/menu/menu.class.php                   |  50 +-
 modules/menu/menu.mobile.php                  |  21 +-
 modules/menu/schemas/menu.xml                 |   2 +-
 modules/menu/tpl/js/sitemap.js                |  84 +-
 modules/menu/tpl/sitemap.html                 |  19 +-
 modules/menu/tpl/sitemap.item.html            |   9 +-
 modules/message/m.skins/default/message.css   |   1 +
 .../m.skins/default/system_message.html       |  26 +-
 modules/message/message.admin.controller.php  |   8 +-
 modules/message/message.view.php              |   2 -
 .../message/skins/default/system_message.html |   4 +-
 modules/module/module.admin.controller.php    |  88 +-
 modules/module/module.controller.php          |  17 +-
 modules/module/module.model.php               |  15 +-
 .../module/queries/getModuleCategories.xml    |   3 +
 modules/module/queries/getSiteModules.xml     |   2 +
 .../module/tpl/include.manage_selected.html   |   2 +-
 .../tpl/include.module_grant_setup.html       |   2 +-
 modules/module/tpl/module_langcode.html       |   5 +-
 modules/module/tpl/module_list.html           |  10 +-
 modules/page/page.admin.controller.php        |  16 +-
 modules/page/page.admin.view.php              |   3 +-
 modules/page/tpl/page_info.html               |   2 +-
 modules/point/lang/lang.xml                   | 120 +++
 modules/point/point.admin.controller.php      |  25 +-
 modules/point/tpl/member_list.html            |  34 +-
 modules/poll/poll.admin.controller.php        |  16 +-
 modules/poll/poll.controller.php              |   8 +-
 modules/rss/rss.admin.controller.php          |  53 +-
 modules/rss/rss.admin.view.php                |  16 +-
 modules/rss/rss.class.php                     |  19 +-
 modules/rss/rss.controller.php                |  19 +-
 modules/rss/rss.model.php                     |  19 +-
 modules/rss/rss.view.php                      |  32 +-
 .../spamfilter.admin.controller.php           |  42 +-
 .../trackback/trackback.admin.controller.php  |  92 +-
 modules/trackback/trackback.admin.model.php   |  36 +-
 modules/trackback/trackback.admin.view.php    |  29 +-
 modules/trackback/trackback.class.php         |  43 +-
 modules/trackback/trackback.controller.php    | 115 ++-
 modules/trackback/trackback.model.php         | 117 ++-
 modules/trackback/trackback.view.php          |  39 +-
 modules/trash/trash.admin.controller.php      |  63 +-
 modules/trash/trash.admin.view.php            |  21 +-
 modules/trash/trash.class.php                 |  24 +-
 modules/trash/trash.controller.php            |   9 +-
 modules/trash/trash.model.php                 |  30 +-
 modules/trash/trash.view.php                  |  16 +-
 modules/widget/tpl/js/generate_code.js        |  22 +-
 modules/widget/tpl/js/widget.js               |   8 +-
 .../tpl/widget_generate_code.include.html     |   4 +
 modules/widget/widget.controller.php          |   4 +-
 phpDoc/phpdoc.dist.xml                        |  24 +
 .../db/xml_query/cubrid/data/doc_subquery.xml |  21 +
 .../db/db/xml_query/mysql/MysqlInsertTest.php |  38 +-
 .../db/db/xml_query/mysql/MysqlSelectTest.php |  69 +-
 .../data/document.getNewestDocuments.xml      |  21 +
 .../document.getNewestDocumentsInvalid.xml    |  21 +
 .../db/xml_query/mysql/data/insert_select.xml |  23 +
 .../mysql/data/page.pageTypeNotNullCheck.xml  |  20 +
 .../mysql/data/page.pageTypeNullCheck.xml     |  20 +
 tests/classes/validator/ValidatorTest.php     |  57 ++
 tests/classes/validator/customrule.xml        |  15 +
 .../layouts/xe_greystone/css/default.css      |   2 +-
 .../layouts/xe_greystone/layout.html          |   2 +-
 .../modules/message/system_message.html       |   2 +-
 .../layouts/xe_sapphire/css/default.css       |   2 +-
 .../layouts/xe_sapphire/layout.html           |   2 +-
 .../modules/message/system_message.html       |   2 +-
 .../xe_solid_enterprise/css/banner.css        |  85 +-
 .../layouts/xe_solid_enterprise/css/style.css | 129 ++-
 .../modules/member/login_form.html            |   2 +-
 .../modules/member/modify_info.html           |   2 +-
 .../modules/message/system_message.html       |   2 +-
 widgets/content/content.class.php             |   2 +-
 .../skins/default/js/content_widget.js        |   4 +-
 .../skins/xe_global/login_form.html           |   8 +-
 .../skins/xe_globalTwo/login_form.html        |   8 +-
 .../skins/xe_official/login_form.html         |   8 +-
 .../xe_solid_enterprise_login/login_form.html |   8 +-
 widgets/mcontent/skins/default/normal.html    |  12 +-
 334 files changed, 13011 insertions(+), 5561 deletions(-)
 create mode 100644 classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php
 create mode 100644 modules/admin/tpl/img/glyphicons-halflings-white.png
 create mode 100644 modules/admin/tpl/img/glyphicons-halflings.png
 create mode 100644 modules/layout/tpl/layout_all_instance_list.html
 create mode 100644 modules/layout/tpl/sub_tab.html
 create mode 100644 modules/member/queries/deleteLoginCountByIp.xml
 create mode 100644 modules/member/queries/deleteLoginCountHistoryByMemberSrl.xml
 create mode 100644 modules/member/queries/getLoginCountByIp.xml
 create mode 100644 modules/member/queries/getLoginCountHistoryByMemberSrl.xml
 create mode 100644 modules/member/queries/insertLoginCountByIp.xml
 create mode 100644 modules/member/queries/insertLoginCountHistoryByMemberSrl.xml
 create mode 100644 modules/member/queries/updateLoginCountByIp.xml
 create mode 100644 modules/member/queries/updateLoginCountHistoryByMemberSrl.xml
 create mode 100644 modules/member/ruleset/findAccount.xml
 create mode 100644 modules/member/schemas/member_count_history.xml
 create mode 100644 modules/member/schemas/member_login_count.xml
 create mode 100644 modules/member/tpl/find_member_account.html
 create mode 100644 modules/member/tpl/find_temp_password.html
 create mode 100644 phpDoc/phpdoc.dist.xml
 create mode 100644 tests/classes/db/db/xml_query/cubrid/data/doc_subquery.xml
 create mode 100644 tests/classes/db/db/xml_query/mysql/data/document.getNewestDocuments.xml
 create mode 100644 tests/classes/db/db/xml_query/mysql/data/document.getNewestDocumentsInvalid.xml
 create mode 100644 tests/classes/db/db/xml_query/mysql/data/insert_select.xml
 create mode 100644 tests/classes/db/db/xml_query/mysql/data/page.pageTypeNotNullCheck.xml
 create mode 100644 tests/classes/db/db/xml_query/mysql/data/page.pageTypeNullCheck.xml
 create mode 100644 tests/classes/validator/customrule.xml

diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 93dc6bab5..a639cec26 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -10,6 +10,9 @@
 
 	if(!class_exists('AddonCaptcha'))
 	{
+	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
+	Context::loadFile(array('./common/js/jquery.min.js','head', NULL,-100000),true);
+	Context::loadFile(array('./common/js/xe.min.js','head', NULL,-100000),true);
 		class AddonCaptcha
 		{
 			var $addon_info;
@@ -31,6 +34,7 @@
 				$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['XE_VALIDATOR_ERROR'] == -1) $_SESSION['captcha_authed'] = false;
 				if($_SESSION['captcha_authed']) return false;
 
 				$type = Context::get('captchaType');
@@ -54,7 +58,7 @@
 						}
 					}  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);
+						Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 					}
 				}
 
@@ -286,7 +290,7 @@
 				$this->createKeyword();
 
 				$swfURL = getUrl().'addons/captcha/swf/play.swf';
-				Context::unloadFile('./addons/captcha/captcha.js');
+				Context::unloadFile('./addons/captcha/captcha.min.js');
 				Context::loadFile(array('./addons/captcha/inline_captcha.js','body'));
 
 				global $lang;
diff --git a/addons/captcha/captcha.js b/addons/captcha/captcha.js
index 42347b8c4..5ccd6f16a 100644
--- a/addons/captcha/captcha.js
+++ b/addons/captcha/captcha.js
@@ -80,7 +80,9 @@ var calledArgs = null;
 
 				captchaXE = $('<div id="captcha_layer" style="position:fixed; top:0; left:0; width:100%; height:100%;display:none;z-index:10">').appendTo(document.body);
 
-                var $div = $('<div style="z-index:1000;position:absolute; width:310px; margin:-105px 0 0 -105px; top:50%; left:50%; background:#fff; border:3px solid #ccc;">'+
+				var top_left = 'margin:-105px 0 0 -105px; top:50%; left:50%;';
+				if(screen.width<480) { top_left = ''; }
+				var $div = $('<div style="z-index:1000;position:absolute; width:310px;' + top_left + ' background:#fff; border:3px solid #ccc;">'+
 								'<form method="post" action="">'+
 									'<div style="position:relative; margin:25px 20px 15px 20px">'+
 										'<img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+
diff --git a/addons/captcha/captcha.min.js b/addons/captcha/captcha.min.js
index 6ce3461b9..96b7ea69a 100644
--- a/addons/captcha/captcha.min.js
+++ b/addons/captcha/captcha.min.js
@@ -1,2 +1,2 @@
 /* procFilter 함수를 가로채서 captcha 이미지 및 폼을 출력 */
-var oldExecXml = null;var calledArgs = null;(function($){$(function() {var captchaXE = null;function xeCaptcha() {var body = $(document.body);var captchaIma;if (!captchaXE) {var fc_isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;var fc_isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;var fc_isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;var _swfURL_ = request_uri + 'addons/captcha/swf/play.swf';if(fc_isIE && fc_isWin && !fc_isOpera){_object_ ='<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">';_object_ += '<param name="allowScriptAccess" value="always" />';_object_ += '<param name="quality" value="high" />';_object_ += '<param name="movie" value="'+_swfURL_+'" />';_object_ += '<param name="wmode" value="window" />';_object_ += '<param name="allowFullScreen" value="false">';_object_ += '<param name="bgcolor" value="#fffff" />';_object_ += '</object>';}else{_object_ = '<embed src="'+_swfURL_+'" 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" />';}captchaXE = $('<div id="captcha_layer" style="position:fixed;top:0;left:0;width:100%;height:100%;display:none;z-index:10">').appendTo(document.body);var $div = $('<div style="z-index:1000;position:absolute;width:310px;margin:-105px 0 0 -105px;top:50%;left:50%;background:#fff;border:3px solid #ccc;">'+'<form method="post" action="">'+'<div style="position:relative;margin:25px 20px 15px 20px">'+'<img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block;width:240px;height:50px;border:1px solid #b0b0b0" />'+'<button type="button" class="reload" title="" style="position:absolute;top:0;left:245px;width:25px;height:25px;padding:0;overflow:visible;border:1px solid #575757;background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center 5px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+'<button type="button" class="play" title="" style="position:absolute;top:27px;left:245px;width:25px;height:25px;padding:0;overflow:visible;border:1px solid #575757;background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center -20px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+'</div>'+'<label id="captchaAbout" for="captcha" style="display:block;border-top:1px dashed #c5c5c5;padding:15px 0;margin:0 20px;font-size:12px;color:#5f5f5f;"></label>'+'<input name="" type="text" id="secret_text" style="margin:0 20px;width:232px;border:1px solid #bdbdbd;padding:3px 4px;font-size:18px;font-weight:bold;" />'+'<div style="margin:20px;border-top:1px dashed #c5c5c5;padding:15px 0 0 0;text-align:center">'+'<button type="submit" style="height:31px;line-height:31px;padding:0 15px;margin:0 2px;font-size:12px;font-weight:bold;color:#fff;overflow:visible;border:1px solid #5c8a16;background:#6faa13;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;cursor:pointer;box-shadow:0 0 3px #666 inset;-moz-box-shadow:0 0 3px #666 inset;-webkit-box-shadow:0 0 3px #666 inset;"></button>'+'<button type="button" class="cancel" style="height:31px;line-height:31px;padding:0 15px;margin:0 2px;font-size:12px;font-weight:bold;color:#fff;overflow:visible;border:1px solid #575757;background:#747474;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+'</div>'+'</form>'+_object_ +'</div>').appendTo(captchaXE);$div.find('form').submit(function(){if(!$('#secret_text').val()){$div.find('input[type=text]').val('').focus();return false;}captchaXE.compare();return false;});$div.find('button.cancel').click(function(){$('#captcha_layer').hide();});$div.find('button.play').click(function(){var swf = window['captcha_audio'] || document['captcha_audio'];var audio = current_url.setQuery('captcha_action','captchaAudio').setQuery('rnd', (new Date).getTime());$div.find('input[type=text]').focus();swf.setSoundTarget(audio,'1');});$div.find('button.reload').click(function(){var params = new Array();params['captcha_action'] = 'setCaptchaSession';params['mid'] = current_mid;oldExecXml('','',params, function() {$("#captcha_image").attr("src", current_url.setQuery('captcha_action','captchaImage').setQuery('rnd', (new Date).getTime()));});});captchaXE.exec = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) {var doCheck = false;$.each(captchaTargetAct || {}, function(key,val){if (val == act){doCheck = true;return false;} });if (doCheck) {/* captcha 를 사용하는 경우 */ calledArgs = {'module':module,'act':act,'params':params,'callback_func':callback_func,'response_tags':response_tags,'callback_func_arg':callback_func_arg,'fo_obj':fo_obj};var params = new Array();params['captcha_action'] = 'setCaptchaSession';params['mid'] = current_mid;oldExecXml(module, act, params, captchaXE.show,new Array('error','message','about_captcha','captcha_reload','captcha_play','cmd_input','cmd_cancel'));} else {oldExecXml(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj);}return true;};captchaXE.show = function(ret_obj) {$('#captcha_layer').show();$("#captchaAbout").html(ret_obj['about_captcha']);$("#captcha_layer .reload").attr('title',ret_obj['captcha_reload']);$("#captcha_layer .play").attr('title',ret_obj['captcha_play']);$("#captcha_layer button[type=submit]").html(ret_obj['cmd_input']);$("#captcha_layer button.cancel").html(ret_obj['cmd_cancel']);$("#captcha_image").attr("src", current_url.setQuery('captcha_action','captchaImage').setQuery('rnd', (new Date).getTime()));$div.find('input[type=text]').val('').focus();$('html, body').css('height','100%');};captchaXE.compare = function(e) {var params = new Array();params['captcha_action'] = 'captchaCompare';params['mid'] = current_mid;params['secret_text'] = $('#secret_text').val();oldExecXml(calledArgs.module,calledArgs.act,params, function() {$("#captcha_layer").hide();oldExecXml(calledArgs.module, calledArgs.act, calledArgs.params, calledArgs.callback_func, calledArgs.response_tags, calledArgs.callback_func_arg, calledArgs.fo_obj);} );};}return captchaXE;}$(window).ready(function(){oldExecXml = exec_xml;exec_xml = xeCaptcha().exec;});});})(jQuery);
\ No newline at end of file
+var oldExecXml=null;var calledArgs=null;(function(a){a(function(){var b=null;function c(){a("form").each(function(n){var l=false;if(!a(this).attr("onsubmit")||a(this).attr("onsubmit").indexOf("procFilter")<0){var m=a(this).find("input[name=act]").val();for(var n=0;n<captchaTargetAct.length;n++){if(captchaTargetAct[n]==m){l=true;break}}}if(l){a(this).append('<input type="hidden" name="captchaType" value="inline" />');if(!a(this).find("input[name=error_return_url]")){a(this).append('<input type="hidden" name="error_return_url" value="'+current_url+'" />')}a(this).submit(function(p){if(a(this).find("input[name=secret_text]").val()){return true}p.preventDefault();var o=this;a("#captcha_layer form").submit(function(r){r.preventDefault();if(!a("#secret_text").val()){a(this).find("input[type=text]").val("").focus();return false}a(o).append('<input type="hidden" name="secret_text" value="'+a("#secret_text").val()+'" />');a(o).submit()});var q=new Array();q.captcha_action="setCaptchaSession";q.mid=current_mid;oldExecXml("","",q,b.show,new Array("error","message","about_captcha","captcha_reload","captcha_play","cmd_input","cmd_cancel"))})}});var d=a(document.body);var g;if(!b){var j=(navigator.appVersion.indexOf("MSIE")!=-1)?true:false;var k=(navigator.appVersion.toLowerCase().indexOf("win")!=-1)?true:false;var i=(navigator.userAgent.indexOf("Opera")!=-1)?true:false;var h=request_uri+"addons/captcha/swf/play.swf";if(j&&k&&!i){_object_='<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">';_object_+='<param name="allowScriptAccess" value="always" />';_object_+='<param name="quality" value="high" />';_object_+='<param name="movie" value="'+h+'" />';_object_+='<param name="wmode" value="window" />';_object_+='<param name="allowFullScreen" value="false">';_object_+='<param name="bgcolor" value="#fffff" />';_object_+="</object>"}else{_object_='<embed src="'+h+'" 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" />'}b=a('<div id="captcha_layer" style="position:fixed; top:0; left:0; width:100%; height:100%;display:none;z-index:10">').appendTo(document.body);var f="margin:-105px 0 0 -105px; top:50%; left:50%;";if(screen.width<480){f=""}var e=a('<div style="z-index:1000;position:absolute; width:310px;'+f+' background:#fff; border:3px solid #ccc;"><form method="post" action=""><div style="position:relative; margin:25px 20px 15px 20px"><img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" /><button type="button" class="reload" title="" style="position:absolute; top:0; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri+'addons/captcha/img/icon.gif) no-repeat center 5px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button><button type="button" class="play" title="" style="position:absolute; top:27px; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri+'addons/captcha/img/icon.gif) no-repeat center -20px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button></div><label id="captchaAbout" for="captcha" style="display:block; border-top:1px dashed #c5c5c5; padding:15px 0; margin:0 20px; font-size:12px; color:#5f5f5f;"></label><input name="" type="text" id="secret_text" style="margin:0 20px; width:232px; border:1px solid #bdbdbd; padding:3px 4px; font-size:18px; font-weight:bold;" /><div style="margin:20px; border-top:1px dashed #c5c5c5; padding:15px 0 0 0; text-align:center"><button type="submit" style="height:31px; line-height:31px; padding:0 15px; margin:0 2px; font-size:12px; font-weight:bold; color:#fff; overflow:visible; border:1px solid #5c8a16; background:#6faa13;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #666 inset;-moz-box-shadow:0 0 3px #666 inset;-webkit-box-shadow:0 0 3px #666 inset;"></button><button type="button" class="cancel" style="height:31px; line-height:31px; padding:0 15px; margin:0 2px; font-size:12px; font-weight:bold; color:#fff; overflow:visible; border:1px solid #575757; background:#747474;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button></div></form>'+_object_+"</div>").appendTo(b);e.find("button.cancel").click(function(){a("#captcha_layer").hide()});e.find("button.play").click(function(){var l=window.captcha_audio||document.captcha_audio;var m=current_url.setQuery("captcha_action","captchaAudio").setQuery("rnd",(new Date).getTime());e.find("input[type=text]").focus();l.setSoundTarget(m,"1")});e.find("button.reload").click(function(){var l=new Array();l.captcha_action="setCaptchaSession";l.mid=current_mid;oldExecXml("","",l,function(){a("#captcha_image").attr("src",current_url.setQuery("captcha_action","captchaImage").setQuery("rnd",(new Date).getTime()))})});b.exec=function(p,l,s,o,r,q,m){var n=false;a.each(captchaTargetAct||{},function(t,u){if(u==l){n=true;return false}});if(n){a("#captcha_layer form").submit(function(t){t.preventDefault();if(!a("#secret_text").val()){a(this).find("input[type=text]").val("").focus();return false}b.compare();return false});calledArgs={module:p,act:l,params:s,callback_func:o,response_tags:r,callback_func_arg:q,fo_obj:m};var s=new Array();s.captcha_action="setCaptchaSession";s.mid=current_mid;oldExecXml(p,l,s,b.show,new Array("error","message","about_captcha","captcha_reload","captcha_play","cmd_input","cmd_cancel"))}else{oldExecXml(p,l,s,o,r,q,m)}return true};b.show=function(l){a("#captcha_layer").show();a("#captchaAbout").html(l.about_captcha);a("#captcha_layer .reload").attr("title",l.captcha_reload);a("#captcha_layer .play").attr("title",l.captcha_play);a("#captcha_layer button[type=submit]").html(l.cmd_input);a("#captcha_layer button.cancel").html(l.cmd_cancel);a("#captcha_image").attr("src",current_url.setQuery("captcha_action","captchaImage").setQuery("rnd",(new Date).getTime()));e.find("input[type=text]").val("").focus();a("html, body").css("height","100%")};b.compare=function(l){var m=new Array();m.captcha_action="captchaCompare";m.mid=current_mid;m.secret_text=a("#secret_text").val();oldExecXml(calledArgs.module,calledArgs.act,m,function(){a("#captcha_layer").hide();oldExecXml(calledArgs.module,calledArgs.act,calledArgs.params,calledArgs.callback_func,calledArgs.response_tags,calledArgs.callback_func_arg,calledArgs.fo_obj)})}}return b}a(window).ready(function(){oldExecXml=exec_xml;exec_xml=c().exec})})})(jQuery);
\ No newline at end of file
diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php
index 519c7db47..89ed0fc6d 100644
--- a/addons/member_communication/member_communication.addon.php
+++ b/addons/member_communication/member_communication.addon.php
@@ -4,7 +4,7 @@ if(!defined('__XE__')) exit();
 /**
  * @file member_communication.addon.php
  * @author NHN (developers@xpressengine.com)
- * @brief Promote user communication 
+ * @brief Promote user communication
  *
  * - Pop-up the message if new message comes in
  * - When calling MemberModel::getMemberMenu, feature to send a message is added
@@ -46,7 +46,7 @@ if($called_position == 'before_module_init' && $this->module != 'member') {
 	$mid = Context::get('cur_mid');
 	// Creates communication model object
 	$oCommunicationModel = &getModel('communication');
-	// Add a feature to display own message box. 
+	// 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');
@@ -55,7 +55,7 @@ if($called_position == 'before_module_init' && $this->module != 'member') {
 	// If not, Add menus to send message and to add friends
 	} else {
 		// Get member information
-		$oMemberModel = &getModel('member'); 
+		$oMemberModel = &getModel('member');
 		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		if(!$target_member_info->member_srl) return;
 		// Get logged-in user information
diff --git a/addons/member_communication/tpl/member_communication.js b/addons/member_communication/tpl/member_communication.js
index 5264ee9a0..1fdf33edb 100644
--- a/addons/member_communication/tpl/member_communication.js
+++ b/addons/member_communication/tpl/member_communication.js
@@ -5,6 +5,10 @@ window.xeNotifyMessage = function(text, count){
 	if(!$bar.length) {
 		$bar = $('<div class="message info" />')
 			.hide()
+			.css({
+				'position'   : 'absolute',
+				'z-index' : '100',
+			})
 			.prependTo(document.body);
 	}
 	text = text.replace('%d', count);
@@ -13,6 +17,6 @@ window.xeNotifyMessage = function(text, count){
 	// hide after 10 seconds
 	setTimeout(function(){
 		$bar.slideUp();
-	}, 10000);
+	}, 5000);
 };
 })(jQuery);
diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index c693da378..925675453 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -17,7 +17,7 @@ if($called_position != "before_display_content" || Context::get('act')=='dispPag
 // 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()
-$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>([^\<]*)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
+$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
 if($temp_output) $output = $temp_output;
 unset($temp_output);
 ?>
diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php
index 60e6b4530..483e15331 100644
--- a/addons/point_level_icon/point_level_icon.addon.php
+++ b/addons/point_level_icon/point_level_icon.addon.php
@@ -13,7 +13,7 @@ if($called_position != "before_display_content" || Context::get('act')=='dispPag
 
 require_once('./addons/point_level_icon/point_level_icon.lib.php');
 
-$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>([^\<]*)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
+$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
 if($temp_output) $output = $temp_output;
 unset($temp_output);
 ?>
diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php
index c0bdd6240..2d229bf0b 100644
--- a/classes/cache/CacheApc.class.php
+++ b/classes/cache/CacheApc.class.php
@@ -1,14 +1,22 @@
 <?php
 /**
- * @class CacheApc
+ * Cache class for APC
+ *
  * @author NHN (developer@xpressengine.com)
- * @brief APC Handler
- * @version 0.1
  **/
-
 class CacheApc extends CacheBase {
+	/**
+	 * Default valid time
+	 * @var int
+	 */
 	var $valid_time = 36000;
 
+	/**
+	 * Get instance of CacheApc
+	 *
+	 * @param void $opt Not used
+	 * @return CacheApc instance of CacheApc
+	 */
 	function getInstance($opt=null){
 		if(!$GLOBALS['__CacheApc__']) {
 			$GLOBALS['__CacheApc__'] = new CacheApc();
@@ -16,18 +24,46 @@ class CacheApc extends CacheBase {
 		return $GLOBALS['__CacheApc__'];
 	}
 
+	/**
+	 * Constructor
+	 *
+	 * @return void
+	 */
 	function CacheApc(){
 	}
 
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return bool Return true on support or false on not support
+	 */
 	function isSupport(){
 		return function_exists('apc_add');
 	}
 
+	/**
+	 * Cache a variable in the data store
+	 *
+	 * @param string $key Store the variable using this name. $key are cache-unique, so storing a second value with the same $key will overwrite the original value.
+	 * @param mixed $buff The variable to store
+	 * @param int $valid_time 	Time To Live; store $buff in the cache for ttl seconds.
+	 *							After the ttl has passed., the stored variable will be expunged from the cache (on the next request).
+	 *							If no ttl is supplied, use the default valid time CacheApc::valid_time.
+	 * @return bool Returns true on success or false on failure.
+	 */
 	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);
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, the data is invalid.
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time = 0) {
 		$_key = md5(_XE_PATH_.$key);
 		$obj = apc_fetch($_key, $success);
@@ -42,6 +78,14 @@ class CacheApc extends CacheBase {
 		return true;
 	}
 
+	/**
+	 * Fetch a stored variable from the cache
+	 *
+	 * @param string $key The $key used to store the value.
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, return false.
+	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0) {
 		$_key = md5(_XE_PATH_.$key);
 		$obj = apc_fetch($_key, $success);
@@ -55,15 +99,31 @@ class CacheApc extends CacheBase {
 		return $obj[1];
 	}
 
+	/**
+	 * Delete variable from the cache(private)
+	 *
+	 * @param string $_key Used to store the value.
+	 * @return void
+	 */
 	function _delete($_key) {
 		$this->put($_key,null,1);
 	}
 
+	/**
+	 * Delete variable from the cache
+	 *
+	 * @param string $key Used to store the value.
+	 * @return void
+	 */
 	function delete($key) {
-		$_key = md5(_XE_PATH_.$key);
-		$this->_delete($_key);
+		$this->_delete($key);
 	}
 
+	/**
+	 * Truncate all existing variables at the cache
+	 *
+	 * @return bool Returns true on success or false on failure.
+	 */
 	function truncate() {
 		return apc_clear_cache('user');
 	}
diff --git a/classes/cache/CacheFile.class.php b/classes/cache/CacheFile.class.php
index 516b3419f..bc3f11336 100644
--- a/classes/cache/CacheFile.class.php
+++ b/classes/cache/CacheFile.class.php
@@ -1,15 +1,29 @@
 <?php
 /**
- * @class CacheFile
+ * Cache class for file
+ *
+ * Filedisk Cache Handler
+ *
  * @author Arnia Software (xe_dev@arnia.ro)
- * @brief Filedisk Cache Handler
- * @version 0.1
  **/
-
 class CacheFile extends CacheBase {
+	/**
+	 * Default valid time
+	 * @var int
+	 */
 	var $valid_time = 36000;
+
+	/**
+	 * Path that value to stored
+	 * @var string
+	 */
 	var $cache_dir = 'files/cache/store/';
 	
+	/**
+	 * Get instance of CacheFile
+	 *
+	 * @return CacheFile instance of CacheFile
+	 */
 	function getInstance(){
 		if(!$GLOBALS['__CacheFile__']) {
 			$GLOBALS['__CacheFile__'] = new CacheFile();
@@ -17,25 +31,56 @@ class CacheFile extends CacheBase {
 		return $GLOBALS['__CacheFile__'];
 	}
 
+	/**
+	 * Constructor
+	 *
+	 * @return void
+	 */
 	function CacheFile(){
 		$this->cache_dir = _XE_PATH_ . $this->cache_dir;
 		if(!is_dir($this->cache_dir)) FileHandler::makeDir($this->cache_dir);
 	}
 
+	/**
+	 * Get cache file name by key
+	 *
+	 * @param string $key The key that will be associated with the item.
+	 * @return string Returns cache file path
+	 */
 	function getCacheFileName($key){
 		return $this->cache_dir . str_replace(':', '_', $key);
 	}
 	
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return true
+	 */
 	function isSupport(){
 		return true;
 	}
 
+	/**
+	 * Cache a variable in the data store
+	 *
+	 * @param string $key Store the variable using this name.
+	 * @param mixed $obj The variable to store
+	 * @param int $valid_time Not used
+	 * @return void
+	 */
 	function put($key, $obj, $valid_time = 0){
 		$cache_file = $this->getCacheFileName($key);		
 		$text = serialize($obj);
 		FileHandler::writeFile($cache_file, $text);
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time Not used
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time = 0) {
 		$cache_file = $this->getCacheFileName($key);
 		if(file_exists($cache_file)) return true;
@@ -43,6 +88,13 @@ class CacheFile extends CacheBase {
 		return false;
 	}
 
+	/**
+	 * Fetch a stored variable from the cache
+	 *
+	 * @param string $key The $key used to store the value.
+	 * @param int $modified_time Not used
+	 * @return false|mixed Return false on failure. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0) {
 		$cache_file = $this->getCacheFileName($key);
 		$content = FileHandler::readFile($cache_file);
@@ -51,15 +103,32 @@ class CacheFile extends CacheBase {
 		return unserialize($content);
 	}
 
+	/**
+	 * Delete variable from the cache(private)
+	 *
+	 * @param string $_key Used to store the value.
+	 * @return void
+	 */
 	function _delete($_key) {
 		$cache_file = $this->getCacheFileName($_key);
 		FileHandler::removeFile($cache_file);
 	}
 
+	/**
+	 * Delete variable from the cache
+	 *
+	 * @param string $key Used to store the value.
+	 * @return void
+	 */
 	function delete($key) {
 		$this->_delete($key);
 	}
 
+	/**
+	 * Truncate all existing variables at the cache
+	 *
+	 * @return bool Returns true on success or false on failure.
+	 */
 	function truncate() {
 		FileHandler::removeFilesInDir($this->cache_dir);
 	}
diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php
index 90858635f..1fa0040ae 100644
--- a/classes/cache/CacheHandler.class.php
+++ b/classes/cache/CacheHandler.class.php
@@ -1,15 +1,30 @@
 <?php
 /**
- * @class CacheHandler
+ * CacheHandler
+ *
  * @author NHN (developer@xpressengine.com)
- * @brief Cache Handler
- * @version 0.1
  **/
-
 class CacheHandler extends Handler {
+	/**
+	 * instance of cache handler
+	 * @var CacheBase
+	 */
 	var $handler = null;
+
+	/**
+	 * Version of key group
+	 * @var int
+	 */
 	var $keyGroupVersions = null;
 
+	/**
+	 * Get a instance of CacheHandler(for singleton)
+	 *
+	 * @param string $target type of cache (object|template)
+	 * @param object $info info. of DB
+	 * @param boolean $always_use_file If set true, use a file cache always
+	 * @return CacheHandler
+	 */
 	function &getInstance($target = 'object', $info = null, $always_use_file = false) {
 		$cache_handler_key = $target . ($always_use_file ? '_file' : '');
 		if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key]) {
@@ -18,6 +33,17 @@ class CacheHandler extends Handler {
 		return $GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key];
 	}
 
+	/**
+	 * Constructor.
+	 *
+	 * Do not use this directly. You can use getInstance() instead.
+	 *
+	 * @see CacheHandler::getInstance
+	 * @param string $target type of cache (object|template)
+	 * @param object $info info. of DB
+	 * @param boolean $always_use_file If set true, use a file cache always
+	 * @return CacheHandler
+	 */
 	function CacheHandler($target, $info = null, $always_use_file = false) {
 		if(!$info) $info = Context::getDBInfo();
 		if($info){
@@ -50,31 +76,73 @@ class CacheHandler extends Handler {
 		}
 	}
 
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return boolean
+	 */
 	function isSupport(){
 		if($this->handler && $this->handler->isSupport()) return true;
 		return false;
 	}
 
+	/**
+	 * Get cached data
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, return false.
+	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0){
 		if(!$this->handler) return false;
 		return $this->handler->get($key, $modified_time);
 	}
 
+	/**
+	 * Put data into cache
+	 *
+	 * @param string $key Cache key
+	 * @param mixed $obj	Value of a variable to store. $value supports all data types except resources, such as file handlers.
+	 * @param int $valid_time	Time for the variable to live in the cache in seconds.
+	 *							After the value specified in ttl has passed the stored variable will be deleted from the cache.
+	 *							If no ttl is supplied, use the default valid time.
+	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 */
 	function put($key, $obj, $valid_time = 0){
 		if(!$this->handler) return false;
 		return $this->handler->put($key, $obj, $valid_time);
 	}
 
+	/**
+	 * Delete Cache
+	 *
+	 * @param string $key Cache key
+	 * @return void
+	 */
 	function delete($key){
 		if(!$this->handler) return false;
 		return $this->handler->delete($key);
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, the data is invalid.
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time){
 		if(!$this->handler) return false;
 		return $this->handler->isValid($key, $modified_time);
 	}
 
+	/**
+	 * Truncate all cache
+	 *
+	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 */
 	function truncate(){
 		if(!$this->handler) return false;
 		return $this->handler->truncate();
@@ -91,6 +159,10 @@ class CacheHandler extends Handler {
 	 *
 	 * The new key will be 2:document:123, thus forcing the document
 	 * to be reloaded from the database.
+	 *
+	 * @param string $keyGroupName Group name
+	 * @param string $key Cache key
+	 * @return string
 	 */
 	function getGroupKey($keyGroupName, $key){
 		if(!$this->keyGroupVersions[$keyGroupName]){
@@ -101,29 +173,77 @@ class CacheHandler extends Handler {
 		return $this->keyGroupVersions[$keyGroupName] . ':' . $keyGroupName . ':' . $key;
 	}
 
+	/**
+	 * Make invalid group key (like delete group key)
+	 *
+	 * @param string $keyGroupName Group name
+	 * @return void
+	 */
 	function invalidateGroupKey($keyGroupName){
 		$this->keyGroupVersions[$keyGroupName]++;
 		$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
 	}
 }
 
+/**
+ * Base class of Cache
+ *
+ * @author NHN (developer@xpressengine.com)
+ */
 class CacheBase{
+
+	/**
+	 * Get cached data
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, return false.
+	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0){
 		return false;
 	}
 
+	/**
+	 * Put data into cache
+	 *
+	 * @param string $key Cache key
+	 * @param mixed $obj	Value of a variable to store. $value supports all data types except resources, such as file handlers.
+	 * @param int $valid_time	Time for the variable to live in the cache in seconds.
+	 *							After the value specified in ttl has passed the stored variable will be deleted from the cache.
+	 *							If no ttl is supplied, use the default valid time.
+	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 */
 	function put($key, $obj, $valid_time = 0){
 		return false;
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, the data is invalid.
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time = 0){
 		return false;
 	}
 
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return boolean
+	 */
 	function isSupport(){
 		return false;
 	}
 
+	/**
+	 * Truncate all cache
+	 *
+	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 */
 	function truncate(){
 		return false;
 	}
diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php
index 1f07c88d4..17962a71c 100644
--- a/classes/cache/CacheMemcache.class.php
+++ b/classes/cache/CacheMemcache.class.php
@@ -1,15 +1,28 @@
 <?php
 /**
- * @class CacheMemcache
+ * Cache class for memcache
+ *
  * @author NHN (developer@xpressengine.com)
- * @brief Memcache Handler
- * @version 0.1
  **/
-
 class CacheMemcache extends CacheBase {
+	/**
+	 * Default valid time
+	 * @var int
+	 */
 	var $valid_time = 36000;
+
+	/**
+	 * instance of Memcahe
+	 * @var Memcahe
+	 */
 	var $Memcache;
 
+	/**
+	 * Get instance of CacheMemcache
+	 *
+	 * @param string $url url of memcache
+	 * @return CacheMemcache instance of CacheMemcache
+	 */
 	function getInstance($url){
 		if(!$GLOBALS['__CacheMemcache__']) {
 			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
@@ -17,6 +30,13 @@ class CacheMemcache extends CacheBase {
 		return $GLOBALS['__CacheMemcache__'];
 	}
 
+	/**
+	 * Construct
+	 *
+	 * Do not use this directly. You can use getInstance() instead.
+	 * @param string $url url of memcache
+	 * @return void
+	 */
 	function CacheMemcache($url){
 		//$config['url'] = array('memcache://localhost:11211');
 		$config['url'] = is_array($url)?$url:array($url);
@@ -28,6 +48,11 @@ class CacheMemcache extends CacheBase {
 		}
 	}
 
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return bool Return true on support or false on not support
+	 */
 	function isSupport(){
 		if($GLOBALS['XE_MEMCACHE_SUPPORT']) return true;
 		if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1)) {
@@ -38,16 +63,47 @@ class CacheMemcache extends CacheBase {
 		return $GLOBALS['XE_MEMCACHE_SUPPORT'];
 	}
 
+	/**
+	 * Get unique key of given key by path of XE
+	 *
+	 * @param string $key Cache key
+	 * @return string Return unique key
+	 */
 	function getKey($key){
 		return md5(_XE_PATH_.$key);
 	}
 
+	/**
+	 * Store data at the server
+	 *
+	 * CacheMemcache::put() stores an item $buff with $key on the memcached server.
+	 * Parameter $valid_time is expiration time in seconds. If it's 0, the item never expires
+	 * (but memcached server doesn't guarantee this item to be stored all the time, it could be delete from the cache to make place for other items).
+	 *
+	 * Remember that resource variables (i.e. file and connection descriptors) cannot be stored in the cache,
+	 * because they can not be adequately represented in serialized state.
+	 *
+	 * @param string $key The key that will be associated with the item.
+	 * @param mixed $buff The variable to store. Strings and integers are stored as is, other types are stored serialized.
+	 * @param int $valid_time 	Expiration time of the item.
+	 *							You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
+	 *							If it's equal to zero, use the default valid time CacheMemcache::valid_time.
+	 * @return bool Returns true on success or false on failure.
+	 */
 	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);
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, the data is invalid.
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time = 0) {
 		$_key = $this->getKey($key);
 
@@ -63,6 +119,16 @@ class CacheMemcache extends CacheBase {
 		return true;
 	}
 
+	/**
+	 * Retrieve item from the server
+	 *
+	 * CacheMemcache::get() returns previously stored data if an item with such $key exists on the server at this moment.
+	 *
+	 * @param string $key The key to fetch
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, return false.
+	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0) {
 		$_key = $this->getKey($key);
 		$obj = $this->Memcache->get($_key);
@@ -78,15 +144,39 @@ class CacheMemcache extends CacheBase {
 		return $obj[1];
 	}
 
+	/**
+	 * Delete item from the server
+	 *
+	 * CacheMemcache::delete() deletes an item with tey $key.
+	 *
+	 * @param string $key The key associated with the item to delete.
+	 * @return void
+	 */
 	function delete($key) {
 		$_key = $this->getKey($key);
 		$this->_delete($_key);
 	}
 
+	/**
+	 * Delete item from the server(private)
+	 *
+	 * @see CacheMemcache::delete()
+	 * @param string $_key The key associated with the item to delete.
+	 * @return void
+	 */
 	function _delete($_key) {
 		$this->Memcache->delete($_key);
 	}
 
+	/**
+	 * Flush all existing items at the server
+	 *
+	 * CacheMemcache::truncate() immediately invalidates all existing items.
+	 * CacheMemcache::truncate() doesn't actually free any resources, it only marks all the items as expired,
+	 * so occupied memory will be overwitten by new items.
+	 *
+	 * @return bool Returns true on success or false on failure.
+	 */
 	function truncate() {
 		return $this->Memcache->flush();
 	}
diff --git a/classes/cache/CacheWincache.class.php b/classes/cache/CacheWincache.class.php
index 36484164b..248e98932 100644
--- a/classes/cache/CacheWincache.class.php
+++ b/classes/cache/CacheWincache.class.php
@@ -1,14 +1,24 @@
 <?php
 /**
- * @class CacheWincache
+ * Cache class for Wincache
+ *
+ * Wincache Handler
+ *
  * @author Arnia (support@xpressengine.org)
- * @brief Wincache Handler
- * @version 0.1
  **/
-
 class CacheWincache extends CacheBase {
+	/**
+	 * Default valid time
+	 * @var int
+	 */
 	var $valid_time = 36000;
 
+	/**
+	 * Get instance of CacheWincache
+	 *
+	 * @param void $opt Not used
+	 * @return CacheWincache instance of CacheWincache
+	 */
 	function getInstance($opt=null){
 		if(!$GLOBALS['__CacheWincache__']) {
 			$GLOBALS['__CacheWincache__'] = new CacheWincache();
@@ -16,18 +26,47 @@ class CacheWincache extends CacheBase {
 		return $GLOBALS['__CacheWincache__'];
 	}
 
+	/**
+	 * Constructor
+	 *
+	 * @return void
+	 */
 	function CacheWincache(){
 	}
 
+	/**
+	 * Return whether support or not support cache
+	 *
+	 * @return bool Return true on support or false on not support
+	 */
 	function isSupport(){
 		return function_exists('wincache_ucache_set');
 	}
 
+	/**
+	 * Adds a variable in user cache and overwrites a variable if it already exists in the cache
+	 *
+	 * @param string $key 	Store the variable using this $key value.
+	 *						If a variable with same $key is already present the function will overwrite the previous value with the new one.
+	 * @param mixed $buff	Value of a variable to store. $value supports all data types except resources, such as file handlers.
+	 * @param int $valid_time	Time for the variable to live in the cache in seconds.
+	 *							After the value specified in ttl has passed the stored variable will be deleted from the cache.
+	 *							If no ttl is supplied, use the default valid time CacheWincache::valid_time.
+	 * @return bool Returns true on success or false on failure.
+	 */
 	function put($key, $buff, $valid_time = 0){
 		if($valid_time == 0) $valid_time = $this->valid_time;
 		return wincache_ucache_set(md5(_XE_PATH_.$key), array(time(), $buff), $valid_time);
 	}
 
+	/**
+	 * Return whether cache is valid or invalid
+	 *
+	 * @param string $key Cache key
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, the data is invalid.
+	 * @return bool Return true on valid or false on invalid.
+	 */
 	function isValid($key, $modified_time = 0) {
 		$_key = md5(_XE_PATH_.$key);
 		$obj = wincache_ucache_get($_key, $success);
@@ -42,6 +81,14 @@ class CacheWincache extends CacheBase {
 		return true;
 	}
 
+	/**
+	 * Gets a variable stored in the user cache
+	 *
+	 * @param string $key The $key that was used to store the variable in the cache.
+	 * @param int $modified_time 	Unix time of data modified.
+	 *								If stored time is older then modified time, return false.
+	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 */
 	function get($key, $modified_time = 0) {
 		$_key = md5(_XE_PATH_.$key);
 		$obj = wincache_ucache_get($_key, $success);
@@ -55,15 +102,32 @@ class CacheWincache extends CacheBase {
 		return $obj[1];
 	}
 
+	/**
+	 * Delete variable from the cache(private)
+	 *
+	 * @param string $_key Used to store the value.
+	 * @return void
+	 */
 	function _delete($_key) {
 		wincache_ucache_delete($_key);
 	}
 
+	/**
+	 * Delete variable from the cache
+	 *
+	 * @param string $key Used to store the value.
+	 * @return void
+	 */
 	function delete($key) {
 		$_key = md5(_XE_PATH_.$key);
 		$this->_delete($_key);
 	}
 
+	/**
+	 * Truncate all existing variables at the cache
+	 *
+	 * @return bool Returns true on success or false on failure.
+	 */
 	function truncate() {
 		return wincache_ucache_clear();
 	}
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 8b0e70682..d3d5ccb44 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -362,7 +362,8 @@ class Context {
 	function checkSSO() {
 		// pass if it's not GET request or XE is not yet installed
 		if($this->db_info->use_sso != 'Y' || isCrawler()) return true;
-		if(Context::getRequestMethod()!='GET' || !Context::isInstalled() || in_array(Context::get('act'),array('rss','atom'))) return true;
+		$checkActList = array('rss'=>1, 'atom'=>1);
+		if(Context::getRequestMethod()!='GET' || !Context::isInstalled() || isset($checkActList[Context::get('act')])) return true;
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
@@ -630,8 +631,8 @@ class Context {
 	function setResponseMethod($method='HTML') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 
-		$methods = array('HTML','XMLRPC','JSON');
-		$self->response_method = in_array($method, $methods)?$method:$methods[0];
+		$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1);
+		$self->response_method = isset($methods[$method]) ? $method : 'HTML';
 	}
 
 	/*
@@ -644,9 +645,9 @@ class Context {
 		if($self->response_method) return $self->response_method;
 
 		$method  = $self->getRequestMethod();
-		$methods = array('HTML','XMLRPC','JSON');
+		$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1);
 
-		return in_array($method, $methods)?$method:$methods[0];
+		return isset($methods[$method]) ? $method : 'HTML';
 	}
 
 	/**
@@ -727,19 +728,42 @@ 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 == 'mid' || $key == 'vid' || $key == 'search_keyword') return htmlspecialchars($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);
-				$v = trim($v);
-				$val[$k] = $v;
-			}
-		} else {
-			if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc()) $val = stripslashes($val);
-			$val = trim($val);
+		$isArray = TRUE;
+		if(!is_array($val))
+		{
+			$isArray = FALSE;
+			$val = array($val);
+		}
+
+		foreach($val as $k => $v)
+		{
+			if($key === 'page' || $key === 'cpage' || substr($key, -3) === 'srl')
+			{
+				$val[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int)$v : $v;
+			}
+			elseif($key === 'mid' || $key === 'vid' || $key === 'search_keyword')
+			{
+				$val[$k] = htmlspecialchars($v);
+			}
+			else
+			{
+				if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc())
+				{
+					$v = stripslashes($v);
+				}
+
+				$val[$k] = trim($v);
+			}
+		}
+
+		if($isArray)
+		{
+			return $val;
+		}
+		else
+		{
+			return $val[0];
 		}
-		return $val;
 	}
 
 	/**
@@ -891,7 +915,8 @@ class Context {
 				$key = $get_vars['key'];
 				$srl = $get_vars['document_srl'];
 
-				$is_feed = in_array($act, array('rss', 'atom', 'api'));
+				$tmpArray = array('rss'=>1, 'atom'=>1, 'api'=>1);
+				$is_feed = isset($tmpArray[$act]);
 
 				$target_map = array(
 					'vid'=>$vid,
diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 7b3a1b864..d339947a1 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -1,18 +1,4 @@
 <?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);
 
@@ -45,11 +31,31 @@
         require(_XE_PATH_.'classes/db/queryparts/Subquery.class.php');
     }
 
+	/**
+	 * - DB parent class
+	 * - 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
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db
+	 * @version 0.1
+	 */
     class DB {
 
+		/**
+		 * count cache path
+		 * @var string
+		 */
         var $count_cache_path = 'files/cache/db';
 
-        var $cond_operation = array( ///< operations for condition
+		/**
+		 * operations for condition
+		 * @var array
+		 */
+        var $cond_operation = array(
             'equal' => '=',
             'more' => '>=',
             'excess' => '>',
@@ -60,35 +66,84 @@
             'null' => 'is null',
         );
 
-        var $master_db = NULL; // master database connection string
-        var $slave_db = NULL; // array of slave databases connection strings
+		/**
+		 * master database connection string
+		 * @var array
+		 */
+        var $master_db = NULL;
+		/**
+		 * array of slave databases connection strings
+		 * @var array
+		 */
+        var $slave_db = NULL;
 
-        var $result = NULL; ///< result
+        var $result = NULL;
 
-        var $errno = 0; ///< error code (0 means no error)
-        var $errstr = ''; ///< error message
-        var $query = ''; ///< query string of latest executed query
+		/**
+		 * error code (0 means no error)
+		 * @var int
+		 */
+        var $errno = 0;
+		/**
+		 * error message
+		 * @var string
+		 */
+        var $errstr = '';
+		/**
+		 * query string of latest executed query
+		 * @var string
+		 */
+        var $query = '';
         var $connection = '';
-        var $elapsed_time = 0; ///< elapsed time of latest executed query
-        var $elapsed_dbclass_time = 0; ///< elapsed time of latest executed query
+		/**
+		 * elapsed time of latest executed query
+		 * @var int
+		 */
+        var $elapsed_time = 0;
+		/**
+		 * elapsed time of latest executed DB class
+		 * @var int
+		 */
+        var $elapsed_dbclass_time = 0;
 
-        var $transaction_started = false; ///< transaction flag
+		/**
+		 * transaction flag
+		 * @var boolean
+		 */
+        var $transaction_started = false;
 
-        var $is_connected = false; ///< is db connected
+        var $is_connected = false;
 
-        var $supported_list = array(); ///< list of supported db, (will be written by classes/DB/DB***.class.php)
+		/**
+         * returns enable list in supported dbms list
+		 * will be written by classes/DB/DB***.class.php
+		 * @var array
+		 */
+        var $supported_list = array();
 
-        var $cache_file = 'files/cache/queries/'; ///< location of query cache
+		/**
+		 * location of query cache
+		 * @var string
+		 */
+        var $cache_file = 'files/cache/queries/';
 
-		var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
+		/**
+		 * stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
+		 * @var string
+		 */
+		var $db_type;
 
-		var $use_prepared_statements; ///< flag to decide if class prepared statements or not (when supported); can be changed from db.config.info
+		/**
+		 * flag to decide if class prepared statements or not (when supported); can be changed from db.config.info
+		 * @var string
+		 */
+		var $use_prepared_statements;
 		
-        /**
-         * @brief returns instance of certain db type
-         * @param[in] $db_type type of db
-         * @return instance
-         **/
+		/**
+		 * returns instance of certain db type
+		 * @param string $db_type type of db
+		 * @return DB return DB object 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');
@@ -108,32 +163,39 @@
             return $GLOBALS['__DB__'][$db_type];
         }
 
+		/**
+		 * returns instance of db
+		 * @return DB return DB object instance
+		 */
 		function create() {
 			return new DB;
 		}
 
         /**
-         * @brief constructor
-         * @return none
-         **/
+         * constructor
+         * @return void
+         */
         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
-         **/
+         * returns list of supported dbms list
+		 * this list return by directory list
+		 * check by instance can creatable
+         * @return array return supported DBMS list
+         */
         function getSupportedList() {
             $oDB = new DB();
             return $oDB->_getSupportedList();
         }
 
         /**
-         * @brief returns list of enable in supported db
-         * @return list of enable in supported db
-         **/
+         * returns enable list in supported dbms list
+		 * this list return by child class
+         * @return array return enable DBMS list in supported dbms list
+         */
         function getEnableList()
         {
                 if(!$this->supported_list)
@@ -152,9 +214,10 @@
         }
 
         /**
-         * @brief returns list of disable in supported db
-         * @return list of disable in supported db
-         **/
+         * returns list of disable in supported dbms list
+		 * this list return by child class
+         * @return array return disable DBMS list in supported dbms list
+         */
         function getDisableList()
         {
                 if(!$this->supported_list)
@@ -173,10 +236,17 @@
         }
 
         /**
-         * @brief returns list of supported db
-         * @return list of supported db
-         **/
+         * returns list of supported dbms list
+		 * this method is private
+         * @return array return supported DBMS list
+         */
         function _getSupportedList() {
+			static $get_supported_list = '';
+			if(is_array($get_supported_list)) {
+				$this->supported_list = $get_supported_list;
+				return $this->supported_list;
+			}
+			$get_supported_list = array();
             $db_classes_path = _XE_PATH_."classes/db/";
             $filter = "/^DB([^\.]+)\.class\.php/i";
             $supported_list = FileHandler::readDir($db_classes_path, $filter, true);
@@ -203,34 +273,37 @@
                 $obj->db_type = $db_type;
                 $obj->enable = $oDB->isSupported() ? true : false;
 
-                $this->supported_list[] = $obj;
+                $get_supported_list[] = $obj;
             }
-
+			$this->supported_list = $get_supported_list;
             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
-         **/
+         * Return dbms supportable status
+		 * The value is set in the child class
+         * @return boolean true: is supported, false: is not supported
+         */
         function isSupported() {
 			return FALSE;
         }
 
         /**
-         * @brief check if is connected
-         * @return true: connected, false: not connected
-         **/
+         * Return connected status
+		 * @param string $type master or slave
+		 * @param int $indx key of server list
+         * @return boolean 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
-         **/
+         * start recording log
+		 * @param string $query query string
+         * @return void
+         */
         function actStart($query) {
             $this->setError(0, 'success');
             $this->query = $query;
@@ -239,9 +312,9 @@
         }
 
         /**
-         * @brief finish recording log
-         * @return none
-         **/
+         * finish recording log
+         * @return void
+         */
         function actFinish() {
             if(!$this->query) return;
             $this->act_finish = getMicroTime();
@@ -297,41 +370,43 @@
         }
 
         /**
-         * @brief set error
-         * @param[in] $errno error code
-         * @param[in] $errstr error message
-         * @return none
-         **/
+         * set error
+         * @param int $errno error code
+         * @param string $errstr error message
+         * @return void
+         */
         function setError($errno = 0, $errstr = 'success') {
             $this->errno = $errno;
             $this->errstr = $errstr;
         }
 
         /**
-         * @brief check if an error occured
-         * @return true: error, false: no error
-         **/
+         * Return error status
+         * @return boolean true: error, false: no error
+         */
         function isError() {
             return $this->errno === 0 ? false : true;
         }
 
         /**
-         * @brief returns object of error info
-         * @return object of error
-         **/
+         * Returns object of error info
+         * @return object 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
-         **/
+         * Execute Query that result of the query xml file
+         * This function finds xml file or cache file of $query_id, compiles it and then execute it
+         * @param string $query_id query id (module.queryname)
+         * @param array|object $args arguments for query
+         * @param array $arg_columns column list. if you want get specific colums from executed result, add column list to $arg_columns
+         * @return object result of query
+         */
         function executeQuery($query_id, $args = NULL, $arg_columns = NULL) {
+			static $cache_file = array();
             if(!$query_id) return new Object(-1, 'msg_invalid_queryid');
 			if(!$this->db_type) return;
 
@@ -339,49 +414,51 @@
 
 			$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');
-	    }
+			if(!isset($cache_file[$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];
+					$typeList = array('addons'=>1, 'widgets'=>1);
+					if(!isset($typeList[$target])){
+						$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');
-	    }
+				$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);
+				// look for cache file
+				$cache_file[$query_id] = $this->checkQueryCacheFile($query_id, $xml_file);
+			}
+			$result = $this->_executeQuery($cache_file[$query_id], $args, $query_id, $arg_columns);
 
-	    $this->actDBClassFinish();
-            // execute query
-            return $result;
+			$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
-         **/
+         * Look for query cache file
+         * @param string $query_id query id for finding
+         * @param string $xml_file original xml query file
+         * @return string 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);
 
@@ -400,12 +477,13 @@
 
 
         /**
-         * @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
-         **/
+         * Execute query and return the result
+         * @param string $cache_file cache file of query
+         * @param array|object $source_args arguments for query
+         * @param string $query_id query id
+         * @param array $arg_columns column list. if you want get specific colums from executed result, add column list to $arg_columns
+         * @return object result of query
+         */
         function _executeQuery($cache_file, $source_args, $query_id, $arg_columns) {
             global $lang;
 
@@ -420,6 +498,7 @@
             // execute appropriate query
             switch($output->getAction()) {
                 case 'insert' :
+                case 'insert-select' :
                         $this->resetCountCache($output->tables);
                         $output = $this->_executeInsertAct($output);
                     break;
@@ -449,11 +528,11 @@
 
 
         /**
-         * @brief returns counter cache data
-         * @param[in] $tables tables to get data
-         * @param[in] $condition condition to get data
-         * @return count of cache data
-         **/
+         * Returns counter cache data
+         * @param array|string $tables tables to get data
+         * @param string $condition condition to get data
+         * @return int count of cache data
+         */
         function getCountCache($tables, $condition) {
             return false;
             if(!$tables) return false;
@@ -483,12 +562,12 @@
         }
 
         /**
-         * @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
-         **/
+         * Save counter cache data
+         * @param array|string $tables tables to save data
+         * @param string $condition condition to save data
+         * @param int $count count of cache data to save
+         * @return void
+         */
         function putCountCache($tables, $condition, $count = 0) {
             return false;
             if(!$tables) return false;
@@ -508,10 +587,10 @@
         }
 
         /**
-         * @brief reset counter cache data
-         * @param[in] $tables tables to reset cache data
-         * @return true: success, false: failed
-         **/
+         * Reset counter cache data
+         * @param array|string $tables tables to reset cache data
+         * @return boolean true: success, false: failed
+         */
         function resetCountCache($tables) {
             return false;
             if(!$tables) return false;
@@ -528,9 +607,9 @@
         }
 
         /**
-         * @brief returns supported database list
-         * @return list of supported database
-         **/
+         * Returns supported database list
+         * @return array list of supported database
+         */
         function getSupportedDatabase(){
             $result = array();
 
@@ -545,12 +624,23 @@
             return $result;
         }
 
+		/**
+		 * Drop tables
+		 * @param string $table_name
+		 * @return void
+		 */
         function dropTable($table_name){
             if(!$table_name) return;
             $query = sprintf("drop table %s%s", $this->prefix, $table_name);
             $this->_query($query);
         }
 
+		/**
+		 * Return select query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @return string
+		 */
     	function getSelectSql($query, $with_values = true){
 			$select = $query->getSelectString($with_values);
 			if($select == '') return new Object(-1, "Invalid query");
@@ -585,6 +675,13 @@
 		 	return $select . ' ' . $from . ' ' . $where . ' ' . $index_hint_list . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
 		}
 
+		/**
+		 * Return delete query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @param boolean $with_priority
+		 * @return string
+		 */
    		function getDeleteSql($query, $with_values = true, $with_priority = false){
 			$sql = 'DELETE ';
 
@@ -603,6 +700,13 @@
 			return $sql;
 		}
 
+		/**
+		 * Return update query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @param boolean $with_priority
+		 * @return string
+		 */
     	function getUpdateSql($query, $with_values = true, $with_priority = false){
 			$columnsList = $query->getUpdateString($with_values);
 			if($columnsList == '') return new Object(-1, "Invalid query");
@@ -618,6 +722,13 @@
 			return "UPDATE $priority $tables SET $columnsList ".$where;
 		}
 
+		/**
+		 * Return insert query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @param boolean $with_priority
+		 * @return string
+		 */
     	function getInsertSql($query, $with_values = true, $with_priority = false){
 			$tableName = $query->getFirstTableName();
 			$values = $query->getInsertString($with_values);
@@ -626,12 +737,22 @@
 			return "INSERT $priority INTO $tableName \n $values";
 		}
 
+		/**
+		 * Return index from slave server list
+		 * @return int
+		 */
         function _getSlaveConnectionStringIndex() {
             $max = count($this->slave_db);
             $indx = rand(0, $max - 1);
             return $indx;
         }
 
+		/**
+		 * Return connection resource
+		 * @param string $type use 'master' or 'slave'. default value is 'master'
+		 * @param int $indx if indx value is NULL, return rand number in slave server list
+		 * @return resource
+		 */
         function _getConnection($type = 'master', $indx = NULL){
             if($type == 'master'){
                 if(!$this->master_db['is_connected'])
@@ -650,6 +771,10 @@
             return $this->slave_db[$indx]["resource"];
         }
 
+		/**
+		 * check db information exists
+		 * @return boolean
+		 */
         function _dbInfoExists() {
             if (!$this->master_db)
                 return false;
@@ -658,13 +783,22 @@
             return true;
         }
 
+		/**
+		 * DB disconnection
+		 * this method is protected
+		 * @param resource $connection
+		 * @return void
+		 */
         function _close($connection){
 
         }
 
-        /**
-         * @brief DB disconnection
-         * */
+		/**
+		 * DB disconnection
+		 * @param string $type 'master' or 'slave'
+		 * @param int $indx number in slave dbms server list
+		 * @return void
+		 */
         function close($type = 'master', $indx = 0) {
             if (!$this->isConnected($type, $indx))
                 return;
@@ -679,12 +813,19 @@
             $connection["is_connected"] = false;
         }
 
+		/**
+		 * DB transaction start
+		 * this method is protected
+		 * @return boolean
+		 */
         function _begin(){
             return true;
         }
-        /**
-         * @brief Begin transaction
-         * */
+
+		/**
+		 * DB transaction start
+		 * @return void
+		 */
         function begin() {
             if (!$this->isConnected() || $this->transaction_started)
                 return;
@@ -693,13 +834,19 @@
                  $this->transaction_started = true;
         }
 
+		/**
+		 * DB transaction rollback
+		 * this method is protected
+		 * @return boolean
+		 */
         function _rollback(){
             return true;
         }
 
-        /**
-         * @brief Rollback
-         * */
+		/**
+		 * DB transaction rollback
+		 * @return void
+		 */
         function rollback() {
             if (!$this->isConnected() || !$this->transaction_started)
                 return;
@@ -707,12 +854,20 @@
                 $this->transaction_started = false;
         }
 
+		/**
+		 * DB transaction commit
+		 * this method is protected
+		 * @return boolean
+		 */
         function _commit(){
             return true;
         }
-        /**
-         * @brief Commits
-         * */
+
+		/**
+		 * DB transaction commit
+		 * @param boolean $force regardless transaction start status or connect status, forced to commit
+		 * @return void
+		 */
         function commit($force = false) {
             if (!$force && (!$this->isConnected() || !$this->transaction_started))
                 return;
@@ -720,18 +875,24 @@
                 $this->transaction_started = false;
         }
 
+		/**
+		 * Execute the query
+		 * this method is protected
+		 * @param string $query
+		 * @param resource $connection
+		 * @return void
+		 */
         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
-         * */
+
+		/**
+		 * Execute the query
+		 * this method is protected
+		 * @param string $query
+		 * @param resource $connection
+		 * @return resource
+		 */
         function _query($query, $connection = null) {
             if($connection == null)
                 $connection = $this->_getConnection('master');
@@ -747,9 +908,11 @@
             return $result;
         }
 
-        /**
-         * @brief DB settings and connect/close
-         * */
+		/**
+		 * DB info settings
+		 * this method is protected
+		 * @return void
+		 */
         function _setDBInfo(){
             $db_info = Context::getDBInfo();
             $this->master_db = $db_info->master_db;
@@ -766,16 +929,33 @@
 			$this->use_prepared_statements = $db_info->use_prepared_statements;
         }
 
+		/**
+		 * DB Connect
+		 * this method is protected
+		 * @param array $connection
+		 * @return void
+		 */
         function __connect($connection){
 
         }
 
+		/**
+		 * If have a task after connection, add a taks in this method
+		 * this method is protected
+		 * @param resource $connection
+		 * @return void
+		 */
         function _afterConnect($connection){
 
         }
-        /**
-         * @brief DB Connection
-         * */
+
+		/**
+		 * DB Connect
+		 * this method is protected
+		 * @param string $type 'master' or 'slave'
+		 * @param int $indx number in slave dbms server list
+		 * @return void
+		 */
         function _connect($type = 'master', $indx = 0) {
             if ($this->isConnected($type, $indx))
                 return;
@@ -804,20 +984,21 @@
 
             $this->_afterConnect($result);
         }
-	/**
-         * @brief start recording DBClass log
-         * @return none
-         **/
+
+		/**
+		 * Start recording DBClass log
+		 * @return void
+		 */
         function actDBClassStart() {
             $this->setError(0, 'success');
             $this->act_dbclass_start = getMicroTime();
             $this->elapsed_dbclass_time = 0;
         }
 
-        /**
-         * @brief finish recording DBClass log
-         * @return none
-         **/
+		/**
+		 * Finish recording DBClass log
+		 * @return void
+		 */
         function actDBClassFinish() {
             if(!$this->query) return;
             $this->act_dbclass_finish = getMicroTime();
@@ -826,14 +1007,16 @@
             $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
-         */
+		/**
+		 * Returns a database specific parser instance
+		 * used for escaping expressions and table/column identifiers
+		 *
+		 * Requires an implementation of the DB class (won't work if database is not set)
+         * this method is singleton
+		 *
+		 * @param boolean $force force load DBParser instance
+		 * @return DBParser
+		 */
        function &getParser($force = false){
             static $dbParser = null;
             if(!$dbParser || $force) {
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index a40ef697c..48d14cd69 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -1,28 +1,34 @@
 <?php
 	/**
-	 * @class DBCubrid
-	 * @author NHN (developers@xpressengine.com)
-	 * @brief Cubrid DBMS to use the class
-	 * @version 1.0
+	 * - DB child class
+	 * - Cubrid DBMS to use the class
+	 * - Works with CUBRID up to 8.4.1
 	 *
-	 * Works with CUBRID up to 8.4.1
-	 **/
-
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db
+	 * @version 0.1
+	 */
 	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)
+		 * prefix of XE tables(One more XE can be installed on a single DB)
+		 * @var string
+		 */
+		var $prefix = 'xe_';
+		/**
+		 * max size of constant in CUBRID(if string is larger than this, '...'+'...' should be used)
+		 * @var int
+		 */
+		var $cutlen = 12000;
 		var $comment_syntax = '/* %s */';
 
 		/**
-		 * @brief column type used in CUBRID
+		 * 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 array
 		 **/
 		var $column_type = array(
 			'bignumber' => 'numeric(20)',
@@ -37,8 +43,9 @@
 		);
 
 		/**
-		 * @brief constructor
-		 **/
+		 * constructor
+		 * @return void
+		 */
 		function DBCubrid()
 		{
 			$this->_setDBInfo();
@@ -46,7 +53,8 @@
 		}
 
 		/**
-		 * @brief create an instance of this class
+		 * Create an instance of this class
+		 * @return DBCubrid return DBCubrid object instance
 		 */
 		function create()
 		{
@@ -54,8 +62,10 @@
 		}
 
 		/**
-		 * @brief Return if installable
-		 **/
+		 * Return if supportable
+		 * Check 'cubrid_connect' function exists.
+		 * @return boolean
+		 */
 		function isSupported()
 		{
 			if (!function_exists('cubrid_connect')) return false;
@@ -63,8 +73,11 @@
 		}
 
 		/**
-		 * @brief DB Connection
-		 **/
+		 * DB Connect
+		 * this method is private
+		 * @param array $connection connection's value is db_hostname, db_port, db_database, db_userid, db_password
+		 * @return resource
+		 */
 		function __connect($connection)
 		{
             // attempts to connect
@@ -90,8 +103,11 @@
 		}
 
 		/**
-		 * @brief DB disconnect
-		 **/
+		 * DB disconnection
+		 * this method is private
+		 * @param resource $connection
+		 * @return void
+		 */
 		function _close($connection)
 		{
 			@cubrid_commit ($connection);
@@ -100,8 +116,10 @@
 		}
 
 		/**
-		 * @brief handles quatation of the string variables from the query
-		 **/
+		 * Handles quatation of the string variables from the query
+		 * @param string $string
+		 * @return string
+		 */
 		function addQuotes($string)
 		{
 			if (version_compare (PHP_VERSION, "5.9.0", "<") &&
@@ -126,8 +144,10 @@
 		}
 
 		/**
-		 * @brief Begin transaction
-		 **/
+		 * DB transaction start
+		 * this method is private
+		 * @return boolean
+		 */
 		function _begin()
 		{
 			if(__CUBRID_VERSION__ >= '8.4.0')
@@ -139,8 +159,10 @@
 		}
 
 		/**
-		 * @brief Rollback
-		 **/
+		 * DB transaction rollback
+		 * this method is private
+		 * @return boolean
+		 */
 		function _rollback()
 		{
             $connection = $this->_getConnection('master');
@@ -149,8 +171,10 @@
 		}
 
 		/**
-		 * @brief Commit
-		 **/
+		 * DB transaction commit
+		 * this method is private
+		 * @return boolean
+		 */
 		function _commit()
 		{
 			$connection = $this->_getConnection('master');
@@ -159,14 +183,12 @@
 		}
 
 		/**
-		 * @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
-		 **/
+		 * Execute the query
+		 * this method is private
+		 * @param string $query
+		 * @param resource $connection
+		 * @return resource
+		 */
 		function __query($query, $connection)
 		{
 			if($this->use_prepared_statements == 'Y')
@@ -232,8 +254,11 @@
 		}
 
 		/**
-		 * @brief Fetch the result
-		 **/
+		 * Fetch the result
+		 * @param resource $result
+		 * @param int|NULL $arrayIndexEndValue
+		 * @return array
+		 */
 		function _fetch($result, $arrayIndexEndValue = NULL)
 		{
 			$output = array();
@@ -281,8 +306,10 @@
 		}
 
 		/**
-		 * @brief return the sequence value incremented by 1(auto_increment column only used in the CUBRID sequence table)
-		 **/
+		 * Return the sequence value incremented by 1
+		 * Auto_increment column only used in the CUBRID sequence table
+		 * @return int
+		 */
 		function getNextSequence()
 		{
 			$this->_makeSequence();
@@ -295,8 +322,9 @@
 		}
 
 		/**
-		 * @brief return if the table already exists
-		 **/
+		 * if the table already exists, set the status to GLOBALS
+		 * @return void
+		 */
 		function _makeSequence()
 		{
 			if($_GLOBALS['XE_EXISTS_SEQUENCE']) return;
@@ -337,8 +365,10 @@
 
 
 		/**
-		 * brief return a table if exists
-		 **/
+		 * Check a table exists status
+		 * @param string $target_name
+		 * @return boolean
+		 */
 		function isTableExists ($target_name)
 		{
 			if($target_name == 'sequence') {
@@ -362,8 +392,15 @@
 		}
 
 		/**
-		 * @brief add a column to the table
-		 **/
+		 * Add a column to the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @param string $type column type, default value is 'number'
+		 * @param int $size column size
+		 * @param string|int $default default value
+		 * @param boolean $notnull not null status, default value is false
+		 * @return void
+		 */
 		function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = false)
 		{
 			$type = strtoupper($this->column_type[$type]);
@@ -397,8 +434,11 @@
 		}
 
 		/**
-		 * @brief drop a column from the table
-		 **/
+		 * Drop a column from the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @return void
+		 */
 		function dropColumn ($table_name, $column_name)
 		{
 			$query = sprintf ("alter class \"%s%s\" drop \"%s\" ", $this->prefix, $table_name, $column_name);
@@ -407,8 +447,11 @@
 		}
 
 		/**
-		 * @brief return column information of the table
-		 **/
+		 * Check column exist status of the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @return boolean
+		 */
 		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);
@@ -423,10 +466,15 @@
 		}
 
 		/**
-		 * @brief add an index to the table
+		 * Add an index to the table
 		 * $target_columns = array(col1, col2)
 		 * $is_unique? unique : none
-		 **/
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @param string|array $target_columns target column or columns
+		 * @param boolean $is_unique
+		 * @return void
+		 */
 		function addIndex ($table_name, $index_name, $target_columns, $is_unique = false)
 		{
 			if (!is_array ($target_columns)) {
@@ -439,8 +487,12 @@
 		}
 
 		/**
-		 * @brief drop an index from the table
-		 **/
+		 * Drop an index from the table
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @param boolean $is_unique
+		 * @return void
+		 */
 		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);
@@ -449,8 +501,11 @@
 		}
 
 		/**
-		 * @brief return index information of the table
-		 **/
+		 * Check index status of the table
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @return boolean
+		 */
 		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);
@@ -464,6 +519,10 @@
 			return true;
 		}
 
+		/**
+		 * Delete duplicated index of the table
+		 * @return boolean
+		 */
         function deleteDuplicateIndexes()
         {
             $query = sprintf("
@@ -507,16 +566,20 @@
         }
 
 		/**
-		 * @brief creates a table by using xml file
-		 **/
+		 * Creates a table by using xml contents
+		 * @param string $xml_doc xml schema contents
+		 * @return void|object
+		 */
 		function createTableByXml ($xml_doc)
 		{
 			return $this->_createTable ($xml_doc);
 		}
 
 		/**
-		 * @brief creates a table by using xml file
-		 **/
+		 * Creates a table by using xml file path
+		 * @param string $file_name xml schema file path
+		 * @return void|object
+		 */
 		function createTableByXmlFile ($file_name)
 		{
 			if (!file_exists ($file_name)) return;
@@ -526,12 +589,14 @@
 		}
 
 		/**
-		 * @brief create table by using the schema xml
+		 * 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
-		 **/
+		 * @param string $xml_doc xml schema contents
+		 * @return void|object
+		 */
 		function _createTable ($xml_doc)
 		{
 			// xml parsing
@@ -645,8 +710,11 @@
 
 
 		/**
-		 * @brief handles insertAct
-		 **/
+		 * Handles insertAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeInsertAct($queryObject, $with_values = true)
 		{
 			if($this->use_prepared_statements == 'Y')
@@ -668,8 +736,11 @@
 		}
 
 		/**
-		 * @brief handles updateAct
-		 **/
+		 * Handles updateAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeUpdateAct($queryObject, $with_values = true)
 		{
 			if($this->use_prepared_statements == 'Y')
@@ -689,8 +760,11 @@
 
 
 		/**
-		 * @brief handles deleteAct
-		 **/
+		 * Handles deleteAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeDeleteAct($queryObject, $with_values = true)
 		{
 			if($this->use_prepared_statements == 'Y')
@@ -710,11 +784,14 @@
 		}
 
 		/**
-		 * @brief Handle selectAct
-		 *
-		 * to get a specific page list easily in select statement,\n
+		 * Handle selectAct
+		 * To get a specific page list easily in select statement,
 		 * a method, navigation, is used
-		 **/
+		 * @param Object $queryObject
+		 * @param resource $connection
+		 * @param boolean $with_values
+		 * @return Object
+		 */
 	   function _executeSelectAct($queryObject, $connection = null, $with_values = true) {
 			if ($this->use_prepared_statements == 'Y') {
 				$this->param = $queryObject->getArguments();
@@ -745,6 +822,11 @@
 			}
 		}
 
+		/**
+		 * If have a error, return error object
+		 * @param Object $queryObject
+		 * @return Object
+		 */
 		function queryError($queryObject){
                         $limit = $queryObject->getLimit();
 			if ($limit && $limit->isPageHandler()){
@@ -759,6 +841,13 @@
 					return;
 		}
 
+		/**
+		 * If select query execute, return page info
+		 * @param Object $queryObject
+		 * @param resource $connection
+		 * @param boolean $with_values
+		 * @return Object Object with page info containing
+		 */
 		function queryPageLimit($queryObject, $connection, $with_values){
             $limit = $queryObject->getLimit();
 		 	// Total count
@@ -834,11 +923,23 @@
 			return $buff;
 		}
 
-		function &getParser($force = FALSE){
-			$dbParser = new DBParser('"', '"', $this->prefix);
-			return $dbParser;
+		/**
+		 * Return the DBParser
+		 * @param boolean $force
+		 * @return DBParser
+		 */
+		function getParser($force = FALSE){
+			return new DBParser('"', '"', $this->prefix);
 		}
 
+		/**
+		 * If select query execute, return paging sql
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @param int $start_count
+		 * @param int $list_count
+		 * @return string select paging sql
+		 */
                 function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {
 
                     $select = $query->getSelectString($with_values);
diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 520e134a9..fe709a177 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -1,27 +1,30 @@
 <?php
 
     /**
-     * @class DBMSSQL
+     * - DBMSSQL
+     * - Modified to use MSSQL driver by sol (sol@ngleader.com)
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief Modified to use MSSQL driver by sol (sol@ngleader.com)
+	 * @package /classes/db
      * @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)
+		 * prefix of XE tables(One more XE can be installed on a single DB)
+		 * @var string
+         */
+        var $prefix		= 'xe';
         var $param		= array();
         var $comment_syntax = '/* %s */';
 
         /**
-         * @brief column type used in mssql
+         * 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 array
+         */
         var $column_type = array(
             'bignumber' => 'bigint',
             'number' => 'int',
@@ -34,32 +37,39 @@
         );
 
         /**
-         * @brief constructor
-         **/
+         * Constructor
+		 * @return void
+         */
         function DBMssql() {
             $this->_setDBInfo();
             $this->_connect();
         }
 
 		/**
-		 * @brief create an instance of this class
+		 * Create an instance of this class
+		 * @return DBMssql return DBMssql object instance
 		 */
 		function create()
 		{
 			return new DBMssql;
 		}
 
-        /**
-         * @brief Return if installable
-         **/
+		/**
+		 * Return if supportable
+		 * Check 'sqlsrv' extension loaded.
+		 * @return boolean
+		 */
         function isSupported() {
             if (!extension_loaded("sqlsrv")) return false;
             return true;
         }
 
-        /**
-         * @brief DB Connection
-         **/
+		/**
+		 * DB Connect
+		 * this method is private
+		 * @param array $connection connection's value is db_hostname, db_database, db_userid, db_password
+		 * @return resource
+		 */
         function __connect($connection) {
             //sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
             //sqlsrv_configure( 'LogSeverity', SQLSRV_LOG_SEVERITY_ALL );
@@ -75,18 +85,23 @@
             return $result;
         }
 
-        /**
-         * @brief DB disconnect
-         **/
+		/**
+		 * DB disconnection
+		 * this method is private
+		 * @param resource $connection
+		 * @return void
+		 */
         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
+		/**
+		 * Handles quatation of the string variables from the query
+		 * @todo See what to do about this
+		 * @param string $string
+		 * @return string
+		 */
         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);
@@ -94,42 +109,46 @@
             return $string;
         }
 
-        /**
-         * @brief Begin transaction
-         **/
+		/**
+		 * DB transaction start
+		 * this method is private
+		 * @return boolean
+		 */
         function _begin() {
             $connection = $this->_getConnection('master');
             if(sqlsrv_begin_transaction($connection) === false) return;
             return true;
         }
 
-        /**
-         * @brief Rollback
-         **/
+		/**
+		 * DB transaction rollback
+		 * this method is private
+		 * @return boolean
+		 */
         function _rollback() {
             $connection = $this->_getConnection('master');
             sqlsrv_rollback($connection);
             return true;
         }
 
-        /**
-         * @brief Commit
-         **/
+		/**
+		 * DB transaction commit
+		 * this method is private
+		 * @return boolean
+		 */
         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
-         **/
+		/**
+		 * Execute the query
+		 * this method is private
+		 * @param string $query
+		 * @param resource $connection
+		 * @return resource|boolean Returns a statement resource on success and FALSE if an error occurred.
+		 */
         function __query($query, $connection) {
             $_param = array();
 
@@ -183,6 +202,8 @@
 		 * Parameters are sent as an array, where each parameter can be:
 		 *	- a PHP variable (by reference)
 		 *	- a PHP array (containng param value, type and direction) -> also needs to be sent by reference
+		 * @param array $_param
+		 * @return array
 		 */
 		function _getParametersByReference($_param) 
 		{
@@ -206,9 +227,12 @@
 			return $args;
 		}
 
-        /**
-         * @brief Fetch results
-         **/
+		/**
+		 * Fetch results
+		 * @param resource $result
+		 * @param int|NULL $arrayIndexEndValue
+		 * @return array
+		 */
         function _fetch($result, $arrayIndexEndValue = NULL) {
 			$output = array();
 			if(!$this->isConnected() || $this->isError() || !$result) return $output;
@@ -234,9 +258,11 @@
 
         }
 
-        /**
-         * @brief Return sequence value incremented by 1(auto_increment is usd in the sequence table only)
-         **/
+		/**
+		 * Return the sequence value incremented by 1
+		 * Auto_increment column only used in the sequence table
+		 * @return int
+		 */
         function getNextSequence() {
             $query = sprintf("insert into %ssequence (seq) values (ident_incr('%ssequence'))", $this->prefix, $this->prefix);
 			$this->_query($query);
@@ -249,9 +275,11 @@
             return $tmp->sequence;
         }
 
-        /**
-         * @brief Return if a table already exists
-         **/
+		/**
+		 * Check a table exists status
+		 * @param string $target_name
+		 * @return boolean
+		 */
         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);
@@ -261,9 +289,16 @@
             return true;
         }
 
-        /**
-         * @brief Add a column to a table
-         **/
+		/**
+		 * Add a column to the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @param string $type column type, default value is 'number'
+		 * @param int $size column size
+		 * @param string|int $default default value
+		 * @param boolean $notnull not null status, default value is false
+		 * @return void
+		 */
         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];
@@ -278,18 +313,24 @@
             $this->_query($query);
         }
 
-        /**
-         * @brief Delete a column from a table
-         **/
+		/**
+		 * Drop a column from the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @return void
+		 */
         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
-         **/
+		/**
+		 * Check column exist status of the table
+		 * @param string $table_name table name
+		 * @param string $column_name column name
+		 * @return boolean
+		 */
         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);
@@ -299,11 +340,16 @@
             return true;
         }
 
-        /**
-         * @brief Add an index to a table
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
+		/**
+		 * Add an index to the table
+		 * $target_columns = array(col1, col2)
+		 * $is_unique? unique : none
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @param string|array $target_columns target column or columns
+		 * @param boolean $is_unique
+		 * @return void
+		 */
         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);
@@ -312,18 +358,25 @@
             $this->_query($query);
         }
 
-        /**
-         * @brief Drop an index from a table
-         **/
+		/**
+		 * Drop an index from the table
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @param boolean $is_unique
+		 * @return void
+		 */
         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
-         **/
+		/**
+		 * Check index status of the table
+		 * @param string $table_name table name
+		 * @param string $index_name index name
+		 * @return boolean
+		 */
         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);
 
@@ -335,16 +388,20 @@
             return true;
         }
 
-        /**
-         * @brief Create a table by using xml file
-         **/
+		/**
+		 * Creates a table by using xml contents
+		 * @param string $xml_doc xml schema contents
+		 * @return void|object
+		 */
         function createTableByXml($xml_doc) {
             return $this->_createTable($xml_doc);
         }
 
-        /**
-         * @brief Create a table by using xml file
-         **/
+		/**
+		 * Creates a table by using xml file path
+		 * @param string $file_name xml schema file path
+		 * @return void|object
+		 */
         function createTableByXmlFile($file_name) {
             if(!file_exists($file_name)) return;
             // read xml file
@@ -352,13 +409,15 @@
             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
-         **/
+		/**
+		 * 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
+		 * @param string $xml_doc xml schema contents
+		 * @return void|object
+		 */
         function _createTable($xml_doc) {
             // xml parsing
             $oXml = new XmlParser();
@@ -381,6 +440,7 @@
 		$unique_list = array();
 		$index_list = array();
 
+				$typeList = array('number'=>1, 'text'=>1);
                 foreach($columns as $column) {
                     $name = $column->attrs->name;
                     $type = $column->attrs->type;
@@ -395,7 +455,7 @@
                     $column_schema[] = sprintf('[%s] %s%s %s %s %s',
                     $name,
                     $this->column_type[$type],
-                    !in_array($type,array('number','text'))&&$size?'('.$size.')':'',
+                    !isset($typeList[$type])&&$size?'('.$size.')':'',
                     isset($default)?"default '".$default."'":'',
                     $notnull?'not null':'null',
                     $auto_increment?'identity(1,1)':''
@@ -433,25 +493,37 @@
         }
 
 
-        /**
-         * @brief Handle the insertAct
-         **/
-        // TODO Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
+        
+		/**
+		 * Handles insertAct
+		 * @todo Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
+		 * @param Object $queryObject
+		 * @return resource
+		 */
         function _executeInsertAct($queryObject) {
         	$query = $this->getInsertSql($queryObject, false);
         	$this->param = $queryObject->getArguments();
             return $this->_query($query);
         }
 
-        /**
-         * @brief Handle updateAct
-         **/
+		/**
+		 * Handles updateAct
+		 * @param Object $queryObject
+		 * @return resource
+		 */
         function _executeUpdateAct($queryObject) {
         	$query = $this->getUpdateSql($queryObject, false);
         	$this->param = $queryObject->getArguments();
             return $this->_query($query);
         }
 
+		/**
+		 * Return update query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @param boolean $with_priority
+		 * @return string
+		 */
     	function getUpdateSql($query, $with_values = true, $with_priority = false){
 			$columnsList = $query->getUpdateString($with_values);
 			if($columnsList == '') return new Object(-1, "Invalid query");
@@ -473,15 +545,23 @@
 			return "UPDATE $priority $alias_list SET $columnsList FROM ".$from.$where;
 		}		
 		
-        /**
-         * @brief Handle deleteAct
-         **/
+		/**
+		 * Handles deleteAct
+		 * @param Object $queryObject
+		 * @return resource
+		 */
         function _executeDeleteAct($queryObject) {
         	$query = $this->getDeleteSql($queryObject, false);
         	$this->param = $queryObject->getArguments();
             return $this->_query($query);
         }
 
+		/**
+		 * Return select query string
+		 * @param object $query
+		 * @param boolean $with_values
+		 * @return string
+		 */
         function getSelectSql($query, $with_values = TRUE){
        		$with_values = false;
 
@@ -519,12 +599,14 @@
 		 	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
-         **/
+		/**
+		 * Handle selectAct
+		 * In order to get a list of pages easily when selecting \n
+		 * it supports a method as navigation
+		 * @param Object $queryObject
+		 * @param resource $connection
+		 * @return Object
+		 */
         function _executeSelectAct($queryObject, $connection = null) {
 			$query = $this->getSelectSql($queryObject);
 
@@ -540,11 +622,20 @@
 			else return $this->queryPageLimit($queryObject, $result, $connection);
         }
 
-        function &getParser($force = FALSE){
-		$dbParser = new DBParser("[", "]", $this->prefix);
-        	return $dbParser;
+		/**
+		 * Return the DBParser
+		 * @param boolean $force
+		 * @return DBParser
+		 */
+        function getParser($force = FALSE){
+        	return new DBParser("[", "]", $this->prefix);
         }
 
+		/**
+		 * If have a error, return error object
+		 * @param Object $queryObject
+		 * @return Object
+		 */
     	function queryError($queryObject){
                 $limit = $queryObject->getLimit();
 			if ($limit && $limit->isPageHandler()){
@@ -559,6 +650,13 @@
 					return;
 		}
 
+		/**
+		 * If select query execute, return page info
+		 * @param Object $queryObject
+		 * @param resource $result
+		 * @param resource $connection
+		 * @return Object Object with page info containing
+		 */
 		function queryPageLimit($queryObject, $result, $connection) {
 			$limit = $queryObject->getLimit();
 			if ($limit && $limit->isPageHandler()) {
@@ -615,7 +713,7 @@
 					$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
 					return $buff;
 				}
-				
+
 				$start_count = ($page - 1) * $list_count;
 				$this->param = $queryObject->getArguments();
 				$virtual_no = $total_count - $start_count;
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 6b95a1d01..b5be890d4 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -1,29 +1,30 @@
 <?php
 /**
- * @class DBMysql
- * @author NHN (developers@xpressengine.com)
- * @brief Class to use MySQL DBMS
- * @version 0.1
- *
+ * Class to use MySQL DBMS
  * mysql handling class
  *
  * Does not use prepared statements, since mysql driver does not support them
- **/
-
+ *
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db
+ * @version 0.1
+ */
 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)
+	 * prefix of a tablename (One or more XEs can be installed in a single DB)
+	 * @var string
+     */
+    var $prefix   = 'xe_'; // / <
     var $comment_syntax = '/* %s */';
 
     /**
-     * @brief Column type used in MySQL
+     * 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 array
+     */
     var $column_type = array(
         'bignumber' => 'bigint',
         'number' => 'bigint',
@@ -36,28 +37,38 @@ class DBMysql extends DB {
     );
 
     /**
-     * @brief constructor
-     **/
+     * Constructor
+	 * @return void
+     */
     function DBMysql() {
         $this->_setDBInfo();
         $this->_connect();
     }
 
+	/**
+	 * Create an instance of this class
+	 * @return DBMysql return DBMysql object instance
+	 */
     function create() {
         return new DBMysql;
     }
 
-    /**
-     * @brief Return if it is installable
-     **/
+	/**
+	 * Return if supportable
+	 * Check 'mysql_connect' function exists.
+	 * @return boolean
+	 */
     function isSupported() {
         if(!function_exists('mysql_connect')) return false;
         return true;
     }
 
-    /**
-     * @brief DB Connection
-     **/
+	/**
+	 * DB Connect
+	 * this method is private
+	 * @param array $connection connection's value is db_hostname, db_port, db_database, db_userid, db_password
+	 * @return resource
+	 */
     function __connect($connection) {
         // Ignore if no DB information exists
         if (strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
@@ -85,57 +96,72 @@ class DBMysql extends DB {
         return $result;
     }
 
+	/**
+	 * If have a task after connection, add a taks in this method
+	 * this method is private
+	 * @param resource $connection
+	 * @return void
+	 */
     function _afterConnect($connection){
         // Set utf8 if a database is MySQL
         $this->_query("set names 'utf8'", $connection);
     }
 
-    /**
-     * @brief DB disconnection
-     **/
+	/**
+	 * DB disconnection
+	 * this method is private
+	 * @param resource $connection
+	 * @return void
+	 */
     function _close($connection) {
         @mysql_close($connection);
     }
 
-    /**
-     * @brief Add quotes on the string variables in a query
-     **/
+	/**
+	 * Handles quatation of the string variables from the query
+	 * @param string $string
+	 * @return string
+	 */
     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
-     **/
+	/**
+	 * DB transaction start
+	 * this method is private
+	 * @return boolean
+	 */
     function _begin() {
         return true;
     }
 
-    /**
-     * @brief Rollback
-     **/
+	/**
+	 * DB transaction rollback
+	 * this method is private
+	 * @return boolean
+	 */
     function _rollback() {
         return true;
     }
 
-    /**
-     * @brief Commits
-     **/
+	/**
+	 * DB transaction commit
+	 * this method is private
+	 * @return boolean
+	 */
     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
-     **/
+	/**
+	 * Execute the query
+	 * this method is private
+	 * @param string $query
+	 * @param resource $connection
+	 * @return resource
+	 */
     function __query($query, $connection) {
         // Run the query statement
         $result = mysql_query($query, $connection);
@@ -145,9 +171,12 @@ class DBMysql extends DB {
         return $result;
     }
 
-    /**
-     * @brief Fetch results
-     **/
+	/**
+	 * Fetch the result
+	 * @param resource $result
+	 * @param int|NULL $arrayIndexEndValue
+	 * @return array
+	 */
     function _fetch($result, $arrayIndexEndValue = NULL) {
         $output = array();
         if(!$this->isConnected() || $this->isError() || !$result) return $output;
@@ -163,9 +192,11 @@ class DBMysql extends DB {
         return $output;
     }
 
-    /**
-     * @brief Return sequence value incremented by 1(auto_increment is used in sequence table only in MySQL)
-     **/
+	/**
+	 * Return the sequence value incremented by 1
+	 * Auto_increment column only used in the sequence table
+	 * @return int
+	 */
     function getNextSequence() {
         $query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
         $this->_query($query);
@@ -178,9 +209,12 @@ class DBMysql extends DB {
         return $sequence;
     }
 
-    /**
-     * @brief Function to obtain mysql old password(mysql only)
-     **/
+	/**
+	 * Function to obtain mysql old password(mysql only)
+	 * @param string $password input password
+	 * @param string $saved_password saved password in DBMS
+	 * @return boolean
+	 */
     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);
@@ -189,9 +223,11 @@ class DBMysql extends DB {
         return false;
     }
 
-    /**
-     * @brief Return if a table already exists
-     **/
+	/**
+	 * Check a table exists status
+	 * @param string $target_name
+	 * @return boolean
+	 */
     function isTableExists($target_name) {
         $query = sprintf("show tables like '%s%s'", $this->prefix, $this->addQuotes($target_name));
         $result = $this->_query($query);
@@ -200,9 +236,16 @@ class DBMysql extends DB {
         return true;
     }
 
-    /**
-     * @brief Add a column to a table
-     **/
+	/**
+	 * Add a column to the table
+	 * @param string $table_name table name
+	 * @param string $column_name column name
+	 * @param string $type column type, default value is 'number'
+	 * @param int $size column size
+	 * @param string|int $default default value
+	 * @param boolean $notnull not null status, default value is false
+	 * @return void
+	 */
     function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
         $type = $this->column_type[$type];
         if(strtoupper($type)=='INTEGER') $size = '';
@@ -216,17 +259,23 @@ class DBMysql extends DB {
         $this->_query($query);
     }
 
-    /**
-     * @brief Delete a column from a table
-     **/
+	/**
+	 * Drop a column from the table
+	 * @param string $table_name table name
+	 * @param string $column_name column name
+	 * @return void
+	 */
     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
-     **/
+	/**
+	 * Check column exist status of the table
+	 * @param string $table_name table name
+	 * @param string $column_name column name
+	 * @return boolean
+	 */
     function isColumnExists($table_name, $column_name) {
         $query = sprintf("show fields from `%s%s`", $this->prefix, $table_name);
         $result = $this->_query($query);
@@ -242,11 +291,16 @@ class DBMysql extends DB {
         return false;
     }
 
-    /**
-     * @brief Add an index to a table
-     * $target_columns = array(col1, col2)
-     * $is_unique? unique : none
-     **/
+	/**
+	 * Add an index to the table
+	 * $target_columns = array(col1, col2)
+	 * $is_unique? unique : none
+	 * @param string $table_name table name
+	 * @param string $index_name index name
+	 * @param string|array $target_columns target column or columns
+	 * @param boolean $is_unique
+	 * @return void
+	 */
     function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
         if(!is_array($target_columns)) $target_columns = array($target_columns);
 
@@ -254,18 +308,25 @@ class DBMysql extends DB {
         $this->_query($query);
     }
 
-    /**
-     * @brief Drop an index from a table
-     **/
+	/**
+	 * Drop an index from the table
+	 * @param string $table_name table name
+	 * @param string $index_name index name
+	 * @param boolean $is_unique
+	 * @return void
+	 */
     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
-     **/
+	/**
+	 * Check index status of the table
+	 * @param string $table_name table name
+	 * @param string $index_name index name
+	 * @return boolean
+	 */
     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);
@@ -281,16 +342,20 @@ class DBMysql extends DB {
         return false;
     }
 
-    /**
-     * @brief Create a table by using xml file
-     **/
+	/**
+	 * Creates a table by using xml contents
+	 * @param string $xml_doc xml schema contents
+	 * @return void|object
+	 */
     function createTableByXml($xml_doc) {
         return $this->_createTable($xml_doc);
     }
 
-    /**
-     * @brief Create a table by using xml file
-     **/
+	/**
+	 * Creates a table by using xml file path
+	 * @param string $file_name xml schema file path
+	 * @return void|object
+	 */
     function createTableByXmlFile($file_name) {
         if(!file_exists($file_name)) return;
         // read xml file
@@ -298,13 +363,15 @@ class DBMysql extends DB {
         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
-     **/
+	/**
+	 * 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
+	 * @param string $xml_doc xml schema contents
+	 * @return void|object
+	 */
     function _createTable($xml_doc) {
         // xml parsing
         $oXml = new XmlParser();
@@ -368,39 +435,51 @@ class DBMysql extends DB {
         if(!$output) return false;
     }
 
-    /**
-     * @brief Handle the insertAct
-     **/
+	/**
+	 * Handles insertAct
+	 * @param Object $queryObject
+	 * @param boolean $with_values
+	 * @return resource
+	 */
     function _executeInsertAct($queryObject, $with_values = true) {
         $query = $this->getInsertSql($queryObject, $with_values, true);
         if(is_a($query, 'Object')) return;
         return $this->_query($query);
     }
 
-    /**
-     * @brief Handle updateAct
-     **/
+	/**
+	 * Handles updateAct
+	 * @param Object $queryObject
+	 * @param boolean $with_values
+	 * @return resource
+	 */
     function _executeUpdateAct($queryObject, $with_values = true) {
         $query = $this->getUpdateSql($queryObject, $with_values, true);
         if(is_a($query, 'Object')) return;
         return $this->_query($query);
     }
 
-    /**
-     * @brief Handle deleteAct
-     **/
+	/**
+	 * Handles deleteAct
+	 * @param Object $queryObject
+	 * @param boolean $with_values
+	 * @return resource
+	 */
     function _executeDeleteAct($queryObject, $with_values = true) {
         $query = $this->getDeleteSql($queryObject, $with_values, true);
         if(is_a($query, 'Object')) return;
         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
-     **/
+	/**
+	 * Handle selectAct
+	 * In order to get a list of pages easily when selecting \n
+	 * it supports a method as navigation
+	 * @param Object $queryObject
+	 * @param resource $connection
+	 * @param boolean $with_values
+	 * @return Object
+	 */
     function _executeSelectAct($queryObject, $connection = null, $with_values = true) {
         $limit = $queryObject->getLimit();
         $result = NULL;
@@ -423,26 +502,52 @@ class DBMysql extends DB {
         }
     }
 
+	/**
+	 * Get the ID generated in the last query
+	 * Return next sequence from sequence table
+	 * This method use only mysql
+	 * @return int
+	 */
     function db_insert_id()
     {
         $connection = $this->_getConnection('master');
         return mysql_insert_id($connection);
     }
 
+	/**
+	 * Fetch a result row as an object
+	 * @param resource $result
+	 * @return object
+	 */
     function db_fetch_object(&$result)
     {
         return mysql_fetch_object($result);
     }
 
+	/**
+	 * Free result memory
+	 * @param resource $result
+	 * @return boolean Returns TRUE on success or FALSE on failure.
+	 */
     function db_free_result(&$result){
         return mysql_free_result($result);
     }
 
+	/**
+	 * Return the DBParser
+	 * @param boolean $force
+	 * @return DBParser
+	 */
     function &getParser($force = FALSE){
         $dbParser = new DBParser('`', '`', $this->prefix);
         return $dbParser;
     }
 
+	/**
+	 * If have a error, return error object
+	 * @param Object $queryObject
+	 * @return Object
+	 */
     function queryError($queryObject){
         $limit = $queryObject->getLimit();
         if ($limit && $limit->isPageHandler()){
@@ -457,6 +562,14 @@ class DBMysql extends DB {
             return;
     }
 
+	/**
+	 * If select query execute, return page info
+	 * @param Object $queryObject
+	 * @param resource $result
+	 * @param resource $connection
+	 * @param boolean $with_values
+	 * @return Object Object with page info containing
+	 */
     function queryPageLimit($queryObject, $result, $connection, $with_values = true){
         $limit = $queryObject->getLimit();
         // Total count
@@ -469,7 +582,7 @@ class DBMysql extends DB {
         $uses_groupby = $queryObject->getGroupByString() != '';
         if($uses_distinct || $uses_groupby) {
             $count_query = sprintf('select %s %s %s %s'
-                , $temp_select
+                , $temp_select == '*' ? '1' : $temp_select
                 , 'FROM ' . $queryObject->getFromString($with_values)
                 , ($temp_where === '' ? '' : ' WHERE '. $temp_where)
                 , ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
@@ -529,6 +642,14 @@ class DBMysql extends DB {
         return $buff;
     }
 
+	/**
+	 * If select query execute, return paging sql
+	 * @param object $query
+	 * @param boolean $with_values
+	 * @param int $start_count
+	 * @param int $list_count
+	 * @return string select paging sql
+	 */
     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");
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index d0f117907..ddb580b7a 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -1,79 +1,87 @@
 <?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
-	 * 
-	 * Does not use prepared statements since the mysql driver does not support them
-     **/
-
+	/**
+	 * Class to use MySQL innoDB DBMS
+	 * mysql innodb handling class
+	 *
+	 * Does not use prepared statements, since mysql driver does not support them
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db
+	 * @version 0.1
+	 **/
     class DBMysql_innodb extends DBMysql {
 
-        /**
-         * @brief constructor
-         **/
+		/**
+		 * Constructor
+		 * @return void
+		 **/
         function DBMysql_innodb() {
             $this->_setDBInfo();
             $this->_connect();
         }
 
 		/**
-		 * @brief create an instance of this class
+		 * Create an instance of this class
+		 * @return DBMysql_innodb return DBMysql_innodb object instance
 		 */
 		function create()
 		{
 			return new DBMysql_innodb;
 		}
 
-        /**
-         * @brief DB disconnection
-         **/
+		/**
+		 * DB disconnection
+		 * this method is private
+		 * @param resource $connection
+		 * @return void
+		 */
         function _close($connection) {
             $this->_query("commit", $connection);
             @mysql_close($connection);
         }
 
-        /**
-         * @brief Begin transaction
-         **/
+		/**
+		 * DB transaction start
+		 * this method is private
+		 * @return boolean
+		 */
         function _begin() {
             $connection = $this->_getConnection('master');
             $this->_query("begin", $connection);
             return true;
         }
 
-        /**
-         * @brief Rollback
-         **/
+		/**
+		 * DB transaction rollback
+		 * this method is private
+		 * @return boolean
+		 */
         function _rollback() {
             $connection = $this->_getConnection('master');
             $this->_query("rollback", $connection);
             return true;
         }
 
-        /**
-         * @brief Commits
-         **/
+		/**
+		 * DB transaction commit
+		 * this method is private
+		 * @return boolean
+		 */
         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
-         **/
+		/**
+		 * Execute the query
+		 * this method is private
+		 * @param string $query
+		 * @param resource $connection
+		 * @return resource
+		 */
         function __query($query, $connection) {
             // Run the query statement
             $result = @mysql_query($query, $connection);
@@ -83,13 +91,15 @@
             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
-         **/
+		/**
+		 * 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
+		 * @param string $xml_doc xml schema contents
+		 * @return void|object
+		 */
         function _createTable($xml_doc) {
             // xml parsing
             $oXml = new XmlParser();
diff --git a/classes/db/DBMysqli.class.php b/classes/db/DBMysqli.class.php
index f44e60877..76be9e810 100644
--- a/classes/db/DBMysqli.class.php
+++ b/classes/db/DBMysqli.class.php
@@ -1,44 +1,52 @@
 <?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 to use MySQLi DBMS as mysqli_*
+	 * mysql handling class
+	 *
+	 * Does not use prepared statements, since mysql driver does not support them
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db
+	 * @version 0.1
+	 **/
     class DBMysqli extends DBMysql {
 
-        /**
-         * @brief constructor
-         **/
+		/**
+		 * Constructor
+		 * @return void
+		 **/
         function DBMysqli() {
             $this->_setDBInfo();
             $this->_connect();
         }
 
-        /**
-         * @brief Return if it is installable
-         **/
+		/**
+		 * Return if supportable
+		 * Check 'mysqli_connect' function exists.
+		 * @return boolean
+		 */
         function isSupported() {
             if(!function_exists('mysqli_connect')) return false;
             return true;
         }
 
 		/**
-		 * @brief create an instance of this class
+		 * Create an instance of this class
+		 * @return DBMysqli return DBMysqli object instance
 		 */
 		function create()
 		{
 			return new DBMysqli;
 		}
 
-        /**
-         * @brief DB Connection
-         **/
+		/**
+		 * DB Connect
+		 * this method is private
+		 * @param array $connection connection's value is db_hostname, db_port, db_database, db_userid, db_password
+		 * @return resource
+		 */
         function __connect($connection) {
             // Attempt to connect
             if ($connection["db_port"]) {
@@ -62,16 +70,21 @@
             return $result;
         }
 
-        /**
-         * @brief DB disconnection
-         **/
+		/**
+		 * DB disconnection
+		 * this method is private
+		 * @param resource $connection
+		 * @return void
+		 */
         function _close($connection) {
             mysqli_close($connection);
         }
 
-        /**
-         * @brief Add quotes on the string variables in a query
-         **/
+		/**
+		 * Handles quatation of the string variables from the query
+		 * @param string $string
+		 * @return string
+		 */
         function addQuotes($string) {
             if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
             if(!is_numeric($string)){
@@ -81,15 +94,13 @@
             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
-         **/
+		/**
+		 * Execute the query
+		 * this method is private
+		 * @param string $query
+		 * @param resource $connection
+		 * @return resource
+		 */
         function __query($query, $connection) {
 			if($this->use_prepared_statements == 'Y')
 			{			
@@ -140,6 +151,13 @@
             return $result;
         }
 		
+		/**
+		 * Before execute query, prepare statement
+		 * this method is private
+		 * @param string $types
+		 * @param array $params
+		 * @return void
+		 */
 		function _prepareQueryParameters(&$types, &$params){
 			$types = '';
 			$params = array();
@@ -182,9 +200,12 @@
 			}			
 		}
 		
-       /**
-         * @brief Fetch results
-         **/
+		/**
+		 * Fetch the result
+		 * @param resource $result
+		 * @param int|NULL $arrayIndexEndValue
+		 * @return array
+		 */
         function _fetch($result, $arrayIndexEndValue = NULL) {
 			if($this->use_prepared_statements != 'Y'){
 				return parent::_fetch($result, $arrayIndexEndValue);
@@ -247,6 +268,12 @@
             return $output;
         }		
 		
+		/**
+		 * Handles insertAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeInsertAct($queryObject, $with_values = false){
 			if($this->use_prepared_statements != 'Y')
 			{
@@ -258,6 +285,12 @@
 			return $result;
 		}
 		
+		/**
+		 * Handles updateAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeUpdateAct($queryObject, $with_values = false) {
 			if($this->use_prepared_statements != 'Y')
 			{
@@ -269,6 +302,12 @@
 			return $result;
 		}
 		
+		/**
+		 * Handles deleteAct
+		 * @param Object $queryObject
+		 * @param boolean $with_values
+		 * @return resource
+		 */
 		function _executeDeleteAct($queryObject, $with_values = false) {
 			if($this->use_prepared_statements != 'Y')
 			{
@@ -280,6 +319,15 @@
 			return $result;
 		}		
 		
+		/**
+		 * Handle selectAct
+		 * In order to get a list of pages easily when selecting \n
+		 * it supports a method as navigation
+		 * @param Object $queryObject
+		 * @param resource $connection
+		 * @param boolean $with_values
+		 * @return Object
+		 */
 		function _executeSelectAct($queryObject, $connection = null, $with_values = false) {
 			if($this->use_prepared_statements != 'Y')
 			{
@@ -291,17 +339,33 @@
 			return $result;
 		}
 
+		/**
+		 * Get the ID generated in the last query
+		 * Return next sequence from sequence table
+		 * This method use only mysql
+		 * @return int
+		 */
 		function db_insert_id()
 		{
             $connection = $this->_getConnection('master');
             return  mysqli_insert_id($connection);
 		}
 
+		/**
+		 * Fetch a result row as an object
+		 * @param resource $result
+		 * @return object
+		 */
 		function db_fetch_object(&$result)
 		{
 			return mysqli_fetch_object($result);
 		}
 		
+		/**
+		 * Free result memory
+		 * @param resource $result
+		 * @return boolean Returns TRUE on success or FALSE on failure.
+		 */
 		function db_free_result(&$result){
 			return mysqli_free_result($result);		
 		}		
diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
index 1e13e40d4..65f0a1510 100644
--- a/classes/db/queryparts/Query.class.php
+++ b/classes/db/queryparts/Query.class.php
@@ -1,343 +1,497 @@
-<?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
-			, $priority = 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;
-		}
+<?php
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts
+	 * @version 0.1
+	 */
+	class Query extends Object {
+		/**
+		 * Query id, defined in query xml file
+		 * @var string
+		 */
+		var $queryID;
+		/**
+		 * DML type, ex) INSERT, DELETE, UPDATE, SELECT
+		 * @var string
+		 */
+		var $action;
+		/**
+		 * priority level ex)LOW_PRIORITY, HIGHT_PRIORITY
+		 * @var string
+		 */
+		var $priority;
+
+		/**
+		 * column list
+		 * @var string|array
+		 */
+		var $columns;
+		/**
+		 * table list
+		 * @var string|array
+		 */
+		var $tables;
+		/**
+		 * condition list
+		 * @var string|array
+		 */
+		var $conditions;
+		/**
+		 * group list
+		 * @var string|array
+		 */
+		var $groups;
+		/**
+		 * order list
+		 * @var array
+		 */
+		var $orderby;
+		/**
+		 * limit count
+		 * @var int
+		 */
+		var $limit;
+
+		/**
+		 * argument list
+		 * @var array
+		 */
+		var $arguments = null;
+
+		/**
+		 * column list
+		 * @var array
+		 */
+                var $columnList = null;
+
+		/**
+		 * order by text
+		 * @var string
+		 */
+		var $_orderByString;
+
+		/**
+		 * constructor
+		 * @param string $queryID
+		 * @param string $action
+		 * @param string|array $columns
+		 * @param string|array $tables
+		 * @param string|array $conditions
+		 * @param string|array $groups
+		 * @param string|array $orderby
+		 * @param int $limit
+		 * @param string $priority
+		 * @return void
+		 */
+		function Query($queryID = null
+			, $action = null
+			, $columns = null
+			, $tables = null
+			, $conditions = null
+			, $groups = null
+			, $orderby = null
+			, $limit = null
+			, $priority = 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 setPriority($priority){
-			$this->priority = $priority;
+		function setSubquery($subquery){
+			$this->subquery = $subquery;
 		}
-
-                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();
-
-				// Join table arguments
-				if(count($this->tables) > 0)
-				{
-					foreach($this->tables as $table)
-					{
-						if($table->isJoinTable())
-						{
-							$args = $table->getArguments();
-							if($args) $this->arguments = array_merge($this->arguments, $args);
-						}
-					}
-				}
+
+		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
+		/**
+		 * seleect set
+		 * @param string|array $columns
+		 * @return Query return Query instance
+		 */
+		function select($columns= null){
+			$this->action = 'select';
+			$this->setColumns($columns);
+			return $this;
+		}
+
+		/**
+		 * from set
+		 * @param string|array $tables
+		 * @return Query return Query instance
+		 */
+		function from($tables){
+			$this->setTables($tables);
+			return $this;
+		}
+
+		/**
+		 * where set
+		 * @param string|array $conditions
+		 * @return Query return Query instance
+		 */
+		function where($conditions){
+			$this->setConditions($conditions);
+			return $this;
+		}
+
+		/**
+		 * groupBy set
+		 * @param string|array $groups
+		 * @return Query return Query instance
+		 */
+		function groupBy($groups){
+			$this->setGroups($groups);
+			return $this;
+		}
+
+		/**
+		 * orderBy set
+		 * @param string|array $order
+		 * @return Query return Query instance
+		 */
+		function orderBy($order){
+			$this->setOrder($order);
+			return $this;
+		}
+
+		/**
+		 * limit set
+		 * @param int $limit
+		 * @return Query return Query instance
+		 */
+		function limit($limit){
+			$this->setLimit($limit);
+			return $this;
+		}
+		// END Fluent interface
+
+		function getAction(){
+			return $this->action;
+		}
+		
+		function getPriority(){
+			return $this->priority?'LOW_PRIORITY':'';
+		}
+
+		/**
+		 * Return select sql
+		 * @param boolean $with_values
+		 * @return string
+		 */
+		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, ', '));
+		}
+
+		/**
+		 * Return update sql
+		 * @param boolean $with_values
+		 * @return string
+		 */
+		function getUpdateString($with_values = true){
+                    foreach($this->columns as $column){
+                        if($column->show())
+                           $update[] = $column->getExpression($with_values);
+                    }
+                    return trim(implode($update, ', '));
+		}
+
+		/**
+		 * Return insert sql
+		 * @param boolean $with_values
+		 * @return string
+		 */
+		function getInsertString($with_values = true){
+			$columnsList = '';
+			if($this->subquery){ // means we have insert-select
 				
-				// 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()){
-							$args = $column->getArguments();
-							if($args) $this->arguments = array_merge($this->arguments, $args);
-						}
-					}
+				foreach($this->columns as $column){
+					$columnsList .= $column->getColumnName() . ', ';
 				}
-
-				// 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);
-					}
+				$columnsList = substr($columnsList, 0, -2);
+				
+				$selectStatement = $this->subquery->toString($with_values);
+				$selectStatement = substr($selectStatement, 1, -1);
+				
+				return "($columnsList) \n $selectStatement";
 			}
-			return $this->arguments;
-		}
-	}
-
-
-
-?>
+			
+			
+			$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
+		 * @param boolean $with_values
+		 * @return string
+		 */
+		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;
+		}
+
+		/**
+		 * Return where sql
+		 * @param boolean $with_values
+		 * @param boolean $with_optimization
+		 * @return string
+		 */
+		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);
+		}
+
+		/**
+		 * Return groupby sql
+		 * @return string
+		 */
+		function getGroupByString(){
+			$groupBy = '';
+			if($this->groups) if($this->groups[0] !== "")
+				$groupBy = implode(', ', $this->groups);
+			return $groupBy;
+		}
+
+		/**
+		 * Return orderby sql
+		 * @return string
+		 */
+		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;
+		}
+
+		/**
+		 * Return limit sql
+		 * @return string
+		 */
+		function getLimitString(){
+			$limit = '';
+			if(count($this->limit) > 0){
+				$limit = '';
+				$limit .= $this->limit->toString();
+			}
+			return $limit;
+		}
+
+		function getFirstTableName(){
+			return $this->tables[0]->getName();
+		}
+
+		/**
+		 * Return argument list
+		 * @return array
+		 */
+		function getArguments(){
+			if(!isset($this->arguments)){
+				$this->arguments = array();
+
+				// Join table arguments
+				if(count($this->tables) > 0)
+				{
+					foreach($this->tables as $table)
+					{
+						if($table->isJoinTable() || is_a($table, 'Subquery'))
+						{
+							$args = $table->getArguments();
+							if($args) $this->arguments = array_merge($this->arguments, $args);
+						}
+					}
+				}
+				
+				// 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()){
+							$args = $column->getArguments();
+							if($args) $this->arguments = array_merge($this->arguments, $args);
+						}
+					}
+				}
+
+				// 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;
+		}
+	}
+
+
+
+?>
diff --git a/classes/db/queryparts/Subquery.class.php b/classes/db/queryparts/Subquery.class.php
index 28352eee2..922b7f0b8 100644
--- a/classes/db/queryparts/Subquery.class.php
+++ b/classes/db/queryparts/Subquery.class.php
@@ -1,9 +1,33 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts
+	 * @version 0.1
+	 */
 	class Subquery extends Query {
+		/**
+		 * table alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * join type
+		 * @var string
+		 */
 		var $join_type;
 
+		/**
+		 * constructor
+		 * @param string $alias
+		 * @param string|array $columns
+		 * @param string|array $tables
+		 * @param string|array $conditions
+		 * @param string|array $groups
+		 * @param string|array $orderby
+		 * @param int $limit
+		 * @param string $join_type
+		 * @return void
+		 */
 		function Subquery($alias, $columns, $tables, $conditions, $groups, $orderby, $limit, $join_type = null){
 			$this->alias = $alias;
 
diff --git a/classes/db/queryparts/condition/Condition.class.php b/classes/db/queryparts/condition/Condition.class.php
index c8e55d0aa..4e4a2c634 100644
--- a/classes/db/queryparts/condition/Condition.class.php
+++ b/classes/db/queryparts/condition/Condition.class.php
@@ -1,9 +1,27 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/condition
+	 * @version 0.1
+	 */
 	class Condition {
+		/**
+		 * column name
+		 * @var string
+		 */
 		var $column_name;
 		var $argument;
+		/**
+		 * operation can use 'equal', 'more', 'excess', 'less', 'below', 'like_tail', 'like_prefix', 'like', 'notlike_tail',
+		 * 'notlike_prefix', 'notlike', 'in', 'notin', 'not_in', 'and', 'or', 'xor', 'not', 'notequal', 'between'
+		 * 'null', 'notnull'
+		 * @var string
+		 */
 		var $operation;
+		/**
+		 * pipe can use 'and', 'or'...
+		 * @var string
+		 */
 		var $pipe;
 
 		var $_value;
@@ -11,6 +29,14 @@
                 var $_show;
                 var $_value_to_string;
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param mixed $argument
+		 * @param string $operation
+		 * @param string $pipe
+		 * @return void
+		 */
 		function Condition($column_name, $argument, $operation, $pipe){
 			$this->column_name = $column_name;
 			$this->argument = $argument;
@@ -23,6 +49,11 @@
 			return null;
 		}
 
+		/**
+		 * value to string
+		 * @param boolean $withValue
+		 * @return string
+		 */
 		function toString($withValue = true){
 			if (!isset($this->_value_to_string)) {
 				if (!$this->show()) 
@@ -41,10 +72,18 @@
 			return $this->_value_to_string;
 		}
 
+		/**
+		 * change string without value
+		 * @return string
+		 */
 		function toStringWithoutValue(){
                     return $this->pipe . ' ' . $this->getConditionPart($this->_value);
 		}
 
+		/**
+		 * change string with value
+		 * @return string
+		 */
 		function toStringWithValue(){
                     return $this->pipe . ' ' . $this->getConditionPart($this->_value);
 		}
@@ -53,6 +92,9 @@
 			$this->pipe = $pipe;
 		}
 
+		/**
+		 * @return boolean
+		 */
 		function show(){
                     if(!isset($this->_show)){
                         if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '') {
@@ -74,6 +116,7 @@
                                 case 'notlike' :
                                 case 'in' :
                                 case 'notin' :
+								case 'not_in' :
                                 case 'and':
                                 case 'or':
                                 case 'xor':
@@ -82,17 +125,32 @@
                                         // 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; }
+										$tmpArray = array('string'=>1, 'integer'=>1);
+                                        if(!isset($tmpArray[gettype($this->_value)]))
+										{
+											$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;}
+								case 'null':
+								case 'notnull':
+									break;
+								default:
+									// If operation is not one of the above, means the condition is invalid
+									$this->_show = false;
                             }
                         }
                     }
                     return $this->_show;
 		}
 
+		/**
+		 * Return condition string
+		 * @param int|string|array $value
+		 * @return string
+		 */
 		function getConditionPart($value) {
                     $name = $this->column_name;
                     $operation = $this->operation;
@@ -131,6 +189,7 @@
                                     return $name.' in '.$value;
                                 break;
                             case 'notin' :
+							case 'not_in' :
                                     return $name.' not in '.$value;
                                 break;
                             case 'notequal' :
diff --git a/classes/db/queryparts/condition/ConditionGroup.class.php b/classes/db/queryparts/condition/ConditionGroup.class.php
index 201c8c8bf..daa90ad0a 100644
--- a/classes/db/queryparts/condition/ConditionGroup.class.php
+++ b/classes/db/queryparts/condition/ConditionGroup.class.php
@@ -1,12 +1,30 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/condition
+	 * @version 0.1
+	 */
 	class ConditionGroup {
+		/**
+		 * condition list
+		 * @var array
+		 */
 		var $conditions;
+		/**
+		 * pipe can use 'and', 'or'...
+		 * @var string
+		 */
 		var $pipe;
 
                 var $_group;
                 var $_show;
 
+		/**
+		 * constructor
+		 * @param array $conditions
+		 * @param string $pipe
+		 * @return void
+		 */
 		function ConditionGroup($conditions, $pipe = "") {
                         $this->conditions = array();
                         foreach($conditions as $condition){
@@ -28,6 +46,11 @@
                     $this->pipe = $pipe;
                 }
 
+		/**
+		 * value to string
+		 * @param boolean $with_value
+		 * @return string
+		 */
 		function toString($with_value = true){
                     if(!isset($this->_group)){
 			$cond_indx = 0;
@@ -48,6 +71,10 @@
                     return $this->_group;
 		}
 
+		/**
+		 * return argument list
+		 * @return array
+		 */
 		function getArguments(){
                     $args = array();
                     foreach($this->conditions as $condition){
@@ -57,4 +84,4 @@
                     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
index c515e814b..6d359914a 100644
--- a/classes/db/queryparts/condition/ConditionSubquery.class.php
+++ b/classes/db/queryparts/condition/ConditionSubquery.class.php
@@ -1,7 +1,19 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/condition
+	 * @version 0.1
+	 */
 	class ConditionSubquery extends Condition {
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param mixed $argument
+		 * @param string $operation
+		 * @param string $pipe
+		 * @return void
+		 */
             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
index 5badb729f..42bc86cd4 100644
--- a/classes/db/queryparts/condition/ConditionWithArgument.class.php
+++ b/classes/db/queryparts/condition/ConditionWithArgument.class.php
@@ -1,7 +1,19 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/condition
+	 * @version 0.1
+	 */
 	class ConditionWithArgument extends Condition {
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param mixed $argument
+		 * @param string $operation
+		 * @param string $pipe
+		 * @return void
+		 */
             function ConditionWithArgument($column_name, $argument, $operation, $pipe = ""){
                     if($argument === null) { $this->_show = false; return; }
                         parent::Condition($column_name, $argument, $operation, $pipe);
@@ -13,6 +25,10 @@
                     return $this->argument;
 		}
 
+		/**
+		 * change string without value
+		 * @return string
+		 */
 		function toStringWithoutValue(){
 			$value = $this->argument->getUnescapedValue();
 
@@ -37,6 +53,9 @@
 			return $this->pipe . ' ' . $this->getConditionPart($q);
 		}
 
+		/**
+		 * @return boolean
+		 */
 		function show(){
                     if(!isset($this->_show)){
                         if(!$this->argument->isValid()) $this->_show = false;
diff --git a/classes/db/queryparts/condition/ConditionWithoutArgument.class.php b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php
index 950235020..688b3e2df 100644
--- a/classes/db/queryparts/condition/ConditionWithoutArgument.class.php
+++ b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php
@@ -1,9 +1,22 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/condition
+	 * @version 0.1
+	 */
 	class ConditionWithoutArgument extends Condition {
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param mixed $argument
+		 * @param string $operation
+		 * @param string $pipe
+		 * @return void
+		 */
 		function ConditionWithoutArgument($column_name, $argument, $operation, $pipe = ""){
                     parent::Condition($column_name, $argument, $operation, $pipe);
-                    if(in_array($operation, array('in', 'notin'))){
+					$tmpArray = array('in'=>1, 'notin'=>1, 'not_in'=>1);
+                    if(isset($tmpArray[$operation])){
                         if(is_array($argument)) $argument = implode($argument, ',');
                         $this->_value = '('. $argument .')';
                     }
diff --git a/classes/db/queryparts/expression/ClickCountExpression.class.php b/classes/db/queryparts/expression/ClickCountExpression.class.php
index a112368e8..367681c0c 100644
--- a/classes/db/queryparts/expression/ClickCountExpression.class.php
+++ b/classes/db/queryparts/expression/ClickCountExpression.class.php
@@ -1,15 +1,24 @@
 <?php 
-
 	/**
-	 * @class ClickCountExpression
+	 * ClickCountExpression
 	 * @author Arnia Software
-	 * @brief 
-	 *
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class ClickCountExpression extends SelectExpression {
+		/**
+		 * click count
+		 * @var bool
+		 */
 		var $click_count;
 	
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param string $alias
+		 * @param bool $click_count
+		 * @return void
+		 */
 		function ClickCountExpression($column_name, $alias = NULL, $click_count = false){
 			parent::SelectExpression($column_name, $alias);
 			
@@ -25,9 +34,13 @@
 			return $this->click_count;
 		}
 		
+		/**
+		 * Return column expression, ex) column = column + 1
+		 * @return string
+		 */
 		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
index 611510109..d304b1e1e 100644
--- a/classes/db/queryparts/expression/DeleteExpression.class.php
+++ b/classes/db/queryparts/expression/DeleteExpression.class.php
@@ -1,20 +1,35 @@
 <?php 
 	/**
-	 * @class DeleteExpression
-	 * @author Arnia Software
-	 * @brief 
+	 * DeleteExpression
 	 *
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
+	 * @todo Fix this class 
 	 */
 
-	// TODO Fix this class 
 	class DeleteExpression extends Expression {
+		/**
+		 * column value
+		 * @var mixed
+		 */
 		var $value;
 		
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param mixed $value
+		 * @return void
+		 */
 		function DeleteExpression($column_name, $value){
 			parent::Expression($column_name);
 			$this->value = $value;
 		}
 		
+		/**
+		 * Return column expression, ex) column = value
+		 * @return string
+		 */
 		function getExpression(){
 			return "$this->column_name = $this->value";
 		}
@@ -32,4 +47,4 @@
 	}
 
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/expression/Expression.class.php b/classes/db/queryparts/expression/Expression.class.php
index bd11929f6..09868c9cf 100644
--- a/classes/db/queryparts/expression/Expression.class.php
+++ b/classes/db/queryparts/expression/Expression.class.php
@@ -1,18 +1,28 @@
 <?php
 	/**
-	 * @class Expression
-	 * @author Corina
-	 * @brief Represents an expression used in select/update/insert/delete statements
+	 * Expression
+	 * 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
 	 *
+	 * @author Corina
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class Expression {
+		/**
+		 * column name
+		 * @var string
+		 */
 		var $column_name;
 		
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @return void
+		 */
 		function Expression($column_name){
 			$this->column_name = $column_name;
 		}
@@ -25,6 +35,10 @@
 			return false;
 		}
 		
+		/**
+		 * Return column expression, ex) column as alias
+		 * @return string
+		 */
 		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
index 534c4542e..3cf8d81ee 100644
--- a/classes/db/queryparts/expression/InsertExpression.class.php
+++ b/classes/db/queryparts/expression/InsertExpression.class.php
@@ -1,15 +1,24 @@
 <?php
-
 	/**
-	 * @class InsertExpression
-	 * @author Arnia Software
-	 * @brief
+	 * InsertExpression
 	 *
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class InsertExpression extends Expression {
+		/**
+		 * argument
+		 * @var object
+		 */
 		var $argument;
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param object $argument
+		 * @return void
+		 */
 		function InsertExpression($column_name, $argument){
 			parent::Expression($column_name);
 			$this->argument = $argument;
diff --git a/classes/db/queryparts/expression/SelectExpression.class.php b/classes/db/queryparts/expression/SelectExpression.class.php
index 2ad5c796c..ea3a5d22b 100644
--- a/classes/db/queryparts/expression/SelectExpression.class.php
+++ b/classes/db/queryparts/expression/SelectExpression.class.php
@@ -1,26 +1,40 @@
 <?php
-
 	/**
-	 * @class SelectExpression
-	 * @author Arnia Software
-	 * @brief Represents an expresion that appears in the select clause
+	 * SelectExpression
+	 * 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
+	 *
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class SelectExpression extends Expression {
+		/**
+		 * column alias name
+		 * @var string
+		 */
 		var $column_alias;
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param string $alias
+		 * @return void
+		 */
 		function SelectExpression($column_name, $alias = NULL){
 			parent::Expression($column_name);
 			$this->column_alias = $alias;
 		}
 
+		/**
+		 * Return column expression, ex) column as alias
+		 * @return string
+		 */
 		function getExpression() {
 			return sprintf("%s%s", $this->column_name, $this->column_alias ? " as ".$this->column_alias : "");
 		}
diff --git a/classes/db/queryparts/expression/StarExpression.class.php b/classes/db/queryparts/expression/StarExpression.class.php
index b3c298a6a..38a877322 100644
--- a/classes/db/queryparts/expression/StarExpression.class.php
+++ b/classes/db/queryparts/expression/StarExpression.class.php
@@ -1,14 +1,17 @@
 <?php 
-
 	/**
-	 * @class StarExpression
-	 * @author Corina
-	 * @brief Represents the * in 'select * from ...' statements 
+	 * StarExpression
+	 * Represents the * in 'select * from ...' statements 
 	 *
+	 * @author Corina
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class StarExpression extends SelectExpression {
-		
+		/**
+		 * constructor, set the column to asterisk
+		 * @return void
+		 */
 		function StarExpression(){
 			parent::SelectExpression("*");
 		}
diff --git a/classes/db/queryparts/expression/UpdateExpression.class.php b/classes/db/queryparts/expression/UpdateExpression.class.php
index ab37d3caf..0f0324bc4 100644
--- a/classes/db/queryparts/expression/UpdateExpression.class.php
+++ b/classes/db/queryparts/expression/UpdateExpression.class.php
@@ -1,25 +1,43 @@
 <?php
 	/**
-	 * @class UpdateExpression
-	 * @author Arnia Software
-	 * @brief
+	 * UpdateExpression
 	 *
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class UpdateExpression extends Expression {
+		/**
+		 * argument
+		 * @var object
+		 */
 		var $argument;
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param object $argument
+		 * @return void
+		 */
 		function UpdateExpression($column_name, $argument){
 			parent::Expression($column_name);
 			$this->argument = $argument;
 		}
 
+		/**
+		 * Return column expression, ex) column = value
+		 * @return string
+		 */
 		function getExpression($with_value = true){
 			if($with_value)
 				return $this->getExpressionWithValue();
 			return $this->getExpressionWithoutValue();
 		}
 
+		/**
+		 * Return column expression, ex) column = value
+		 * @return string
+		 */
 		function getExpressionWithValue(){
 			$value = $this->argument->getValue();
                         $operation = $this->argument->getColumnOperation();
@@ -28,6 +46,11 @@
 			return "$this->column_name = $value";
 		}
 
+		/**
+		 * Return column expression, ex) column = ?
+		 * Can use prepare statement
+		 * @return string
+		 */
 		function getExpressionWithoutValue(){
                         $operation = $this->argument->getColumnOperation();
                         if(isset($operation))
diff --git a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
index ecb528a10..a8cd44495 100644
--- a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
+++ b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
@@ -1,14 +1,24 @@
 <?php
 	/**
-	 * @class UpdateExpression
-	 * @author Arnia Software
-	 * @brief
+	 * UpdateExpression
 	 *
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/expression
+	 * @version 0.1
 	 */
-
 	class UpdateExpressionWithoutArgument extends UpdateExpression {
+		/**
+		 * argument
+		 * @var object
+		 */
 		var $argument;
 
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param object $argument
+		 * @return void
+		 */
 		function UpdateExpressionWithoutArgument($column_name, $argument){
 			parent::Expression($column_name);
 			$this->argument = $argument;
@@ -35,11 +45,11 @@
 		function getArgument(){
 			return null;
 		}
-		
+	
 		function getArguments(){
 			return array();
 		}
 	}
 
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/limit/Limit.class.php b/classes/db/queryparts/limit/Limit.class.php
index 4cc372434..256c42eb1 100644
--- a/classes/db/queryparts/limit/Limit.class.php
+++ b/classes/db/queryparts/limit/Limit.class.php
@@ -1,10 +1,38 @@
 <?php 
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/limit
+	 * @version 0.1
+	 */
 	class Limit {
+		/**
+		 * start number
+		 * @var int
+		 */
 		var $start;
+		/**
+		 * list count
+		 * @var int
+		 */
 		var $list_count;
+		/**
+		 * page count
+		 * @var int
+		 */
 		var $page_count;
+		/**
+		 * current page
+		 * @var int
+		 */
 		var $page;
 
+		/**
+		 * constructor
+		 * @param int $list_count
+		 * @param int $page
+		 * @param int $page_count
+		 * @return void
+		 */
 		function Limit($list_count, $page= NULL, $page_count= NULL){
 			$this->list_count = $list_count;
 			if ($page){
@@ -16,7 +44,11 @@
 			}			
 		}
 		
-		function isPageHandler(){//in case you choose to use query limit in other cases than page select
+		/**
+		 * In case you choose to use query limit in other cases than page select
+		 * @return boolean
+		 */
+		function isPageHandler(){
 			if ($this->page)return true;
 			else return false;
 		}
@@ -34,4 +66,4 @@
 			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
index 445eaae64..3dfa8f949 100644
--- a/classes/db/queryparts/order/OrderByColumn.class.php
+++ b/classes/db/queryparts/order/OrderByColumn.class.php
@@ -1,8 +1,27 @@
 <?php 
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/order
+	 * @version 0.1
+	 */
 	class OrderByColumn {
+		/**
+		 * column name
+		 * @var string
+		 */
 		var $column_name;
+		/**
+		 * sort order
+		 * @var string
+		 */
 		var $sort_order;
 		
+		/**
+		 * constructor
+		 * @param string $column_name
+		 * @param string $sort_order
+		 * @return void
+		 */
 		function OrderByColumn($column_name, $sort_order){
 			$this->column_name = $column_name;
 			$this->sort_order = $sort_order;
@@ -28,4 +47,4 @@
 		}
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/CubridTableWithHint.class.php b/classes/db/queryparts/table/CubridTableWithHint.class.php
index ae1e7a1fe..79d645234 100644
--- a/classes/db/queryparts/table/CubridTableWithHint.class.php
+++ b/classes/db/queryparts/table/CubridTableWithHint.class.php
@@ -1,15 +1,42 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
+	 */
 	class CubridTableWithHint extends Table {
+		/**
+		 * table name
+		 * @var string
+		 */
 		var $name;
+		/**
+		 * table alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * index hint list
+		 * @var array
+		 */
                 var $index_hints_list;
 
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param string $alias
+		 * @param array $index_hints_list
+		 * @return void
+		 */
 		function CubridTableWithHint($name, $alias = NULL, $index_hints_list){
                     parent::Table($name, $alias);
                     $this->index_hints_list = $index_hints_list;
 		}
 
+		/**
+		 * Return index hint string
+		 * @return string
+		 */
 		function getIndexHintString(){
                     $result = '';
 
@@ -32,4 +59,4 @@
 		}
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/IndexHint.class.php b/classes/db/queryparts/table/IndexHint.class.php
index 6f24a954b..20e41f009 100644
--- a/classes/db/queryparts/table/IndexHint.class.php
+++ b/classes/db/queryparts/table/IndexHint.class.php
@@ -1,9 +1,27 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
+	 */
 	class IndexHint {
+		/**
+		 * index name
+		 * @var string
+		 */
 		var $index_name;
+		/**
+		 * index hint type, ex) IGNORE, FORCE, USE...
+		 * @var string
+		 */
 		var $index_hint_type;
 
+		/**
+		 * constructor
+		 * @param string $index_name
+		 * @param string $index_hint_type
+		 * @return void
+		 */
 		function IndexHint($index_name, $index_hint_type){
                     $this->index_name = $index_name;
                     $this->index_hint_type = $index_hint_type;
@@ -18,4 +36,4 @@
                 }
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/JoinTable.class.php b/classes/db/queryparts/table/JoinTable.class.php
index 47fd265e4..16818792f 100644
--- a/classes/db/queryparts/table/JoinTable.class.php
+++ b/classes/db/queryparts/table/JoinTable.class.php
@@ -1,19 +1,32 @@
 <?php 
-
 	/**
-	 * @class JoinTable
-	 * @author Arnia Software
-	 * @brief 
-	 * 
-	 * @remarks
+	 * class JoinTable
 	 * 		$conditions in an array of Condition objects 
-	 *
+	 * 
+	 * @author Arnia Software
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
 	 */
-
 	class JoinTable extends Table {
+		/**
+		 * join type
+		 * @var string
+		 */
 		var $join_type;
+		/**
+		 * condition list
+		 * @var array
+		 */
 		var $conditions;
 		
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param string $alias
+		 * @param string $join_type
+		 * @param array $conditions
+		 * @return void
+		 */
 		function JoinTable($name, $alias, $join_type, $conditions){
 			parent::Table($name, $alias);
 			$this->join_type = $join_type;
@@ -43,4 +56,4 @@
 		
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/MssqlTableWithHint.class.php b/classes/db/queryparts/table/MssqlTableWithHint.class.php
index a3c2e46e6..077456133 100644
--- a/classes/db/queryparts/table/MssqlTableWithHint.class.php
+++ b/classes/db/queryparts/table/MssqlTableWithHint.class.php
@@ -1,10 +1,33 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
+	 */
 	class MssqlTableWithHint extends Table {
+		/**
+		 * table name
+		 * @var string
+		 */
 		var $name;
+		/**
+		 * table alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * index hint type, ex) IGNORE, FORCE, USE...
+		 * @var array
+		 */
                 var $index_hints_list;
 
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param string $alias
+		 * @param string $index_hints_list
+		 * @return void
+		 */
 		function MssqlTableWithHint($name, $alias = NULL, $index_hints_list){
                     parent::Table($name, $alias);
                     $this->index_hints_list = $index_hints_list;
@@ -14,9 +37,10 @@
                     $result = parent::toString();
 
                     $index_hint_string = '';
+					$indexTypeList = array('USE'=>1, 'FORCE'=>1);
                     foreach($this->index_hints_list as $index_hint){
                         $index_hint_type = $index_hint->getIndexHintType();
-                        if(in_array($index_hint_type, array('USE', 'FORCE')))
+                        if(isset($indexTypeList[$index_hint_type]))
                                 $index_hint_string .= 'INDEX(' . $index_hint->getIndexName() . '), ';
                     }
                     if($index_hint_string != ''){
@@ -26,4 +50,4 @@
                 }
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/MysqlTableWithHint.class.php b/classes/db/queryparts/table/MysqlTableWithHint.class.php
index 58bdcac73..39c8c32b7 100644
--- a/classes/db/queryparts/table/MysqlTableWithHint.class.php
+++ b/classes/db/queryparts/table/MysqlTableWithHint.class.php
@@ -1,10 +1,33 @@
 <?php
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
+	 */
 	class MysqlTableWithHint extends Table {
+		/**
+		 * table name
+		 * @var string
+		 */
 		var $name;
+		/**
+		 * table alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * index hint type, ex) IGNORE, FORCE, USE...
+		 * @var array
+		 */
                 var $index_hints_list;
 
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param string $alias
+		 * @param string $index_hints_list
+		 * @return void
+		 */
 		function MysqlTableWithHint($name, $alias = NULL, $index_hints_list){
                     parent::Table($name, $alias);
                     $this->index_hints_list = $index_hints_list;
@@ -33,4 +56,4 @@
                 }
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/queryparts/table/Table.class.php b/classes/db/queryparts/table/Table.class.php
index 3a19d3a97..6092e10c7 100644
--- a/classes/db/queryparts/table/Table.class.php
+++ b/classes/db/queryparts/table/Table.class.php
@@ -1,9 +1,27 @@
 <?php 
-
+	/**
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/db/queryparts/table
+	 * @version 0.1
+	 */
 	class Table {
+		/**
+		 * table name
+		 * @var string
+		 */
 		var $name;
+		/**
+		 * table alias
+		 * @var string
+		 */
 		var $alias;
 		
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param string $alias
+		 * @return void
+		 */
 		function Table($name, $alias = NULL){
 			$this->name = $name;
 			$this->alias = $alias;
@@ -27,4 +45,4 @@
 		}
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 0327211b9..c1145e1d0 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -2,7 +2,7 @@
     /**
     * @class DisplayHandler
     * @author NHN (developers@xpressengine.com)
-    * @brief DisplayHandler is responsible for displaying the execution result. \n
+    *  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/.
@@ -16,11 +16,11 @@
 		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
-        **/
+         * 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 ModuleObject $oModule the module object
+		 * @return void
+         **/
         function printContent(&$oModule) {
             // Check if the gzip encoding supported
             if(
@@ -82,9 +82,10 @@
 
 
         /**
-         * @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
+         * 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
+		 * @return void
          **/
         function _debugOutput() {
             if(!__DEBUG__) return;
@@ -221,7 +222,8 @@
         }
 
 		/**
-		 * @brief print a HTTP HEADER for XML, which is encoded in UTF-8
+		 * print a HTTP HEADER for XML, which is encoded in UTF-8
+		 * @return void
 		 **/
 		function _printXMLHeader() {
 			header("Content-Type: text/xml; charset=UTF-8");
@@ -234,7 +236,8 @@
 
 
 		/**
-		 * @brief print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 * print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 * @return void
 		 **/
 		function _printHTMLHeader() {
 			header("Content-Type: text/html; charset=UTF-8");
@@ -247,7 +250,8 @@
 
 
 		/**
-		 * @brief print a HTTP HEADER for JSON, which is encoded in UTF-8
+		 * print a HTTP HEADER for JSON, which is encoded in UTF-8
+		 * @return void
 		 **/
 		function _printJSONHeader() {
 			header("Content-Type: text/html; charset=UTF-8");
@@ -260,7 +264,8 @@
 
 
 		/**
-		 * @brief print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 * print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 * @return void
 		 **/
 		function _printHttpStatusCode($code) {
 			$statusMessage = Context::get('http_status_message');
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 8670948ad..837a5ba6d 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -2,8 +2,9 @@
 
 class HTMLDisplayHandler {
 	/**
-	 * @brief Produce HTML compliant content given a module object.\n
-	 * @param[in] $oModule the module object
+	 * Produce HTML compliant content given a module object.\n
+	 * @param ModuleObject $oModule the module object
+	 * @return string compiled template string
 	 **/
 	function toDoc(&$oModule)
 	{
@@ -79,6 +80,11 @@ class HTMLDisplayHandler {
 		return $output;
 	}
 
+	/**
+	 * when display mode is HTML, prepare code before print.
+	 * @param string $output compiled template string
+	 * @return void
+	 **/
 	function prepareToPrint(&$output) {
 		if(Context::getResponseMethod() != 'HTML') return;
 
@@ -151,6 +157,11 @@ class HTMLDisplayHandler {
 		$oModuleController->replaceDefinedLangCode($output);
 	}
 
+	/**
+	 * when display mode is HTML, prepare code before print about <input> tag value.
+	 * @param array $match input value.
+	 * @return string input value.
+	 **/
 	function _preserveValue($match)
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
@@ -164,7 +175,7 @@ class HTMLDisplayHandler {
 		switch($type){
 			case 'text':
 			case 'hidden':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]]).'"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.@htmlspecialchars($INPUT_ERROR[$match[3]]).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -172,7 +183,7 @@ class HTMLDisplayHandler {
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str)) {
+				if(@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str)) {
 					$str .= ' checked="checked"';
 				}
 				break;
@@ -181,6 +192,11 @@ class HTMLDisplayHandler {
 		return $str.' />';
 	}
 
+	/**
+	 * when display mode is HTML, prepare code before print about <select> tag value.
+	 * @param array $matches select tag.
+	 * @return string select tag.
+	 **/
 	function _preserveSelectValue($matches)
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
@@ -200,6 +216,11 @@ class HTMLDisplayHandler {
 		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
+	/**
+	 * when display mode is HTML, prepare code before print about <textarea> tag value.
+	 * @param array $matches textarea tag information.
+	 * @return string textarea tag
+	 **/
 	function _preserveTextAreaValue($matches)
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
@@ -208,23 +229,29 @@ class HTMLDisplayHandler {
 	}
 
 	/**
-	 * @brief add html style code extracted from html body to Context, which will be
+	 * add html style code extracted from html body to Context, which will be
 	 * printed inside <header></header> later.
-	 * @param[in] $oModule the module object
+	 * @param array $matches
+	 * @return void
 	 **/
 	function _moveStyleToHeader($matches) {
 		Context::addHtmlHeader($matches[0]);
 	}
 
 	/**
-	 * @brief add given .css or .js file names in widget code to Context
-	 * @param[in] $oModule the module object
+	 * add given .css or .js file names in widget code to Context
+	 * @param array $matches
+	 * @return void
 	 **/
 	function _transMeta($matches) {
 		if($matches[1]) return '';
 		Context::loadFile($matches[2]);
 	}
 
+	/**
+	 * import basic .js files.
+	 * @return void
+	 **/
 	function _loadJSCSS()
 	{
 		$oContext  =& Context::getInstance();
@@ -260,6 +287,10 @@ class HTMLDisplayHandler {
 		}
 	}
 
+	/**
+	 * add meta tag.
+	 * @return void
+	 **/
 	function _addMetaTag()
 	{
 		$oContext =& Context::getInstance();
diff --git a/classes/display/JSONDisplayHandler.php b/classes/display/JSONDisplayHandler.php
index 538dd2ade..34219180b 100644
--- a/classes/display/JSONDisplayHandler.php
+++ b/classes/display/JSONDisplayHandler.php
@@ -1,6 +1,11 @@
 <?php
 
 class JSONDisplayHandler {
+	/**
+	 * Produce JSON compliant content given a module object.\n
+	 * @param ModuleObject $oModule the module object
+	 * @return string
+	 **/
 	function toDoc(&$oModule)
 	{
 		$variables = $oModule->getVariables();
diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php
index 850adeb75..40ae0ae5a 100644
--- a/classes/display/VirtualXMLDisplayHandler.php
+++ b/classes/display/VirtualXMLDisplayHandler.php
@@ -2,8 +2,9 @@
 
 class VirtualXMLDisplayHandler {
 	/**
-	 * @brief Produce virtualXML compliant content given a module object.\n
-	 * @param[in] $oModule the module object
+	 * Produce virtualXML compliant content given a module object.\n
+	 * @param ModuleObject $oModule the module object
+	 * @return string
 	 **/
 
 	function toDoc(&$oModule)
diff --git a/classes/display/XMLDisplayHandler.php b/classes/display/XMLDisplayHandler.php
index 1b1c0ff5e..f51364510 100644
--- a/classes/display/XMLDisplayHandler.php
+++ b/classes/display/XMLDisplayHandler.php
@@ -2,8 +2,9 @@
 
 class XMLDisplayHandler {
 	/**
-	 * @brief Produce XML compliant content given a module object.\n
-	 * @param[in] $oModule the module object
+	 * Produce XML compliant content given a module object.\n
+	 * @param ModuleObject $oModule the module object
+	 * @return string
 	 **/
 	function toDoc(&$oModule)
 	{
@@ -21,8 +22,9 @@ class XMLDisplayHandler {
 	}
 
 	/**
-	 * @brief produce XML code given variable object\n
-	 * @param[in] $oModule the module object
+	 * produce XML code given variable object\n
+	 * @param object $obj 
+	 * @return string
 	 **/
 	function _makeXmlDoc($obj) {
 		if(!count($obj)) return;
diff --git a/classes/editor/EditorHandler.class.php b/classes/editor/EditorHandler.class.php
index 0db5f451e..4d68b63ef 100644
--- a/classes/editor/EditorHandler.class.php
+++ b/classes/editor/EditorHandler.class.php
@@ -10,7 +10,9 @@
     class EditorHandler extends Object {
 
         /**
-         * @brief set the xml and other information of the component
+         * set the xml and other information of the component
+		 * @param object $info editor information
+		 * @return void
          **/
         function setInfo($info) {
             Context::set('component_info', $info);
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 44f5c9c4f..35ea30577 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -1,32 +1,48 @@
 <?php
     /**
-     * @class ExtraVar
+     * A class to handle extra variables used in posts, member and others
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief a class to handle extra variables used in posts, member and others
-     *
      **/
     class ExtraVar {
 
+		/**
+		 * sequence of module
+		 * @var int
+		 */
         var $module_srl = null;
+
+		/**
+		 * Current module's Set of ExtraItem
+		 * @var ExtraItem[]
+		 */
         var $keys = null;
 
         /**
-         * @brief constructor
+         * Get instance of ExtraVar (singleton)
+		 *
+		 * @param int $module_srl Sequence of module
+		 * @return ExtraVar
          **/
         function &getInstance($module_srl) {
             return new ExtraVar($module_srl);
         }
 
         /**
-         * @brief constructor
+         * Constructor
+		 *
+		 * @param int $module_srl Sequence of module
+		 * @return void
          **/
         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
+         * Register a key of extra variable
+		 * 
+		 * @param object[] $extra_keys Array of extra variable. A value of array is object that contains module_srl, idx, name, default, desc, is_required, search, value, eid.
+         * @return void
          **/
         function setExtraVarKeys($extra_keys) {
             if(!is_array($extra_keys) || !count($extra_keys)) return;
@@ -38,7 +54,9 @@
         }
 
         /**
-         * @brief Return an array of extra vars
+         * Returns an array of ExtraItem
+		 *
+		 * @return ExtraItem[]
          **/
         function getExtraVars() {
             return $this->keys;
@@ -46,24 +64,84 @@
     }
 
     /**
-     * @class ExtraItem
+     * Each value of the extra vars
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief each value of the extra vars
      **/
     class ExtraItem {
+		/**
+		 * Sequence of module
+		 * @var int
+		 */
         var $module_srl = 0;
+
+		/**
+		 * Index of extra variable
+		 * @var int
+		 */
         var $idx = 0;
+
+		/**
+		 * Name of extra variable
+		 * @var string
+		 */
         var $name = 0;
+
+		/**
+		 * Type of extra variable
+		 * @var string text, homepage, email_address, tel, textarea, checkbox, date, select, radio, kr_zip
+		 */
         var $type = 'text';
+
+		/**
+		 * Default values
+		 * @var string[]
+		 */
         var $default = null;
+
+		/**
+		 * Description
+		 * @var string
+		 */
         var $desc = '';
+
+		/**
+		 * Whether required or not requred this extra variable
+		 * @var string Y, N
+		 */
         var $is_required = 'N';
+
+		/**
+		 * Whether can or can not search this extra variable
+		 * @var string Y, N
+		 */
         var $search = 'N';
+
+		/**
+		 * Value
+		 * @var string
+		 */
         var $value = null;
+
+		/**
+		 * Unique id of extra variable in module
+		 * @var string
+		 */
         var $eid = '';
 
         /**
-         * @brief constructor
+         * Constructor
+		 *
+		 * @param int $module_srl Sequence of module
+		 * @param int $idx Index of extra variable
+		 * @param string $type Type of extra variable. text, homepage, email_address, tel, textarea, checkbox, date, sleect, radio, kr_zip
+		 * @param string[] $default Default values
+		 * @param string $desc Description
+		 * @param string $is_required Whether required or not requred this extra variable. Y, N
+		 * @param string $search Whether can or can not search this extra variable
+		 * @param string $value Value
+		 * @param string $eid Unique id of extra variable in module
+		 * @return void
          **/
         function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '') {
             if(!$idx) return;
@@ -80,14 +158,21 @@
         }
 
         /**
-         * @brief Values
+         * Sets Value
+		 *
+		 * @param string $value The value to set
+		 * @return void
          **/
         function setValue($value) {
             $this->value = $value;
         }
 
         /**
-         * @brief return a given value converted based on its type
+         * Returns a given value converted based on its type
+		 *
+		 * @param string $type Type of variable
+		 * @param string $value Value
+		 * @return string Returns a converted value
          **/
         function _getTypeValue($type, $value) {
             $value = trim($value);
@@ -134,8 +219,9 @@
         }
 
         /**
-         * @brief Return value
-         * return the original values for HTML result
+         * Returns a value for HTML
+		 *
+		 * @return string Returns a value expressed in HTML.
          **/
         function getValueHTML() {
             $value = $this->_getTypeValue($this->type, $this->value);
@@ -174,7 +260,9 @@
         }
 
         /**
-         * @brief return a form based on its type
+         * Returns a form based on its type
+		 *
+		 * @return string Returns a form html.
          **/
         function getFormHTML() {
 			static $id_num = 1000;
diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index 341c19aa3..04759a276 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @class FileHandler
+ * Contains methods for accessing file system
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief contains methods for accessing file system
  **/
-
 class FileHandler {
 	/**
-	 * @brief changes path of target file, directory into absolute path
-	 * @param[in] $source path
-	 * @return absolute path 
+	 * Changes path of target file, directory into absolute path
+	 *
+	 * @param string $source path to change into absolute path
+	 * @return string Absolute path
 	 **/
 	function getRealPath($source) {
 		$temp = explode('/', $source);
@@ -18,13 +18,15 @@ class FileHandler {
 	}
 
 	/**
-	 * @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
+	 * Copy a directory to target 
+	 *
+	 * If target directory does not exist, this function creates it 
+	 *
+	 * @param string $source_dir Path of source directory
+	 * @param string $target_dir Path of target dir
+	 * @param string $filter Regex to filter files. If file matches this regex, the file is not copied.
+	 * @param string $type If set as 'force'. Even if the file exists in target, the file is copied.
+	 * @return void
 	 **/
 	function copyDir($source_dir, $target_dir, $filter=null,$type=null){
 		$source_dir = FileHandler::getRealPath($source_dir);
@@ -53,11 +55,12 @@ class FileHandler {
 	}
 
 	/**
-	 * @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
+	 * Copy a file to target 
+	 *
+	 * @param string $source Path of source file
+	 * @param string $target Path of target file
+	 * @param string $force Y: overwrite
+	 * @return void
 	 **/
 	function copyFile($source, $target, $force='Y'){
 		setlocale(LC_CTYPE, 'en_US.UTF8', 'ko_KR.UTF8'); 
@@ -70,9 +73,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Returns the content of the file 
+	 *
+	 * @param string $file_name Path of target file
+	 * @return string 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);
@@ -96,11 +100,12 @@ class FileHandler {
 	}
 
 	/**
-	 * @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
+	 * Write $buff into the specified file
+	 *
+	 * @param string $file_name Path of target file
+	 * @param string $buff Content to be writeen
+	 * @param string $mode a(append) / w(write)
+	 * @return void
 	 **/
 	function writeFile($file_name, $buff, $mode = "w") {
 		$file_name = FileHandler::getRealPath($file_name);
@@ -118,9 +123,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief remove a file
-	 * @param[in] $file_name path of target file
-	 * @return returns true on success or false on failure.
+	 * Remove a file
+	 *
+	 * @param string $file_name path of target file
+	 * @return bool Returns true on success or false on failure.
 	 **/
 	function removeFile($file_name) {
 		$file_name = FileHandler::getRealPath($file_name);
@@ -128,11 +134,13 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Rename a file
+	 *
+	 * In order to move a file, use this function.
+	 *
+	 * @param string $source Path of source file
+	 * @param string $target Path of target file
+	 * @return bool Returns true on success or false on failure.
 	 **/
 	function rename($source, $target) {
 		$source = FileHandler::getRealPath($source);
@@ -141,10 +149,11 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Move a file
+	 *
+	 * @param string $source Path of source file
+	 * @param string $target Path of target file
+	 * @return bool Returns true on success or false on failure.
 	 */
 	function moveFile($source, $target) {
 		$source = FileHandler::getRealPath($source);
@@ -157,24 +166,28 @@ class FileHandler {
 	}
 
 	/**
-	 * @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
+	 * Move a directory 
+	 *
+	 * This function just wraps rename function.
+	 *
+	 * @param string $source_dir Path of source directory
+	 * @param string $target_dir Path of target directory
+	 * @return void
 	 **/
 	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 
+	 * Return list of the files in the path
+	 *
+	 * The array does not contain files, such as '.', '..', and files starting with '.'
+	 *
+	 * @param string $path Path of target directory
+	 * @param string $filter If specified, return only files matching with the filter
+	 * @param bool $to_lower If true, file names will be changed into lower case.
+	 * @param bool $concat_prefix If true, return file name as absolute path
+	 * @return string[] Array of the filenames in the path 
 	 **/
 	function readDir($path, $filter = '', $to_lower = false, $concat_prefix = false) {
 		$path = FileHandler::getRealPath($path);
@@ -205,10 +218,12 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Creates a directory
+	 *
+	 * This function creates directories recursively, which means that if ancestors of the target directory does not exist, they will be created too.
+	 *
+	 * @param string $path_string Path of target directory
+	 * @return bool true if success. It might return nothing when ftp is used and connection to the ftp address failed.
 	 **/
 	function makeDir($path_string) {
 		static $oFtp = null;
@@ -256,9 +271,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief remove all files under the path
-	 * @param[in] $path path of the target directory
-	 * @return none
+	 * Remove all files under the path
+	 *
+	 * @param string $path Path of the target directory
+	 * @return void
 	 **/
 	function removeDir($path) {
 		$path = FileHandler::getRealPath($path);
@@ -278,9 +294,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief remove a directory only if it is empty 
-	 * @param[in] $path path of the target directory
-	 * @return none
+	 * Remove a directory only if it is empty 
+	 *
+	 * @param string $path Path of the target directory
+	 * @return void
 	 **/
 	function removeBlankDir($path) {
 		$item_cnt = 0;
@@ -299,10 +316,12 @@ class FileHandler {
 
 
 	/**
-	 * @biref remove files in the target directory.  
-	 * @param[in] $path path of the target directory
-	 * @remarks This function keeps the directory structure. 
-	 * @return none
+	 * Remove files in the target directory
+	 *
+	 * This function keeps the directory structure. 
+	 *
+	 * @param string $path Path of the target directory
+	 * @return void
 	 **/
 	function removeFilesInDir($path) {
 		$path = FileHandler::getRealPath($path);
@@ -321,9 +340,11 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief makes file size byte into KB, MB according to the size
-	 * @param[in] $size number of the size
-	 * @return file size string
+	 * Makes file size byte into KB, MB according to the size
+	 *
+	 * @see FileHandler::returnBytes()
+	 * @param int $size Number of the size
+	 * @return string File size string
 	 **/
 	function filesize($size) {
 		if(!$size) return '0Byte';
@@ -334,17 +355,19 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Return remote file's content via HTTP
+	 *
+	 * If the target is moved (when return code is 300~399), this function follows the location specified response header.
+	 *
+	 * @param string $url The address of the target file 
+	 * @param string $body HTTP request body
+	 * @param int $timeout Connection timeout
+	 * @param string $method GET/POST
+	 * @param string $content_type Content type header of HTTP request
+	 * @param string[] $headers Headers key vaule array.
+	 * @param string[] $cookies Cookies key value array.
+	 * @param string $post_data Request arguments array for POST method
+	 * @return string If success, the content of the target file. Otherwise: none
 	 **/
 	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array()) {
 		requirePear();
@@ -402,15 +425,16 @@ class FileHandler {
 	}
 
 	/**
-	 * @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 
+	 * Retrieves remote file, then stores it into target path.
+	 *
+	 * @param string $url The address of the target file
+	 * @param string $target_filename The location to store
+	 * @param string $body HTTP request body
+	 * @param string $timeout Connection timeout
+	 * @param string $method GET/POST
+	 * @param string $content_type Content type header of HTTP request
+	 * @param string[] $headers Headers key vaule array.
+	 * @return bool 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);
@@ -421,9 +445,11 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief convert size in string into numeric value 
-	 * @param[in] $val size in string (ex., 10, 10K, 10M, 10G )
-	 * @return converted size
+	 * Convert size in string into numeric value 
+	 *
+	 * @see FileHandler::filesize()
+	 * @param $val Size in string (ex., 10, 10K, 10M, 10G )
+	 * @return int converted size
 	 */
 	function returnBytes($val)
 	{
@@ -438,9 +464,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @brief check available memory to load image file 
-	 * @param[in] $imageInfo image info retrieved by getimagesize function 
-	 * @return true: it's ok, false: otherwise 
+	 * Check available memory to load image file 
+	 *
+	 * @param array $imageInfo Image info retrieved by getimagesize function 
+	 * @return bool true: it's ok, false: otherwise 
 	 */
 	function checkMemoryLoadImage(&$imageInfo)
 	{
@@ -456,14 +483,15 @@ class FileHandler {
 	}
 
 	/**
-	 * @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 
+	 * Moves an image file (resizing is possible)
+	 *
+	 * @param string $source_file Path of the source file
+	 * @param string $target_file Path of the target file
+	 * @param int $resize_width Width to resize 
+	 * @param int $resize_height Height to resize
+	 * @param string $target_type If $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
+	 * @param string $thumbnail_type Thumbnail type(crop, ratio)
+	 * @return bool 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);
@@ -610,9 +638,11 @@ class FileHandler {
 	}
 
 	/**
-	 * @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)
+	 * Reads ini file, and puts result into array
+	 *
+	 * @see FileHandler::writeIniFile()
+	 * @param string $filename Path of the ini file
+	 * @return array ini array (if the target file does not exist, it returns false)
 	 **/
 	function readIniFile($filename){
 		$filename = FileHandler::getRealPath($filename);
@@ -624,10 +654,18 @@ class FileHandler {
 
 
 	/**
-	 * @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
+	 * Write array into ini file
+	 *
+	 *	$ini['key1'] = 'value1';<br/>
+	 *	$ini['key2'] = 'value2';<br/>
+	 *	$ini['section']['key1_in_section'] = 'value1_in_section';<br/>
+	 *	$ini['section']['key2_in_section'] = 'value2_in_section';<br/>
+	 *	FileHandler::writeIniFile('exmple.ini', $ini);
+	 *
+	 * @see FileHandler::readIniFile()
+	 * @param string $filename Target ini file name
+	 * @param array $arr Array
+	 * @return bool if array contains nothing it returns false, otherwise true
 	 **/
 	function writeIniFile($filename, $arr){
 		if(count($arr)==0) return false;
@@ -635,6 +673,12 @@ class FileHandler {
 		return true;
 	}
 
+	/**
+	 * Make array to ini string
+	 *
+	 * @param array $arr Array
+	 * @return string
+	 */
 	function _makeIniBuff($arr){
 		$return = '';
 		foreach($arr as $key => $val){
@@ -653,11 +697,13 @@ class FileHandler {
 	}
 
 	/**
-	 * @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 
+	 * Returns a file object 
+	 *
+	 * If the directory of the file does not exist, create it.
+	 *
+	 * @param string $filename Target file name
+	 * @param string $mode File mode for fopen
+	 * @return FileObject File object 
 	 **/
 	function openFile($filename, $mode)
 	{
@@ -671,9 +717,10 @@ class FileHandler {
 	}
 
 	/**
-	 * @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.
+	 * Check whether the given file has the content.
+	 *
+	 * @param string $filename Target file name
+	 * @return bool Returns true if the file exists and contains something.
 	 */
 	function hasContent($filename)
 	{
diff --git a/classes/file/FileObject.class.php b/classes/file/FileObject.class.php
index fd83b127c..05c7bc62c 100644
--- a/classes/file/FileObject.class.php
+++ b/classes/file/FileObject.class.php
@@ -1,21 +1,35 @@
 <?php
 /**
- * @class FileObject
+ * File abstraction class 
+ *
  * @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
+	/**
+	 * File descriptor
+	 * @var resource
+	 */
+	var $fp = null;
 
 	/**
-	 * @brief constructor 
-	 * @param[in] $path path of target file
-	 * @param[in] $mode file open mode 
-	 * @return file object 
+	 * File path
+	 * @var string
+	 */
+	var $path = null;
+
+	/**
+	 * File open mode
+	 * @var string
+	 */
+	var $mode = "r";
+
+	/**
+	 * Constructor 
+	 *
+	 * @param string $path Path of target file
+	 * @param string $mode File open mode 
+	 * @return void
 	 **/
 	function FileObject($path, $mode)
 	{
@@ -23,9 +37,10 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @brief append target file's content to current file 
-	 * @param[in] $file_name path of target file
-	 * @return none 
+	 * Append target file's content to current file 
+	 *
+	 * @param string $file_name Path of target file
+	 * @return void 
 	 **/
 	function append($file_name)
 	{
@@ -39,8 +54,9 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @brief check current file meets eof
-	 * @return true: if eof. false: otherwise 
+	 * Check current file meets eof
+	 *
+	 * @return bool true: if eof. false: otherwise 
 	 **/
 	function feof()
 	{
@@ -48,9 +64,10 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @brief read from current file 
-	 * @param[in] $size size to read
-	 * @return read bytes 
+	 * Read from current file 
+	 *
+	 * @param int $size Size to read
+	 * @return string Returns the read string or false on failure.
 	 **/
 	function read($size = 1024)
 	{
@@ -59,9 +76,10 @@ class FileObject extends Object
 
 
 	/**
-	 * @brief write string to current file 
-	 * @param[in] $str string to write
-	 * @return written bytes. if failed, it returns false 
+	 * Write string to current file 
+	 *
+	 * @param string $str String to write
+	 * @return int Returns the number of bytes written, or false on error.
 	 **/
 	function write($str)
 	{
@@ -73,11 +91,13 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @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.
+	 * Open a file
+	 *
+	 * If file is opened, close it and open the new path
+	 *
+	 * @param string $path Path of target file
+	 * @param string $mode File open mode (http://php.net/manual/en/function.fopen.php)
+	 * @return bool true if succeed, false otherwise.
 	 */
 	function open($path, $mode)
 	{
@@ -96,8 +116,9 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @brief return current file's path 
-	 * @return file path 
+	 * Return current file's path
+	 *
+	 * @return string Returns the path of current file.
 	 **/
 	function getPath()
 	{
@@ -112,8 +133,9 @@ class FileObject extends Object
 	}
 
 	/**
-	 * @brief close file 
-	 * @return none 
+	 * Close file 
+	 *
+	 * @return void
 	 **/
 	function close()
 	{
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 90a3ebce4..6e68b47c2 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -1,18 +1,51 @@
 <?php
 	/**
-	 * @class FrontEndFileHandler
+	 * Handle front end files
 	 * @author NHN (developers@xpressengine.com)
 	 **/
-
 	class FrontEndFileHandler extends Handler
 	{
+		/**
+		 * Map for css
+		 * @var array
+		 */
 		var $cssMap = array();
+
+		/**
+		 * Map for Javascript at head
+		 * @var array
+		 */
 		var $jsHeadMap = array();
+
+		/**
+		 * Map for Javascript at body
+		 * @var array
+		 */
 		var $jsBodyMap = array();
+
+		/**
+		 * Index for css
+		 * @var array
+		 */
 		var $cssMapIndex = array();
+
+		/**
+		 * Index for javascript at head
+		 * @var array
+		 */
 		var $jsHeadMapIndex = array();
+
+		/**
+		 * Index for javascript at body
+		 * @var array
+		 */
 		var $jsBodyMapIndex = array();
 
+		/**
+		 * Check SSL
+		 *
+		 * @return bool If using ssl returns true, otherwise returns false.
+		 */
 		function isSsl()
 		{
 			if ($GLOBAL['__XE_IS_SSL__']) return $GLOBAL['__XE_IS_SSL__'];
@@ -27,8 +60,11 @@
 		}
 
 		/**
-		 * @brief load front end file
-		 * @params $args array
+		 * Load front end file
+		 *
+		 * The $args is use as below. File type(js, css) is detected by file extension.
+		 *
+		 * <pre>
 		 * case js
 		 *		$args[0]: file name
 		 *		$args[1]: type (head | body)
@@ -39,6 +75,22 @@
 		 *		$args[1]: media
 		 *		$args[2]: target IE
 		 *		$args[3]: index
+		 * </pre>
+		 *
+		 * If $useCdn set true, use CDN instead local file.
+		 * CDN path = $cdnPrefix . $cdnVersion . $args[0]<br />
+		 *<br />
+		 * i.e.<br />
+		 * $cdnPrefix = 'http://static.xpressengine.com/core/';<br />
+		 * $cdnVersion = 'ardent1';<br />
+		 * $args[0] = './common/js/xe.js';<br />
+		 * The CDN path is http://static.xprssengine.com/core/ardent1/common/js/xe.js.<br />
+		 *
+		 * @param array $args Arguments
+		 * @param bool $useCdn If set true, use cdn instead local file
+		 * @param string $cdnPrefix CDN url prefix. (http://static.xpressengine.com/core/)
+		 * @param string $cdnVersion CDN version string (ardent1)
+		 * @return void
 		 **/
 		function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '')
 		{
@@ -57,8 +109,8 @@
 				$file->cdnVersion = $cdnVersion;
 			}
 
-			$availableExtension = array('css', 'js');
-			if (!in_array($file->fileExtension, $availableExtension)) return;
+			$availableExtension = array('css'=>1, 'js'=>1);
+			if (!isset($availableExtension[$file->fileExtension])) return;
 
 			$file->targetIe = $args[2];
 			$file->index = (int)$args[3];
@@ -70,6 +122,8 @@
 				$map = &$this->cssMap;
 				$mapIndex = &$this->cssMapIndex;
 				$key = $file->filePath . $file->fileName . "\t" . $file->targetIe . "\t" . $file->media;
+
+				$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 			}
 			else if ($file->fileExtension == 'js')
 			{
@@ -95,6 +149,14 @@
 			}
 		}
 
+		/**
+		 * Unload front end file
+		 *
+		 * @param string $fileName The file name to unload
+		 * @param string $targetIe Target IE of file to unload
+		 * @param string $media Media of file to unload. Only use when file is css.
+		 * @return void
+		 */
 		function unloadFile($fileName, $targetIe = '', $media = 'all')
 		{
 			$pathInfo = pathinfo($fileName);
@@ -105,6 +167,11 @@
 
 			if ($fileExtension == 'css')
 			{
+				if(empty($media))
+				{
+					$media = 'all';
+				}
+
 				$key .= "\t" . $media;
 				if (isset($this->cssMapIndex[$key]))
 				{
@@ -130,6 +197,12 @@
 			}
 		}
 
+		/**
+		 * Unload all front end file
+		 *
+		 * @param string $type Type to unload. all, css, js
+		 * @return void
+		 */
 		function unloadAllFiles($type = 'all')
 		{
 			if ($type == 'css' || $type == 'all')
@@ -147,6 +220,11 @@
 			}
 		}
 
+		/**
+		 * Get css file list
+		 *
+		 * @return array Returns css file list. Array contains file, media, targetie.
+		 */
 		function getCssFileList()
 		{
 			$map = &$this->cssMap;
@@ -177,6 +255,12 @@
 			return $result;
 		}
 
+		/**
+		 * Get javascript file list
+		 *
+		 * @param string $type Type of javascript. head, body
+		 * @return array Returns javascript file list. Array contains file, targetie.
+		 */
 		function getJsFileList($type = 'head')
 		{
 			if ($type == 'head')
@@ -216,11 +300,24 @@
 			return $result;
 		}
 
+		/**
+		 * Sort a map
+		 *
+		 * @param array $map Array to sort
+		 * @param array $index Not used
+		 * @return void
+		 */
 		function _sortMap(&$map, &$index)
 		{
 			ksort($map);
 		}
 
+		/**
+		 * Normalize File path
+		 *
+		 * @param string $path Path to normalize
+		 * @return string Normalized path
+		 */
 		function _normalizeFilePath($path)
 		{
 			if (strpos($path, '://') === false && $path{0} != '/' && $path{0} != '.')
@@ -238,6 +335,12 @@
 			return $path;
 		}
 
+		/**
+		 * Get absolute file url
+		 *
+		 * @param string $path Path to get absolute url
+		 * @return string Absolute url
+		 */
 		function _getAbsFileUrl($path)
 		{
 			$path = $this->_normalizeFilePath($path);
@@ -260,4 +363,28 @@
 
 			return $path;
 		}
+
+		/**
+		 * Arrage css index
+		 *
+		 * @param string $dirName First directory  name of css path
+		 * @param array $file file info.
+		 * @return void
+		 */
+		function _arrangeCssIndex($dirName, &$file)
+		{
+			if($file->index !== 0)
+			{
+				return;
+			}
+
+			$dirName = str_replace('./', '', $dirName);
+			$tmp = explode('/', $dirName);
+
+			$cssSortList = array('common'=>-100000, 'layouts'=>-90000, 'modules'=>-80000, 'widgets'=>-70000, 'addons'=>-60000);
+			$file->index = $cssSortList[$tmp[0]];
+		}
 	}
+
+/* End of file FrontEndFileHandler.class.php */
+/* Location: ./classes/frontendfile/FrontEndFileHandler.class.php */
diff --git a/classes/handler/Handler.class.php b/classes/handler/Handler.class.php
index 1454f733e..c8bb98d06 100644
--- a/classes/handler/Handler.class.php
+++ b/classes/handler/Handler.class.php
@@ -1,8 +1,8 @@
 <?php
     /**
-     * @class  Handler
+     * An abstract class of (*)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 621676cf5..05cb3c271 100644
--- a/classes/httprequest/XEHttpRequest.class.php
+++ b/classes/httprequest/XEHttpRequest.class.php
@@ -1,21 +1,32 @@
 <?php
 /**
- * @class HttpRequest
+ * - HttpRequest class
+ * - a class that is designed to be used for sending out HTTP request to an external server and retrieving response
+ * - Connection: keep-alive is not supported
  * @author NHN (developers@xpressengine.com)
+ * @package /classes/httprequest
  * @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
+	/**
+	 * target host
+	 * @var string
+	 */
 	var $m_host;
-	/// target Port
+	/**
+	 * target Port
+	 * @var int
+	 */
 	var $m_port;
-	/// header array 
+	/**
+	 * target header
+	 * @var array
+	 */
 	var $m_headers;
 
 	/**
-	 * @brief Constructor 
+	 * constructor
+	 * @return void
 	 */
 	function XEHttpRequest($host, $port)
 	{
@@ -25,9 +36,10 @@ class XEHttpRequest {
 	}
 
 	/**
-	 * @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
+	 * Mether to add key/value pair to the HTTP request header
+	 * @param int|string $key HTTP header element
+	 * @param string $value value string for HTTP header element
+	 * @return void
 	 */
 	function addToHeader($key, $value)
 	{
@@ -35,12 +47,12 @@ class XEHttpRequest {
 	}
 
 	/**
-	 * @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 
+	 * Send HTTP message to the host
+	 * @param string $target ip or url of the external server
+	 * @param string $method HTTP method such as GET and POST
+	 * @param int $timeout time out value for HTTP request expiration
+	 * @param array $post_vars variables to send
+	 * @return object Returns an object containing HTTP Response body and HTTP response code
 	 */
 	function send($target='/', $method='GET', $timeout=3, $post_vars=null)
 	{
@@ -67,8 +79,12 @@ class XEHttpRequest {
 	}
 
 	/**
-	 * @brief Send a request with the file socket
-	 * @private
+	 * Send a request with the file socket
+	 * @param string $target ip or url of the external server
+	 * @param string $method HTTP method such as GET and POST
+	 * @param int $timeout time out value for HTTP request expiration
+	 * @param array $post_vars variables to send
+	 * @return object Returns an object containing HTTP Response body and HTTP response code
 	 */
 	function sendWithSock($target, $method, $timeout, $post_vars)
 	{
@@ -131,8 +147,12 @@ class XEHttpRequest {
 	}
 
 	/**
-	 * @brief Send a request with the curl library
-	 * @private
+	 * Send a request with the curl library
+	 * @param string $target ip or url of the external server
+	 * @param string $method HTTP method such as GET and POST
+	 * @param int $timeout time out value for HTTP request expiration
+	 * @param array $post_vars variables to send
+	 * @return object Returns an object containing HTTP Response body and HTTP response code
 	 */
 	function sendWithCurl($target, $method, $timeout, $post_vars)
 	{
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index 9575e959d..006376c5c 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -9,36 +9,128 @@ else
 }
 
 /**
-* @brief Mailing class for XpressEngine
+* Mailing class for XpressEngine
+*
 * @author NHN (developers@xpressengine.com)
-* @developer NHN (developers@xpressengine.com)
 */
 class Mail extends PHPMailer
 {
+	/**
+	 * Sender name
+	 * @var string
+	 */
 	var $sender_name = '';
+
+	/**
+	 * Sender email address
+	 * @var string
+	 */
 	var $sender_email = '';
+
+	/**
+	 * Receiptor name
+	 * @var string
+	 */
 	var $receiptor_name = '';
+
+	/**
+	 * Receiptor email address
+	 * @var string
+	 */
 	var $receiptor_email = '';
+
+	/**
+	 * Title of email
+	 * @var string
+	 */
 	var $title = '';
+
+	/**
+	 * Content of email
+	 * @var string
+	 */
 	var $content = '';
+
+	/**
+	 * Content type
+	 * @var string
+	 */
 	var $content_type = 'html';
+
+	/**
+	 * Message id
+	 * @var string
+	 */
 	var $messageId = NULL;
+
+	/**
+	 * Reply to
+	 * @var string
+	 */
 	var $replyTo = NULL;
+
+	/**
+	 * BCC (Blind carbon copy)
+	 * @var string
+	 */
 	var $bcc = NULL;
+
+	/**
+	 * Attachments
+	 * @var array
+	 */
 	var $attachments = array();
+
+	/**
+	 * Content attachements
+	 * @var array
+	 */
 	var $cidAttachments  = array();
+
+	/**
+	 * ???
+	 * @var ???
+	 */
 	var $mainMailPart = NULL;
+
+	/**
+	 * Raw body
+	 * @var string
+	 */
 	var $body = '';
+
+	/**
+	 * Raw header
+	 * @var string
+	 */
 	var $header = '';
+
+	/**
+	 * End of line
+	 * @var string
+	 */
 	var $eol = '';
+
+	/**
+	 * Reference
+	 * @var string
+	 */
 	var $references = '';
+
+	/**
+	 * Additional parameters
+	 * @var string
+	 */
 	var $additional_params = NULL;
+
+	/**
+	 * Whether use or not use stmp
+	 * @var bool
+	 */
 	var $use_smtp = FALSE;
 
 	/**
-	* @brief Constructor function
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Constructor function
 	*
 	* @return void
 	*/
@@ -48,13 +140,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set parameters for using Gmail
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
-	*
-	* @param $account_name password
-	* @param $account_passwd secure method ('ssl','tls')
+	* Set parameters for using Gmail
 	*
+	* @param string $account_name Password
+	* @param string $account_passwd Secure method ('ssl','tls')
 	* @return void
 	*/
 	function useGmailAccount($account_name, $account_passwd)
@@ -76,18 +165,16 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set parameters for using SMTP protocol
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set parameters for using SMTP protocol
 	*
-	* @param $auth SMTP authentication
-	* @param $host
-	* @param $user
-	* @param $password
-	* @param $secure method ('ssl','tls')
-	* @param $port
+	* @param bool $auth SMTP authentication
+	* @param string $host SMTP host address
+	* @param string $user SMTP user id
+	* @param string $pass STMP user password
+	* @param string $secure method ('ssl','tls')
+	* @param int $port STMP port
 	*
-	* @return boolean TRUE if SMTP is set correct, otherwise return FALSE
+	* @return bool TRUE if SMTP is set correct, otherwise return FALSE
 	*/
 	function useSMTP($auth = NULL, $host = NULL, $user = NULL, $pass = NULL, $secure = NULL, $port = 25)
 	{
@@ -116,11 +203,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set additional parameters
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set additional parameters
 	*
-	* @param $additional_params
+	* @param string $additional_params Additional parameters
 	* @return void
 	*/
 	function setAdditionalParams($additional_params)
@@ -129,12 +214,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Add file attachment
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Add file attachment
 	*
-	* @param $filename
-	* @param $orgfilename (real path to file)
+	* @param string $filename File name to attach
+	* @param string $orgfilename Real path of file to attach
 	* @return void
 	*/
 	function addAttachment($filename, $orgfilename)
@@ -143,12 +226,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Add content attachment
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Add content attachment
 	*
-	* @param $filename
-	* @param $cid
+	* @param string $filename Real path of file to attach
+	* @param string $cid Content-CID
 	* @return void
 	*/
 	function addCidAttachment($filename, $cid)
@@ -157,12 +238,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set Sender (From:)
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set Sender (From:)
 	*
-	* @param $name
-	* @param $email
+	* @param string $name Sender name
+	* @param string $email Sender email address
 	* @return void
 	*/
 	function setSender($name, $email)
@@ -179,9 +258,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Get Sender (From:)
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Get Sender (From:)
 	*
 	* @return string
 	*/
@@ -195,12 +272,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set Receiptor (TO:)
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set Receiptor (TO:)
 	*
-	* @param $name
-	* @param $email
+	* @param string $name Receiptor name
+	* @param string $email Receiptor email address
 	* @return void
 	*/
 	function setReceiptor($name, $email)
@@ -217,9 +292,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Get Receiptor (TO:)
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Get Receiptor (TO:)
 	*
 	* @return string
 	*/
@@ -233,11 +306,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set Email's Title
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set Email's Title
 	*
-	* @param $title
+	* @param string $title Title to set
 	* @return void
 	*/
 	function setTitle($title)
@@ -253,9 +324,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Get Email's Title
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Get Email's Title
 	*
 	* @return string
 	*/
@@ -265,11 +334,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set BCC
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set BCC
 	*
-	* @param $bcc
+	* @param string $bcc
 	* @return void
 	*/
 	function setBCC($bcc)
@@ -285,11 +352,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set Message ID
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set Message ID
 	*
-	* @param $messageId
+	* @param string $messageId
 	* @return void
 	*/
 	function setMessageID($messageId)
@@ -298,11 +363,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set references
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set references
 	*
-	* @param $references
+	* @param string $references
 	* @return void
 	*/
 	function setReferences($references)
@@ -311,11 +374,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set ReplyTo param
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set ReplyTo param
 	*
-	* @param $replyTo
+	* @param string $replyTo
 	* @return void
 	*/
 	function setReplyTo($replyTo)
@@ -331,11 +392,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set message content
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set message content
 	*
-	* @param $content
+	* @param string $content Content
 	* @return void
 	*/
 	function setContent($content)
@@ -352,12 +411,10 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Replace resourse path of the files
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
-	*
-	* @param $matches
+	* Replace resourse path of the files
 	*
+	* @see Mail::setContent()
+	* @param array $matches Match info.
 	* @return string
 	*/
 	function replaceResourceRealPath($matches)
@@ -366,9 +423,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Get the Plain content of body message
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Get the Plain content of body message
 	*
 	* @return string
 	*/
@@ -378,9 +433,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Get the HTML content of body message
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Get the HTML content of body message
 	*
 	* @return string
 	*/
@@ -390,11 +443,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Set the type of body's content
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Set the type of body's content
 	*
-	* @param $mode
+	* @param string $mode
 	* @return void
 	*/
 	function setContentType($mode = 'html')
@@ -403,9 +454,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Process the images from attachments
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Process the images from attachments
 	*
 	* @return void
 	*/
@@ -460,9 +509,7 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Process the images from body content. This functions is used if Mailer is set as mail not as SMTP
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Process the images from body content. This functions is used if Mailer is set as mail not as SMTP
 	*
 	* @return void
 	*/
@@ -505,11 +552,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Send email
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
+	* Send email
 	*
-	* @return boolean TRUE in case of success, FALSE if sending fails
+	* @return bool TRUE in case of success, FALSE if sending fails
 	*/
 	function send()
 	{
@@ -567,12 +612,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Check if DNS of param is real or fake
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
-	*
-	* @param $email_address
+	* Check if DNS of param is real or fake
 	*
+	* @param string $email_address Email address
 	* @return boolean TRUE if param is valid DNS otherwise FALSE
 	*/
 	function checkMailMX($email_address)
@@ -597,12 +639,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Check if param is a valid email or not
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
-	*
-	* @param $email_address
+	* Check if param is a valid email or not
 	*
+	* @param string $email_address Email address
 	* @return string email address if param is valid email address otherwise blank string
 	*/
 	function isVaildMailAddress($email_address)
@@ -618,12 +657,9 @@ class Mail extends PHPMailer
 	}
 
 	/**
-	* @brief Gets the MIME type of param
-	* @access public
-	* @developer NHN (developers@xpressengine.com)
-	*
-	* @param $filename filename
+	* Gets the MIME type of param
 	*
+	* @param string $filename filename
 	* @return string MIME type of ext
 	*/
 	function returnMIMEType($filename)
diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php
index 607fd651f..05aa40b5f 100644
--- a/classes/mobile/Mobile.class.php
+++ b/classes/mobile/Mobile.class.php
@@ -1,19 +1,43 @@
 <?php
 
+/**
+ * Mobile class
+ *
+ * @author NHN (developers@xpressengine.com)
+ */
 class Mobile {
+	/**
+	 * Whether mobile or not mobile mode
+	 * @var bool
+	 */
 	var $ismobile = null;
 
+	/**
+	 * Get instance of Mobile class(for singleton)
+	 *
+	 * @return Mobile
+	 */
 	function &getInstance() {
 		static $theInstance;
 		if(!isset($theInstance)) $theInstance = new Mobile();
 		return $theInstance;
 	}
 
+	/**
+	 * Get current mobile mode
+	 *
+	 * @return bool If mobile mode returns true or false
+	 */
 	function isFromMobilePhone() {
 		$oMobile =& Mobile::getInstance();
 		return $oMobile->_isFromMobilePhone();
 	}
 
+	/**
+	 * Get current mobile mode
+	 *
+	 * @return bool
+	 */
 	function _isFromMobilePhone() {
 		if($this->ismobile !== null) return $this->ismobile;
 
@@ -94,6 +118,11 @@ class Mobile {
 		return $this->ismobile;
 	}
 
+	/**
+	 * Detect mobile device by user agent
+	 *
+	 * @return bool Returns true on mobile device or false.
+	 */
 	function isMobileCheckByAgent()
 	{
 		static $UACheck;
@@ -123,10 +152,11 @@ class Mobile {
 		return FALSE;
 	}
 
-	/*
-	 * @ brief check if user-agent is a tablet PC as iPad or Andoid tablet.
-	 * @ return TRUE for tablet, and FALSE for else.
-	*/
+	/**
+	 * Check if user-agent is a tablet PC as iPad or Andoid tablet.
+	 *
+	 * @return bool TRUE for tablet, and FALSE for else.
+	 */
 	function isMobilePadCheckByAgent()
 	{
 		static $UACheck;
@@ -167,6 +197,12 @@ class Mobile {
 		return FALSE;
 	}
 
+	/**
+	 * Set mobile mode
+	 *
+	 * @param bool $ismobile
+	 * @return void
+	 */
 	function setMobile($ismobile)
 	{
 		$oMobile =& Mobile::getInstance();
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 590cd85ef..fe30de0be 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -2,7 +2,7 @@
     /**
     * @class ModuleHandler
     * @author NHN (developers@xpressengine.com)
-    * @brief Handling modules
+    * 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.
@@ -23,8 +23,13 @@
         var $httpStatusCode = NULL; ///< http status code.
 
         /**
-         * @brief constructor
-         * @remarks it prepares variables to use in moduleHandler
+         * prepares variables to use in moduleHandler
+		 * @param string $module name of module
+		 * @param string $act name of action
+		 * @param int $mid
+		 * @param int $document_srl
+		 * @param int $module_srl
+		 * @return void
          **/
         function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '') {
             // If XE has not installed yet, set module as install
@@ -63,8 +68,8 @@
         }
 
         /**
-         * @brief Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
-         * @return true: OK, false: redirected
+         * Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
+         * @return boolean true: OK, false: redirected
          **/
         function init() {
 			$oModuleModel = &getModel('module');
@@ -172,8 +177,8 @@
         }
 
         /**
-         * @brief get a module instance and execute an action
-         * @return executed module instance
+         * get a module instance and execute an action
+         * @return ModuleObject executed module instance
          **/
         function procModule() {
             $oModuleModel = &getModel('module');
@@ -207,7 +212,17 @@
             if(!$this->act) {
                 $this->error = 'msg_module_is_not_exists';
 				$this->httpStatusCode = '404';
-                return;
+
+				$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 type, kind
@@ -266,9 +281,16 @@
 			}
 
 			if(!is_object($oModule)) {
-				$this->error = 'msg_module_is_not_exists';
-				$this->httpStatusCode = '404';
-				return;
+				$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;
 			}
 
 			// If there is no such action in the module object
@@ -278,7 +300,15 @@
 				if(!Context::isInstalled())
 				{
 					$this->error = 'msg_invalid_request';
-					return;
+					$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+					$oMessageObject->setError(-1);
+					$oMessageObject->setMessage($this->error);
+					$oMessageObject->dispMessage();
+					if($this->httpStatusCode)
+					{
+						$oMessageObject->setHttpStatusCode($this->httpStatusCode);
+					}
+					return $oMessageObject;
 				}
 
                 $forward = null;
@@ -364,7 +394,9 @@
 				else
 				{
 					$this->error = 'msg_invalid_request';
-					return;
+					$oModule->setError(-1);
+					$oModule->setMessage($this->error);
+					return $oModule;
 				}
 			}
 
@@ -425,7 +457,8 @@
 
             $procResult = $oModule->proc();
 
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			$methodList = array('XMLRPC'=>1, 'JSON'=>1);
+			if(!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
 			{
 				$error = $oModule->getError();
 				$message = $oModule->getMessage();
@@ -458,6 +491,10 @@
             return $oModule;
         }
 
+        /**
+         * set error message to Session.
+         * @return void
+         **/
 		function _setInputErrorToContext()
 		{
 			if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR')) Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
@@ -468,6 +505,10 @@
 			$this->_clearErrorSession();
 		}
 
+        /**
+         * clear error message to Session.
+         * @return void
+         **/
 		function _clearErrorSession()
 		{
 			$_SESSION['XE_VALIDATOR_ERROR'] = '';
@@ -476,6 +517,10 @@
 			$_SESSION['XE_VALIDATOR_RETURN_URL'] = '';
 		}
 
+        /**
+         * occured error when, set input values to session.
+         * @return void
+         **/
 		function _setInputValueToSession()
 		{
 			$requestVars = Context::getRequestVars();
@@ -484,9 +529,9 @@
 		}
 
         /**
-         * @brief display contents from executed module
-         * @param[in] $oModule module instance
-         * @return none
+         * display contents from executed module
+         * @param ModuleObject $oModule module instance
+         * @return void
          **/
         function displayContent($oModule = NULL) {
             // If the module is not set or not an object, set error
@@ -505,7 +550,8 @@
             if(!$output->toBool()) $this->error = $output->getMessage();
 
             // Use message view object, if HTML call
-            if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$methodList = array('XMLRPC'=>1, 'JSON'=>1);
+            if(!isset($methodList[Context::getRequestMethod()])) {
 
 				if($_SESSION['XE_VALIDATOR_RETURN_URL'])
 				{
@@ -594,20 +640,20 @@
         }
 
         /**
-         * @brief returns module's path
-         * @param[in] $module module name
-         * @return path of the module
+         * returns module's path
+         * @param string $module module name
+         * @return string 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)
+         * It creates a module instance
+         * @param string $module module name
+         * @param string $type instance type, (e.g., view, controller, model)
+         * @param string $kind admin or svc
+         * @return ModuleObject module instance (if failed it returns null)
          * @remarks if there exists a module instance created before, returns it.
          **/
         function &getModuleInstance($module, $type = 'view', $kind = '') {
@@ -617,19 +663,19 @@
 			$kind = strtolower($kind);
 			$type = strtolower($type);
 
-			$kinds = explode(' ', 'svc admin');
-			if(!in_array($kind, $kinds)) $kind = $kinds[0];
+			$kinds = array('svc'=>1, 'admin'=>1);
+			if(!isset($kinds[$kind])) $kind = 'svc';
 
 			$key = $module.'.'.($kind!='admin'?'':'admin').'.'.$type;
 
-			if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__'])) {
+			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]) {
+			if(!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
+			{
 				$parent_module = $module;
 
 				$class_path = ModuleHandler::getModulePath($module);
@@ -696,10 +742,10 @@
         }
 
         /**
-         * @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
+         * call a trigger
+         * @param string $trigger_name trigger's name to call
+         * @param string $called_position called position
+         * @param object $obj an object as a parameter to trigger
          * @return Object
          **/
         function triggerCall($trigger_name, $called_position, &$obj) {
@@ -728,7 +774,9 @@
         }
 
 		/**
-		 * @brief get http status message by http status code
+		 * get http status message by http status code
+		 * @param string $code
+		 * @return string
 		 **/
 		function _setHttpStatusMessage($code) {
 			$statusMessageList = array(
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 68409c7d0..b2c09271b 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -2,7 +2,7 @@
     /**
     * @class ModuleObject
     * @author NHN (developers@xpressengine.com)
-    * @brief base class of ModuleHandler
+    * base class of ModuleHandler
     **/
 
     class ModuleObject extends Object {
@@ -28,18 +28,21 @@
         var $stop_proc = false; ///< a flag to indicating whether to stop the execution of code.
 
 		var $module_config = NULL;
+		var $ajaxRequestMethod = array('XMLRPC', 'JSON');
 
         /**
-         * @brief setter to set the name of module
-         * @param name of module
+         * setter to set the name of module
+         * @param string $module name of module
+		 * @return void
          **/
         function setModule($module) {
             $this->module = $module;
         }
 
         /**
-         * @brief setter to set the name of module path
-         * @param the directory path to a module directory
+         * setter to set the name of module path
+         * @param string $path the directory path to a module directory
+		 * @return void
          **/
         function setModulePath($path) {
             if(substr($path,-1)!='/') $path.='/';
@@ -47,25 +50,37 @@
         }
 
         /**
-         * @brief setter to set an url for redirection
-         * @param $url url for redirection
+         * setter to set an url for redirection
+         * @param string $url url for redirection
          * @remark redirect_url is used only for ajax requests
+		 * @return void
          **/
-        function setRedirectUrl($url='./') {
-            $this->add('redirect_url', $url);
+        function setRedirectUrl($url='./', $output = NULL) {
+			$ajaxRequestMethod = array_flip($this->ajaxRequestMethod);
+			if(!isset($ajaxRequestMethod[Context::getRequestMethod()]))
+			{
+				$this->add('redirect_url', $url);
+			}
+
+			if($output !== NULL && is_object($output))
+			{
+				return $output;
+			}
         }
 
 		/**
-		 * @brief get url for redirection
+		 * get url for redirection
+		 * @return string redirect_url
 		 **/
 		function getRedirectUrl(){
 			return $this->get('redirect_url');
 		}
 
 		/**
-		 * @brief set message
-		 * @param $message a message string
-		 * @param $type type of message (error, info, update)
+		 * set message
+		 * @param string $message a message string
+		 * @param string $type type of message (error, info, update)
+		 * @return void
 		 **/
 		function setMessage($message, $type = null){
 			parent::setMessage($message);
@@ -73,28 +88,32 @@
 		}
 
 		/**
-		 * @brief set type of message
-		 * @param $type type of message (error, info, update)
+		 * set type of message
+		 * @param string $type type of message (error, info, update)
+		 * @return void
 		 **/
 		function setMessageType($type){
 			$this->add('message_type', $type);
 		}
 
 		/**
-		 * @brief get type of message
+		 * get type of message
+		 * @return string $type
 		 **/
 		function getMessageType(){
 			$type = $this->get('message_type');
-			if (!in_array($type, array('error', 'info', 'update'))){
+			$typeList = array('error'=>1, 'info'=>1, 'update'=>1);
+			if (!isset($typeList[$type])){
 				$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
+         * sett to set the template path for refresh.html
+         * refresh.html is executed as a result of method execution
          * Tpl as the common run of the refresh.html ..
+		 * @return void
          **/
         function setRefreshPage() {
             $this->setTemplatePath('./common/tpl');
@@ -103,16 +122,19 @@
 
 
         /**
-         * @brief sett to set the action name
+         * sett to set the action name
+		 * @param string $act
+		 * @return void
          **/
         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
+         * sett to set module information
+         * @param object $module_info object containing module information
+         * @param object $xml_info object containing module description
+		 * @return void
         **/
         function setModuleInfo($module_info, $xml_info) {
             // The default variable settings
@@ -129,7 +151,7 @@
             $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)) {
+            if(!$module_info->mid && !is_array($module_srl) && 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);
@@ -151,13 +173,15 @@
                 // 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 'manager' :
+						$this->stop('msg_not_permitted_act');
+						return;
                     case 'member' :
-                            if(!$is_logged) $this->stop('msg_not_permitted_act');
+						if(!$is_logged)
+						{
+							$this->stop('msg_not_permitted_act');
+							return;
+						}
                         break;
                 }
             }
@@ -172,8 +196,9 @@
         }
 
         /**
-         * @brief set the stop_proc and approprate message for msg_code
-         * @param $msg_code an error code
+         * set the stop_proc and approprate message for msg_code
+         * @param string $msg_code an error code
+		 * @return ModuleObject $this
          **/
         function stop($msg_code) {
             // flag setting to stop the proc processing
@@ -195,7 +220,9 @@
         }
 
         /**
-         * @brief set the file name of the template file
+         * set the file name of the template file
+		 * @param string name of file
+		 * @return void
          **/
         function setTemplateFile($filename) {
             if(substr($filename,-5)!='.html') $filename .= '.html';
@@ -203,14 +230,17 @@
         }
 
         /**
-         * @brief retrieve the directory path of the template directory
+         * retrieve the directory path of the template directory
+		 * @return string
          **/
         function getTemplateFile() {
             return $this->template_file;
         }
 
         /**
-         * @brief set the directory path of the template directory
+         * set the directory path of the template directory
+		 * @param string path of template directory.
+		 * @return void
          **/
         function setTemplatePath($path) {
             if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
@@ -219,15 +249,17 @@
         }
 
         /**
-
-         * @brief retrieve the directory path of the template directory
+         * retrieve the directory path of the template directory
+		 * @return string
          **/
         function getTemplatePath() {
             return $this->template_path;
         }
 
         /**
-         * @brief set the file name of the temporarily modified by admin
+         * set the file name of the temporarily modified by admin
+		 * @param string name of file
+		 * @return void
          **/
         function setEditedLayoutFile($filename) {
             if(substr($filename,-5)!='.html') $filename .= '.html';
@@ -235,14 +267,17 @@
         }
 
         /**
-         * @brief retreived the file name of edited_layout_file
+         * retreived the file name of edited_layout_file
+		 * @return string
          **/
         function getEditedLayoutFile() {
             return $this->edited_layout_file;
         }
 
         /**
-         * @brief set the file name of the layout file
+         * set the file name of the layout file
+		 * @param string name of file
+		 * @return void
          **/
         function setLayoutFile($filename) {
             if(substr($filename,-5)!='.html') $filename .= '.html';
@@ -250,14 +285,16 @@
         }
 
         /**
-         * @brief get the file name of the layout file
+         * get the file name of the layout file
+		 * @return string
          **/
         function getLayoutFile() {
             return $this->layout_file;
         }
 
         /**
-         * @brief set the directory path of the layout directory
+         * set the directory path of the layout directory
+		 * @param string path of layout directory.
          **/
         function setLayoutPath($path) {
             if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
@@ -266,15 +303,16 @@
         }
 
         /**
-         * @brief set the directory path of the layout directory
+         * set the directory path of the layout directory
+		 * @return string
          **/
         function getLayoutPath() {
             return $this->layout_path;
         }
 
         /**
-         * @brief excute the member method specified by $act variable
-         *
+         * excute the member method specified by $act variable
+		 * @return boolean true : success false : fail 
          **/
         function proc() {
             // pass if stop_proc is true
@@ -297,7 +335,8 @@
             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");
+					$this->stop("msg_not_permitted_act");
+					return FALSE;
 				}
                 // integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
                 $oModuleModel = &getModel('module');
diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php
index 36cefe90d..96db11478 100644
--- a/classes/object/Object.class.php
+++ b/classes/object/Object.class.php
@@ -1,105 +1,159 @@
 <?php
 /**
- * @class Object
- * @author NHN (developers@xpressengine.com)
- * @brief Base class design to pass the Object instance between XE Modules 
+ * Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose.
  *
- * @remark Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose
- **/
+ * @author NHN (developers@xpressengine.com)
+ */
 
 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
-	 **/
+	 * Error code. If `0`, it is not an error.
+	 * @var int
+	 */
+	var $error = 0;
+
+	/**
+	 * Error message. If `success`, it is not an error.
+	 * @var string
+	 */
+	var $message = 'success'; 
+
+	/**
+	 * An additional variable
+	 * @var array
+	 */
+	var $variables = array();
+
+	/**
+	 * http status code.
+	 * @var int
+	 */
+	var $httpStatusCode = NULL;
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param int $error Error code
+	 * @param string $message Error message
+	 * @return void
+	 */
 	function Object($error = 0, $message = 'success') {
 		$this->setError($error);
 		$this->setMessage($message);
 	}
 
+
 	/**
-	 * @brief Setter to set error code
-	 * @param[in] $error error code
-	 **/
+	 * Setter to set error code
+	 *
+	 * @param int $error error code
+	 * @return void
+	 */
 	function setError($error = 0) {
 		$this->error = $error;
 	}
 
 	/**
-	 * @brief Getter to retrieve error code
-	 **/
+	 * Getter to retrieve error code
+	 *
+	 * @return int Returns an error code
+	 */
 	function getError() {
 		return $this->error;
 	}
 
+	/**
+	 * Setter to set HTTP status code
+	 *
+	 * @param int $code HTTP status code. Default value is `200` that means successful
+	 * @return void
+	 */
 	function setHttpStatusCode($code = '200')
 	{
 		$this->httpStatusCode = $code;
 	}
 
+	/**
+	 * Getter to retrieve HTTP status code
+	 *
+	 * @return int Returns HTTP status 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
-	 **/
+	 * Setter to set set the error message
+	 *
+	 * @param string $message Error message
+	 * @return bool Alaways returns true.
+	 */
 	function setMessage($message = 'success') {
 		if(Context::getLang($message)) $message = Context::getLang($message);
 		$this->message = $message;
+
+		// TODO This method always returns True. We'd better remove it
 		return true;
 	}
 
 	/**
-	 * @brief getter to retrieve an error message
-	 **/
+	 * Getter to retrieve an error message
+	 *
+	 * @return string Returns 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
-	 **/
+	 * Setter to set a key/value pair as an additional variable
+	 *
+	 * @param string $key A variable name
+	 * @param mixed $val A value for the variable
+	 * @return void
+	 */
 	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);
+	 * Method to set multiple key/value pairs as an additional variables
+	 *
+	 * @param Object|array $object Either object or array containg key/value pairs to be added
+	 * @return void
+	 */
+	function adds($object)
+	{
+		if(is_object($object))
+		{
+			$object = get_object_vars($object);
+		} 
+
+		if(is_array($object))
+		{
+			foreach($object as $key => $val) $this->variables[$key] = $val;
 		}
 	}
 
 	/**
-	 * @brief method to retrieve a corresponding value to a given key
-	 **/
+	 * Method to retrieve a corresponding value to a given key
+	 *
+	 * @param string $key
+	 * @return string Returns 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    
-	**/
+	 * Method to retrieve an object containing a key/value paris
+	 *
+	 * @return Object Returns an object containing key/value pairs
+	 */
 	function gets() {
 		$num_args = func_num_args();
 		$args_list = func_get_args();
@@ -111,35 +165,40 @@ class Object {
 	}
 
 	/**
-	 * @brief method to retrieve an array of key/value pairs
-	 * @return Return a list of key/value pairs
-	 **/
+	 * Method to retrieve an array of key/value pairs
+	 *
+	 * @return array
+	 */
 	function getVariables() {
 		return $this->variables;
 	}
 
 	/**
-	 * @brief method to retrieve an object of key/value pairs
-	 * @return Return an object of key/value pairs
-	 **/
+	 * Method to retrieve an object of key/value pairs
+	 *
+	 * @return Object
+	 */
 	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.
-	 **/
+	 * Method to return either true or false depnding on the value in a 'error' variable
+	 *
+	 * @return bool Retruns true : error isn't 0 or false : otherwise.
+	 */
 	function toBool() {
+		// TODO This method is misleading in that it returns true if error is 0, which should be true in boolean representation.
 		return $this->error==0?true:false;
 	}
 
 
 	/**
-	 * @brief method to return either true or false depnding on the value in a 'error' variable
-	 **/
+	 * Method to return either true or false depnding on the value in a 'error' variable
+	 *
+	 * @return bool
+	 */
 	function toBoolean() {
 	return $this->toBool();
 	}
diff --git a/classes/page/PageHandler.class.php b/classes/page/PageHandler.class.php
index 5ba96bfc5..d598b708d 100644
--- a/classes/page/PageHandler.class.php
+++ b/classes/page/PageHandler.class.php
@@ -2,7 +2,7 @@
     /**
      * @class PageHandler
      * @author NHN (developers@xpressengine.com)
-     * @brief handles page navigation
+     * handles page navigation
      * @version 0.1
      *
      * @remarks Getting total counts, number of pages, current page number, number of items per page, 
@@ -20,11 +20,12 @@
         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 
+         * constructor
+         * @param int $total_count number of total items
+         * @param int $total_page number of total pages
+         * @param int $cur_page current page number
+         * @param int $page_count number of page links displayed at one time 
+		 * @return void
          **/
         function PageHandler($total_count, $total_page, $cur_page, $page_count = 10) {
             $this->total_count = $total_count;
@@ -45,8 +46,8 @@
         }
 
         /**
-         * @brief request next page
-         * @return next page number
+         * request next page
+         * @return int next page number
          **/
         function getNextPage() {
             $page = $this->first_page+$this->point++;
@@ -54,6 +55,11 @@
             return $page;
         }
 		
+        /**
+         * return number of page that added offset.
+		 * @param int $offset
+         * @return int
+         **/
 		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 dcbe91546..3be4b4ff2 100644
--- a/classes/security/Security.class.php
+++ b/classes/security/Security.class.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @class Security
- * @brief This class helps to solve security problems.
+ * - Security class
+ * - This class helps to solve security problems.
  * @author NHN (developers@xpressengine.com)
- **/
+ * @package /classes/security
+ * @version 0.1
+ */
 class Security
 {
 	/**
-	 * @brief Action target variable. If this value is null, the method will use Context variables
-	 * @protected
+	 * Action target variable. If this value is null, the method will use Context variables
+	 * @var mixed
 	 **/
 	var $_targetVar = null;
 
 	/**
 	 * @constructor
-	 * @param $var Target context
+	 * @param mixed $var Target context
+	 * @return void
 	 */
 	function Security($var = null)
 	{
@@ -22,13 +25,11 @@ class Security
 	}
 
 	/**
-	 * @brief Convert special characters to HTML entities for the target variables.
-	 *        The results of conversion are equivalent to the results of htmlspecialchars() which is a native function of PHP.
-	 * @params string $varName
-	 *         A variable's name to convert
-	 *         To process properties of an object or elements of an array,
-	 *         separate the owner(object or array) and the item(property or element) using a dot(.)
-	 * @public
+	 * - Convert special characters to HTML entities for the target variables.
+	 * - The results of conversion are equivalent to the results of htmlspecialchars() which is a native function of PHP.
+	 * @params string $varName. A variable's name to convert to process properties of an object or elements of an array,
+	 * separate the owner(object or array) and the item(property or element) using a dot(.)
+	 * @return mixed
 	 */
 	function encodeHTML(/*, $varName1, $varName2, ... */)
 	{
@@ -70,7 +71,10 @@ class Security
 	}
 
 	/**
-	 * @protected
+	 * Convert special characters to HTML entities for the target variables.
+	 * @param mixed $var
+	 * @param array $name
+	 * @return mixed
 	 */
 	function _encodeHTML($var, $name=array())
 	{
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index b0fc7b786..54794e437 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -2,7 +2,7 @@
 /**
  * @class TemplateHandler
  * @author NHN (developers@xpressengine.com)
- * @brief template compiler
+ * 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
@@ -22,6 +22,10 @@ class TemplateHandler {
 
 	var $handler_mtime = 0;
 
+	/**
+	 * constructor
+	 * @return void
+	 **/
 	function TemplateHandler()
 	{
 		// TODO: replace this with static variable in PHP5
@@ -33,7 +37,7 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @brief returns TemplateHandler's singleton object
+	 * returns TemplateHandler's singleton object
 	 * @return TemplateHandler instance
 	 **/
 	function &getInstance()
@@ -51,7 +55,11 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @brief set variables for template compile
+	 * set variables for template compile
+	 * @param string $tpl_path
+	 * @param string $tpl_filename
+	 * @param string $tpl_file
+	 * @return void
 	 **/
 	function init($tpl_path, $tpl_filename, $tpl_file='')
 	{
@@ -80,11 +88,11 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @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
+	 * compiles specified tpl file and execution result in Context into resultant content
+	 * @param string $tpl_path path of the directory containing target template file
+	 * @param string $tpl_filename target template file's name
+	 * @param string $tpl_file if specified use it as template file's full path
+	 * @return string Returns compiled result in case of success, NULL otherwise
 	 */
 	function compile($tpl_path, $tpl_filename, $tpl_file='') {
 		global $__templatehandler_root_tpl;
@@ -140,10 +148,10 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @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
+	 * compile specified file and immediately return
+	 * @param string $tpl_path path of the directory containing target template file
+	 * @param string $tpl_filename target template file's name
+	 * @return string 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);
@@ -158,11 +166,9 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @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
+	 * parse syntax.
+	 * @param string $buff template file
+	 * @return string compiled result in case of success or NULL in case of error
 	 **/
 	function parse($buff=null) {
 		if(is_null($buff)) {
@@ -189,8 +195,8 @@ class TemplateHandler {
 		// 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);
+		// remove block which is a virtual tag
+		$buff = preg_replace('@</?block\s*>@is','',$buff);
 
 		// form auto generation
 		$buff = preg_replace_callback('/(<form(?:<\?php.+?\?>|[^<>]+)*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff);
@@ -198,14 +204,20 @@ class TemplateHandler {
 		// prevent from calling directly before writing into file
 		$buff = '<?php if(!defined("__XE__"))exit;?>'.$buff;
 
+		// remove php script reopening
+		$buff = preg_replace(array('/(\n|\r\n)+/','/(;)?( )*\?\>\<\?php([\n\t ]+)?/'),array("\n",";\n"),$buff);
+
 		return $buff;
 	}
 
 	/**
-	 * @brief 1. remove ruleset from form tag
+	 * preg_replace_callback handler
+	 * 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
+	 * @param array $matches
+	 * @return string
 	 **/
 	function _compileFormAuthGeneration($matches)
 	{
@@ -260,7 +272,7 @@ class TemplateHandler {
 		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];
+			if(!$m3[0]) $matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment()) ?>" />'.$matches[2];
 		}
 		else
 		{
@@ -272,11 +284,9 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @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
+	 * fetch using ob_* function
+	 * @param string $buff if buff is not null, eval it instead of including compiled template file
+	 * @return string
 	 **/
 	function _fetch($buff) {
 		if(!$buff) return;
@@ -300,10 +310,12 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @brief change image path
-	 * @pre $matches is an array containg three elements
-	 * @param[in] $matches match
-	 * @return changed result
+	 * preg_replace_callback hanlder
+	 * 
+	 * replace image path
+	 * @param array $match
+	 *
+	 * @return string changed result
 	 **/
 	function _replacePath($match)
 	{
@@ -320,6 +332,11 @@ class TemplateHandler {
 		return substr($match[0],0,-strlen($match[1])-6)."src=\"{$src}\"";
 	}
 
+	/**
+	 * replace loop and cond template syntax
+	 * @param string $buff
+	 * @return string changed result
+	 **/
 	function _parseInline($buff)
 	{
 		if(preg_match_all('/<([a-zA-Z]+\d?)(?>(?!<[a-z]+\d?[\s>]).)*?(?:[ \|]cond| loop)="/s', $buff, $match) === false) return $buff;
@@ -334,7 +351,7 @@ class TemplateHandler {
 		$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');
+		$self_closing = array('area'=>1,'base'=>1,'basefont'=>1,'br'=>1,'hr'=>1,'input'=>1,'img'=>1,'link'=>1,'meta'=>1,'param'=>1,'frame'=>1,'col'=>1);
 
 		for($idx=1,$node_len=count($nodes); $idx < $node_len; $idx+=2) {
 			if(!($node=$nodes[$idx])) continue;
@@ -375,7 +392,7 @@ class TemplateHandler {
 
 				// find closing tag
 				$close_php = '<?php '.str_repeat('}', $closing).' ?>';
-				if($node{1} == '!' || substr($node,-2,1) == '/' || in_array($tag, $self_closing)) { //  self closing tag
+				if($node{1} == '!' || substr($node,-2,1) == '/' || isset($self_closing[$tag])) { //  self closing tag
 					$nodes[$idx+1] = $close_php.$nodes[$idx+1];
 				} else {
 					$depth = 1;
@@ -396,7 +413,7 @@ class TemplateHandler {
 			}
 
 			if(strpos($node, '|cond="') !== false) {
-				$node = preg_replace('@(\s[\w:\-]+="[^"]+?")\|cond="(.+?)"@s', '<?php if($2){ ?>$1<?php } ?>', $node);
+				$node = preg_replace('@(\s[-\w:]+="[^"]+?")\|cond="(.+?)"@s', '<?php if($2){ ?>$1<?php } ?>', $node);
 				$node = $this->_replaceVar($node);
 			}
 
@@ -408,6 +425,12 @@ class TemplateHandler {
 		return $buff;
 	}
 
+	/**
+	 * preg_replace_callback hanlder
+	 * replace php code.
+	 * @param array $m
+	 * @return string changed result
+	 **/
 	function _parseResource($m)
 	{
 		// {@ ... } or {$var} or {func(...)}
@@ -545,6 +568,11 @@ class TemplateHandler {
 		return $m[0];
 	}
 
+	/**
+	 * change relative path
+	 * @param string $path
+	 * @return string
+	 **/
 	function _getRelativeDir($path)
 	{
 		$_path = $path;
@@ -573,7 +601,9 @@ class TemplateHandler {
 	}
 
 	/**
-	 * @brief replace PHP variables of $ character
+	 * replace PHP variables of $ character
+	 * @param string $php
+	 * @return string $__Context->varname
 	 **/
 	function _replaceVar($php) {
 		if(!strlen($php)) return '';
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index ac474efcb..54cc073cf 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -2,25 +2,66 @@
 /**
  * Validator class
  * @author NHN (developers@xpressengine.com)
+ * @package /classes/validator
+ * @version 0.1
  */
 class Validator
 {
+	/**
+	 * cache directory
+	 * @var string
+	 */
 	var $_cache_dir = '';
+	/**
+	 * last error
+	 * @var array
+	 */
 	var $_last_error;
+	/**
+	 * xml ruleset object
+	 * @var Xml_Node_ object
+	 */
 	var $_xml_ruleset = null;
+	/**
+	 * rule list
+	 * @var array
+	 */
 	var $_rules;
+	/**
+	 * filter list
+	 * @var array
+	 */
 	var $_filters;
+	/**
+	 * Can usable status for multibyte string function
+	 * @var boolean
+	 */
 	var $_has_mb_func;
+	/**
+	 * validator version
+	 * @var string
+	 */
 	var $_version = '1.0';
+	/**
+	 * ruleset xml file path
+	 * @var string
+	 */
 	var $_xml_path = '';
 
 	/**
 	 * @constructor
+	 * @param string $xml_path
+	 * @return void
 	 */
 	function Validator($xml_path='') {
 		$this->__construct($xml_path);
 	}
 
+	/**
+	 * @constructor
+	 * @param string $xml_path
+	 * @return void
+	 */
 	function __construct($xml_path='') {
 		$this->_rules   = array();
 		$this->_filters = array();
@@ -42,6 +83,10 @@ class Validator
 		$this->setCacheDir('./files/cache');
 	}
 
+	/**
+	 * @destructor
+	 * @return void
+	 */
 	function __destruct() {
 		$this->_rules   = null;
 		$this->_filters = null;
@@ -49,7 +94,8 @@ class Validator
 
 	/**
 	 * Load a xml file
-	 * @param[in] string $xml_path A file name to be loaded
+	 * @param string $xml_path A file name to be loaded
+	 * @return boolean
 	 */
 	function load($xml_path) {
 		$this->_xml_ruleset = null;
@@ -116,7 +162,8 @@ class Validator
 
 	/**
 	 * Set root cache directory
-	 * @param[in] string $cache_dir Root cache directory
+	 * @param string $cache_dir Root cache directory
+	 * @return void
 	 */
 	function setCacheDir($cache_dir){
 		if(is_dir($cache_dir)) {
@@ -126,8 +173,8 @@ class Validator
 
 	/**
 	 * 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.
+	 * @param array $fields Target fields. The keys of the array represents field's name, its values represents field's value.
+	 * @return boolean TRUE if it is valid, FALSE otherwise.
 	 */
 	function validate($fields_=null) {
 		if(is_array($fields_)) {
@@ -245,6 +292,8 @@ class Validator
 
 	/**
 	 * apply trim recursive
+	 * @param string|array $array
+	 * @return string|array
 	 */
 	function arrayTrim($array)
 	{
@@ -260,8 +309,8 @@ class Validator
 
 	/**
 	 * Log an error
-	 * @param[in] $msg error message
-	 * @return always false
+	 * @param $msg error message
+	 * @return boolean always false
 	 */
 	function error($field, $msg){
 		$lang_filter = Context::getLang('filter');
@@ -283,8 +332,9 @@ class Validator
 
 	/**
 	 * Add a new rule
-	 * @param[in] string $name rule name
-	 * @param[in] mixed $rule
+	 * @param string $name rule name
+	 * @param mixed $rule
+	 * @return void
 	 */
 	function addRule($name, $rule=''){
 		if(is_array($name)) $args = $name;
@@ -305,12 +355,19 @@ class Validator
 
 	/**
 	 * Remove a rule
-	 * @param[in] string $name rule name
+	 * @param string $name rule name
+	 * @return void
 	 */
 	function removeRule($name){
 		unset($this->_rules[$name]);
 	}
 
+	/**
+	 * add filter to filter list
+	 * @param string $name rule name
+	 * @param string $filter filter
+	 * @return void
+	 */
 	function addFilter($name, $filter='') {
 		if(is_array($name)) $args = $name;
 		else $args = array($name=>$filter);
@@ -331,15 +388,20 @@ class Validator
 		}
 	}
 
+	/**
+	 * remove filter from filter list
+	 * @param string $name rule name
+	 * @return void
+	 */
 	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.
+	 * @param string $name rule name
+	 * @param string $value a value to be validated
+	 * @return boolean TRUE if the field is valid, FALSE otherwise.
 	 */
 	function applyRule($name, $value){
 		$rule = $this->_rules[$name];
@@ -356,7 +418,7 @@ class Validator
 				return in_array($value, $rule['test']);
 			case 'expr':
 				if(!$rule['func_test']) {
-					$rule['func_test'] = create_function('$a', 'return ('.preg_replace('/\$\$/', '$a', $rule['test']).');');
+					$rule['func_test'] = create_function('$a', 'return ('.preg_replace('/\$\$/', '$a', html_entity_decode($rule['test'])).');');
 				}
 				return $rule['func_test']($value);
 		}
@@ -365,7 +427,9 @@ class Validator
 	}
 
 	/**
-	 * Return
+	 * if not supported 'mb_strlen' function, this method can use.
+	 * @param string $str
+	 * @return int
 	 */
 	function mbStrLen($str){
 		$arr = count_chars($str);
@@ -411,7 +475,7 @@ class Validator
 
 	/**
 	 * Compile a ruleset to a javascript file
-	 * @private
+	 * @return string
 	 */
 	function _compile2js() {
 		global $lang;
diff --git a/classes/xml/GeneralXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php
index becf581d4..a4421c28d 100644
--- a/classes/xml/GeneralXmlParser.class.php
+++ b/classes/xml/GeneralXmlParser.class.php
@@ -1,18 +1,23 @@
 <?php
-    /**
-     * @class GeneralXmlParser
-     * @author NHN (developers@xpressengine.com)
-     * @brief Generic XML parser for XE
-     * @version 0.1
-     */
-    class GeneralXmlParser {
+/**
+ * GeneralXmlParser class
+ * Generic XML parser for XE
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/xml
+ * @version 0.1
+ */
+class GeneralXmlParser {
+	/**
+	 * result of parse
+	 * @var array
+	 */
 	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
-    */
+	/**
+	* Parse a given input to product a object containing parse values.
+	* @param string $input data to be parsed
+	* @return array|NULL 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);
@@ -28,12 +33,13 @@
 	    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
-    */
+	/**
+	* Start element handler
+	* @param resource $parser an instance of parser
+	* @param string $node_name a name of node
+	* @param array $attrs attributes to be set
+	* @return void
+	*/
 	function _tagOpen($parser, $node_name, $attrs) {
 	    $obj->node_name = strtolower($node_name);
 	    $obj->attrs = $attrs;
@@ -42,23 +48,25 @@
 	    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
-    */
+	/**
+	* Character data handler
+	* Variable in the last element of this->output
+	* @param resource $parse an instance of parser
+	* @param string $body a data to be added
+	* @return void
+	*/
 	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
-    */
+	/**
+	* End element handler
+	* @param resource $parse an instance of parser
+	* @param string $node_name name of xml node
+	* @return void
+	*/
 	function _tagClosed($parser, $node_name) {
 	    $node_name = strtolower($node_name);
 	    $cur_obj = array_pop($this->output);
@@ -79,5 +87,5 @@
 	    }
 	}
 
-    }
+}
 ?>
diff --git a/classes/xml/XmlGenerator.class.php b/classes/xml/XmlGenerator.class.php
index 5956c2bea..dbe221773 100644
--- a/classes/xml/XmlGenerator.class.php
+++ b/classes/xml/XmlGenerator.class.php
@@ -1,7 +1,16 @@
 <?php
-
+/**
+ * XmlGenerator class
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/xml
+ * @version 0.1
+ */
 class XmlGenerator{
-
+	/**
+	* object change to xml
+	* @param object $xml
+	* @return string
+	*/
 	function obj2xml($xml){
 		$buff = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
 
@@ -11,6 +20,11 @@ class XmlGenerator{
 		return $buff;
 	}
 
+	/**
+	* object change to xml
+	* @param object $node node in xml object
+	* @return string
+	*/
 	function _makexml($node){
 		$body = '';
 		foreach($node as $key => $value){
diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php
index db1bae032..7f1c2190f 100644
--- a/classes/xml/XmlJsFilter.class.php
+++ b/classes/xml/XmlJsFilter.class.php
@@ -1,13 +1,10 @@
 <?php
 	/**
-	 * @class XmlJsFilter
-	 * @author NHN (developers@xpressengine.com)
-	 * @brief filter class traslate xml content into javascript code
-     * @version 0.2
+	 * filter class traslate xml content into javascript code
 	 *
 	 * it convert xml code into js file and save the result as a cache file
      * @code
-     * {
+     * <pre>{
 	 * <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" />
@@ -19,9 +16,10 @@
 	 * <tag name="error" /> <- get the result of error name
 	 *  </response>
 	 * </filter>
-     * }
+     * }</pre>
      *
-	 * @detail {
+	 * @detail
+	 * <pre>{
      * - syntax description of <form> node
 	 *  target = name of for element
 	 *  required = flag indicating whether a field is mandatory or not
@@ -40,18 +38,40 @@
 	 *
 	 * - response
 	 *  tag = key : name of variable that will contain the result of the execution
-     *  }
-	 **/
-
+     * }</pre>
+	 * @class XmlJsFilter
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml
+     * @version 0.2
+	 */
 	class XmlJsFilter extends XmlParser {
+		/**
+		 * version
+		 * @var string
+		 */
         var $version = '0.2.5';
+		/**
+		 * compiled javascript cache path
+		 * @var string
+		 */
 		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
+		/**
+		 * Target xml file
+		 * @var string
+		 */
+		var $xml_file = NULL;
+		/**
+		 * Compiled js file
+		 * @var string
+		 */
+		var $js_file = NULL; // / 
 
 		/**
-		 * @brief constructor
-		 **/
+		 * constructor
+		 * @param string $path
+		 * @param string $xml_file
+		 * @return void
+		 */
 		function XmlJsFilter($path, $xml_file) {
 			if(substr($path,-1)!=='/') $path .= '/';
 			$this->xml_file = sprintf("%s%s",$path, $xml_file);
@@ -59,9 +79,9 @@
 		}
 
 		/**
-		 * @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
-         **/
+		 * Compile a xml_file only when a corresponding js file does not exists or is outdated
+         * @return void 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();
@@ -70,8 +90,9 @@
 		}
 
 		/**
-		 * @brief compile a xml_file into js_file
-		 **/
+		 * compile a xml_file into js_file
+		 * @return void
+		 */
 		function _compile() {
 			global $lang;
 
@@ -283,7 +304,9 @@
 		}
 
 		/**
-		 * @brief return a file name of js file corresponding to the xml file
+		 * return a file name of js file corresponding to the xml file
+		 * @param string $xml_file
+		 * @return string
 		 **/
 		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
index 9a780a4d6..b22a4fb98 100644
--- a/classes/xml/XmlLangParser.class.php
+++ b/classes/xml/XmlLangParser.class.php
@@ -1,22 +1,50 @@
 <?php
 	/**
-	 * @class XmlLangParser
+	 * XmlLangParser class
+	 * Change to lang php file from xml.
 	 * @author NHN (developers@xpressengine.com)
-	 * @brief change to lang php file from xml.
-     * @version 0.1
+	 * @package /classes/xml
+	 * @version 0.1
 	 **/
-
 	class XmlLangParser extends XmlParser {
+		/**
+		 * compiled language cache path
+		 * @var string
+		 */
 		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
+		/**
+		 * Target xml file
+		 * @var string
+		 */
+		var $xml_file = NULL;
+		/**
+		 * Target php file
+		 * @var string
+		 */
+		var $php_file = NULL;
+		/**
+		 * result source code
+		 * @var string
+		 */
 		var $code;
+		/**
+		 * language list, for example ko, en...
+		 * @var array
+		 */
 		var $lang_types;
+		/**
+		 * language type
+		 * @see _XE_PATH_.'/common/lang/lang.info'
+		 * @var string
+		 */
 		var $lang_type;
 
 		/**
-		 * @brief constructor
-		 **/
+		 * constructor
+		 * @param string $xml_file
+		 * @param string $lang_type
+		 * @return void
+		 */
 		function XmlLangParser($xml_file, $lang_type) {
 			$this->lang_type = $lang_type;
 			$this->xml_file = $xml_file;
@@ -24,9 +52,9 @@
 		}
 
 		/**
-		 * @brief compile a xml_file only when a corresponding php lang file does not exists or is outdated
-         * @return Returns compiled php file.
-         **/
+		 * compile a xml_file only when a corresponding php lang file does not exists or is outdated
+		 * @return string|bool Returns compiled php file.
+		 */
 		function compile() {
 			if(!file_exists($this->xml_file)) return false;
 			if(!file_exists($this->php_file)){
@@ -36,9 +64,13 @@
 				else return $this->php_file;
 			}
 
-			return $this->_writefile() ? $this->php_file : false;
+			return $this->_writeFile() ? $this->php_file : false;
 		}
 
+		/**
+		 * Return compiled content
+		 * @return string Returns compiled lang source code 
+		 */
 		function getCompileContent() {
 			if(!file_exists($this->xml_file)) return false;
 			$this->_compile();
@@ -47,8 +79,9 @@
 		}
 
 		/**
-		 * @brief compile a xml_file
-		 **/
+		 * Compile a xml_file
+		 * @return void
+		 */
 		function _compile() {
 			$lang_selected = Context::loadLangSelected();
 			$this->lang_types = array_keys($lang_selected);
@@ -68,8 +101,9 @@
 		}
 
 		/**
-		 * @brief writing cache file
-		 **/
+		 * Writing cache file
+		 * @return void|bool
+		 */
 		function _writeFile(){
 			if(!$this->code) return;
 			FileHandler::writeFile($this->php_file, "<?php\n".$this->code);
@@ -77,8 +111,11 @@
 		}
 
 		/**
-		 * @brief Parsing item node
-		 **/
+		 * Parsing item node, set content to '$this->code'
+		 * @param object $item
+		 * @param string $var
+		 * @return void
+		 */
 		function _parseItem($item, $var){
 			$name = $item->attrs->name;
 			$value = $item->value;
@@ -108,8 +145,11 @@
 		}
 
 		/**
-		 * @brief Parsing value nodes
-		 **/
+		 * Parsing value nodes
+		 * @param array $nodes
+		 * @param string $var
+		 * @return array|string
+		 */
 		function _parseValues($nodes, $var) {
 			if(!is_array($nodes)) $nodes = array($nodes);
 
@@ -132,8 +172,11 @@
 		}
 
 		/**
-		 * @brief Parsing value node
-		 **/
+		 * Parsing value node
+		 * @param object $node
+		 * @param string $var
+		 * @return array|bool
+		 */
 		function _parseValue($node, $var) {
 			$lang_type = $node->attrs->xml_lang;
 			$value = $node->body;
@@ -144,8 +187,11 @@
 		}
 
 		/**
-		 * @brief get cache file name
-		 **/
+		 * Get cache file name
+		 * @param string $lang_type
+		 * @param string $type
+		 * @return string
+		 */
 		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 76e0b7c2f..366d40ba3 100644
--- a/classes/xml/XmlParser.class.php
+++ b/classes/xml/XmlParser.class.php
@@ -1,6 +1,11 @@
 <?php
-
-    /* Element node or attribute node. */
+	/**
+	 * Xml_Node_ class
+     * Element node or attribute node.
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml
+	 * @version 0.1
+	 */
     class Xml_Node_
     {
 	/** In PHP5 this will silence E_STRICT warnings
@@ -13,33 +18,46 @@
 	}
     }
 
-    /**
-     * @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,
-     * }
-     **/
-
+	/**
+	 * XmlParser class
+	 * Class parsing a given xmlrpc request and creating a data object
+	 * @remarks <pre>{ 
+	 * 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,
+	 * }</pre>
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml
+	 * @version 0.1
+	 */
     class XmlParser {
+		/**
+		 * Xml parser
+		 * @var resource
+		 */
+        var $oParser = NULL;
+		/**
+		 * Input xml
+		 * @var string
+		 */
+        var $input = NULL;
+		/**
+		 * Output object in array
+		 * @var array
+		 */
+        var $output = array();
+		/**
+		 * The default language type
+		 * @var string
+		 */
+        var $lang = "en";
 
-        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
-         **/
+		/**
+		 * Load a xml file specified by a filename and parse it to Return the resultant data object
+		 * @param string $filename a file path of file
+		 * @return array 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);
@@ -48,11 +66,13 @@
             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
-         **/
+		/**
+		 * Parse xml data to extract values from it and construct data object
+		 * @param string $input a data buffer containing xml data
+		 * @param mixed $arg1 ???
+		 * @param mixed $arg2 ???
+		 * @return array Returns a resultant data object or NULL in case of error
+		 */
         function parse($input = '', $arg1 = NULL, $arg2 = NULL) {
             // Save the compile starting time for debugging
             if(__DEBUG__==3) $start = getMicroTime();
@@ -67,9 +87,10 @@
 
             // extracts the supported lanuage when xml:lang is used
             if(count($matches[1]) && $supported_lang = array_unique($matches[1])) {
+				$tmpLangList = array_flip($supported_lang);
                 // 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)) {
+                if(!isset($tmpLangList[$this->lang])) {
+                    if(isset($tmpLangList['en'])) {
                         $this->lang = 'en';
                     } else {
                         $this->lang = array_shift($supported_lang);
@@ -99,12 +120,13 @@
         }
 
 
-       /**
-        * @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
-        */
+		/**
+		* Start element handler.
+		* @param resource $parse an instance of parser
+		* @param string $node_name a name of node
+		* @param array $attrs attributes to be set
+		* @return array
+		*/
         function _tagOpen($parser, $node_name, $attrs) {
 	    $obj = new Xml_Node_();
             $obj->node_name = strtolower($node_name);
@@ -114,23 +136,24 @@
         }
 
 
-       /**
-        * @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.
-        */
+		/**
+		* Character data handler
+		* Variable in the last element of this->output
+		* @param resource $parse an instance of parser
+		* @param string $body a data to be added
+		* @return void
+		*/
         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
-        */
+		/**
+		* End element handler
+		* @param resource $parse an instance of parser
+		* @param string $node_name name of xml node
+		* @return void
+		*/
         function _tagClosed($parser, $node_name) {
             $node_name = strtolower($node_name);
             $cur_obj = array_pop($this->output);
@@ -155,10 +178,11 @@
             }
         }
 
-        /**
-        * @brief method to transfer values in an array to a data object       
-        * @param[in] $arr data array 
-        **/
+		/**
+		* Method to transfer values in an array to a data object       
+		* @param array $arr data array 
+		* @return Xml_Node_ object
+		**/
         function _arrToAttrsObj($arr) {
 	    $output = new Xml_Node_();
             foreach($arr as $key => $val) {
diff --git a/classes/xml/XmlQueryParser.150.class.php b/classes/xml/XmlQueryParser.150.class.php
index ba4dd7d0a..b0c2087d4 100644
--- a/classes/xml/XmlQueryParser.150.class.php
+++ b/classes/xml/XmlQueryParser.150.class.php
@@ -1,14 +1,4 @@
 <?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);
 
@@ -21,6 +11,7 @@
 	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/InsertColumnTagWithoutArgument.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');
@@ -43,12 +34,27 @@
         require(_XE_PATH_.'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
     }
 
-
+	/**
+	 * New XmlQueryParser class
+	 * @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
+	 */
     class XmlQueryParser extends XmlParser {
-
+		/**
+		 * constructor
+		 * @return void
+		 */
         function XmlQueryParser(){
     	}
 
+		/**
+		 * Create XmlQueryParser instance for Singleton
+		 * @return XmlQueryParser object
+		 */
     	function &getInstance(){
             static $theInstance = null;
             if(!isset($theInstance)){
@@ -57,6 +63,12 @@
             return $theInstance;
     	}
 
+		/**
+		 * 1. Read xml file<br />
+		 * 2. Check the action<br />
+		 * 3. Parsing and write a cache file<br />
+		 * @return QueryParser object
+		 */
         function &parse_xml_query($query_id, $xml_file, $cache_file)
 	{
             // Read xml file
@@ -73,11 +85,19 @@
 	    return $parser;
         }
 
+		/**
+		 * Query XML file parsing
+		 * @return QueryParser object
+		 */
         function parse($query_id = NULL, $xml_file = NULL, $cache_file = NULL)
 	{
-	    $query_parser = &$this->parse_xml_query($query_id, $xml_file, $cache_file);
+	    $this->parse_xml_query($query_id, $xml_file, $cache_file);
 	}
 
+		/**
+		 * Return XML file content
+		 * @return array|NULL Returns a resultant data object or NULL in case of error
+		 */
         function getXmlFileContent($xml_file){
 			$buff = FileHandler::readFile($xml_file);
             $xml_obj = parent::parse($buff);
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index bf6d291fd..0bc5c8a0f 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -1,13 +1,12 @@
 <?php
     /**
-     * @class XmlQueryParser
-     * @author NHN (developers@xpressengine.com)
-     * @brief case to parse XE xml query 
-     * @version 0.1
+     * XmlQueryParser
+     * Case to parse XE xml query 
      *
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
      * @todo need to support extend query such as subquery, union
-     **/
-
+     */
     class XmlQueryParser extends XmlParser {
 
         var $default_list = array();
@@ -15,13 +14,13 @@
         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}
-         **/
+         * Parse a xml query file and save the result as a new file specified by cache_file
+         * {there should be a way to report an error}
+         * @param string $query_id name of query
+         * @param string $xml_file file path of a xml query file to be loaded
+         * @param string $cache_file file path of a cache file to store resultant php code after parsing xml query
+         * @return void Nothing is requred.
+         */
         function parse($query_id, $xml_file, $cache_file) {
             // query xml 파일을 찾아서 파싱, 결과가 없으면 return
             $buff = FileHandler::readFile($xml_file);
@@ -36,7 +35,8 @@
                 $id = $id_args[1];
             } elseif(count($id_args)==3) {
                 $target = $id_args[0];
-                if(!in_array($target, array('modules','addons','widgets'))) return;
+				$typeList = array('modules'=>1, 'addons'=>1, 'widgets'=>1);
+                if(!isset($typeList[$target])) return;
                 $module = $id_args[1];
                 $id = $id_args[2];
             }
@@ -53,6 +53,7 @@
 
             if(!$tables) return;
             if(!is_array($tables)) $tables = array($tables);
+			$joinList = array('left join'=>1, 'left outer join'=>1, 'right join'=>1, 'right outer join'=>1);
             foreach($tables as $key => $val) {
 
                 // 테이블과 alias의 이름을 구함
@@ -62,7 +63,7 @@
 
                 $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)){
+                if(isset($joinList[$val->attrs->type]) && count($val->conditions)){
                     $output->left_tables[$alias] =  $val->attrs->type;
                     $left_conditions[$alias] = $val->conditions;
                 }
@@ -260,11 +261,10 @@
         }
 
         /**
-        * @brief transfer given column information to object->columns
-        * @param[in] column information
-        * @result Returns $object 
+        * Transfer given column information to object->columns
+        * @param array $columns column information
+        * @return object
         */
-
         function _setColumn($columns){
             if(!$columns) {
                 $output->column[] = array("*" => "*");
@@ -296,9 +296,9 @@
         }
 
         /**
-        * @brief transfer condition information to $object->conditions
-        * @param[in] SQL condition information
-        * @result Returns $output
+        * Transfer condition information to $object->conditions
+        * @param object @condition SQL condition information
+        * @retrun object
         */
         function _setConditions($conditions){
             // 조건절 정리
@@ -339,9 +339,9 @@
         }
 
         /**
-        * @brief transfer condition information to $object->groups
-        * @param[in] SQL group information
-        * @result Returns $output
+        * Transfer condition information to $object->groups
+        * @param array $group_list SQL group information
+        * @return object
         */
         function _setGroup($group_list){
             // group 정리
@@ -361,9 +361,9 @@
 
 
         /**
-        * @brief transfer pagnation information to $output
-        * @param[in] $xml_obj xml object containing Navigation information
-        * @result Returns $output
+        * Transfer pagnation information to $output
+        * @param object $xml_obj xml object containing Navigation information
+        * @return object
         */
         function _setNavigation($xml_obj){
             $navigation = $xml_obj->query->navigation;
@@ -389,10 +389,10 @@
         }
 
         /**
-        * @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
+        * Retrieve column information from $output->colums to generate corresponding php code <br />
+        * The name of this method is misleading.
+        * @param array $columns
+        * @return string buffer containing php code
         */
         function _getColumn($columns){
             $buff = '';
@@ -439,10 +439,10 @@
         }
 
         /**
-        * @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
+        * Retrieve condition information from $output->condition to generate corresponding php code 
+        * The name of this method is misleading.
+        * @param array $conditions array containing Query conditions
+        * @return string buffer containing php code
         */
         function _getConditions($conditions){
             $buff = '';
@@ -472,21 +472,30 @@
             return $buff;
         }
 
+        /**
+        * Add argument to $this->args
+        * @param mixed $args_name argument value
+        * @return void
+        */
 		function addArguments($args_name)
 		{
 			$this->args[] = $args_name;
 		}
 		
+        /**
+        * Get argument from $this->args
+        * @return mixed
+        */
 		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
+        * Returns predefined default values correspoding to given parameters 
+        * @param string $name 
+        * @param mixed $value
+        * @return mixed Returns a default value for specified field
         */
         function getDefault($name, $value) {
             $db_info = Context::getDBInfo ();
diff --git a/classes/xml/xmlquery/DBParser.class.php b/classes/xml/xmlquery/DBParser.class.php
index 7fd962dcd..111f698f4 100644
--- a/classes/xml/xmlquery/DBParser.class.php
+++ b/classes/xml/xmlquery/DBParser.class.php
@@ -1,9 +1,34 @@
 <?php
+	/**
+	 * DBParser class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery
+	 * @version 0.1
+	 */
 	class DBParser {
+		/**
+		 * Character for escape target value on the left
+		 * @var string
+		 */
 		var $escape_char_left;
+		/**
+		 * Character for escape target value on the right
+		 * @var string
+		 */
 		var $escape_char_right;
+		/**
+		 * Table prefix string
+		 * @var string
+		 */
 		var $table_prefix;
 		
+		/**
+		 * constructor
+		 * @param string $escape_char_left
+		 * @param string $escape_char_right
+		 * @param string $table_prefix
+		 * @return void
+		 */
 		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;
@@ -11,33 +36,68 @@
 			$this->table_prefix = $table_prefix;
 		}
 		
+		/**
+		 * Get escape character
+		 * @param string $leftOrRight left or right
+		 * @return string
+		 */
 		function getEscapeChar($leftOrRight){
 			if ($leftOrRight === 'left')return $this->escape_char_left;
 			else return $this->escape_char_right;
 		}
 		
+		/**
+		 * escape the value
+		 * @param mixed $name
+		 * @return string
+		 */
 		function escape($name){
 			return $this->escape_char_left . $name . $this->escape_char_right;
 		}		
 		
+		/**
+		 * escape the string value
+		 * @param string $name
+		 * @return string
+		 */
 		function escapeString($name){
 			return "'".$this->escapeStringValue($name)."'";
 		}
 		
+		/**
+		 * escape the string value
+		 * @param string $value
+		 * @return string
+		 */
 		function escapeStringValue($value){
 			if($value == "*")	return $value;
 			if (is_string($value))	return $value = str_replace("'","''",$value);
 			return $value;
 		}
 		
+		/**
+		 * Return table full name
+		 * @param string $name table name without table prefix
+		 * @return string table full name with table prefix
+		 */
 		function parseTableName($name){
 			return $this->table_prefix . $name;
 		}
 		
+		/**
+		 * Return colmun name after escape
+		 * @param string $name column name before escape
+		 * @return string column name after escape
+		 */
 		function parseColumnName($name){
 			return $this->escapeColumn($name);
 		}
 		
+		/**
+		 * Escape column
+		 * @param string $column_name
+		 * @return string column name with db name
+		 */
 		function escapeColumn($column_name){
 			if($this->isUnqualifiedColumnName($column_name))
 				return $this->escape($column_name);
@@ -49,11 +109,21 @@
 			}
 		}
 
+		/**
+		 * Column name is suitable for use in checking
+		 * @param string $column_name
+		 * @return bool
+		 */
 		function isUnqualifiedColumnName($column_name){
 			if(strpos($column_name,'.')===false && strpos($column_name,'(')===false) return true;
 			return false;	
 		}
 		
+		/**
+		 * Column name is suitable for use in checking
+		 * @param string $column_name
+		 * @return bool
+		 */
 		function isQualifiedColumnName($column_name){
 			if(strpos($column_name,'.')!==false && strpos($column_name,'(')===false) return true;
 			return false;		
@@ -84,6 +154,11 @@
 			return implode('', $functions);				
 		}
 		
+		/*
+		 * Checks argument is asterisk
+		 * @param string $column_name
+		 * @return bool
+		 */
 		function isStar($column_name){
 			if(substr($column_name,-1) == '*') return true;
 			return false;
@@ -92,12 +167,19 @@
 		/*
 		 * Checks to see if expression is an aggregate star function
 		 * like count(*)
+		 * @param string $column_name
+		 * @return bool
 		 */
 		function isStarFunction($column_name){
 			if(strpos($column_name, "(*)")!==false) return true;
 			return false;
 		}
 		
+		/*
+		 * Return column name after escape
+		 * @param string $column_name
+		 * @return string
+		 */
 		function escapeColumnExpression($column_name){
 			if($this->isStar($column_name)) return $column_name;
 			if($this->isStarFunction($column_name)){
@@ -108,4 +190,4 @@
 		}				
 	}
 	
-	
\ No newline at end of file
+	
diff --git a/classes/xml/xmlquery/QueryParser.class.php b/classes/xml/xmlquery/QueryParser.class.php
index 3ff1cb73d..ab1366a37 100644
--- a/classes/xml/xmlquery/QueryParser.class.php
+++ b/classes/xml/xmlquery/QueryParser.class.php
@@ -1,14 +1,34 @@
 <?php
-
+	/**
+	 * QueryParser class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery
+	 * @version 0.1
+	 */
     class QueryParser {
-
+		/**
+		 * QueryTag object
+		 * @var QueryTag object
+		 */
         var $queryTag;
 
+		/**
+		 * constructor
+		 * @param object $query
+		 * @param bool $isSubQuery
+		 * @return void
+		 */
         function QueryParser($query = NULL, $isSubQuery = false) {
 	    if ($query)
 		$this->queryTag = new QueryTag($query, $isSubQuery);
         }
 
+		/**
+		 * Return table information
+		 * @param object $query_id
+		 * @param bool $table_name
+		 * @return array
+		 */
         function getTableInfo($query_id, $table_name) {
             $column_type = array();
 			$module = '';
@@ -20,7 +40,8 @@
                 $id = $id_args[1];
             } elseif (count($id_args) == 3) {
                 $target = $id_args[0];
-                if (!in_array($target, array('modules', 'addons', 'widgets')))
+				$targetList = array('modules'=>1, 'addons'=>1, 'widgets'=>1);
+                if (!isset($targetList[$target]))
                     return;
                 $module = $id_args[1];
                 $id = $id_args[2];
@@ -56,6 +77,10 @@
             return $column_type;
         }
 
+		/**
+		 * Change code string from queryTag object
+		 * @return string
+		 */
         function toString() {
             return "<?php if(!defined('__ZBXE__')) exit();\n"
             . $this->queryTag->toString()
diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php
index d44fe36dd..7136f7d22 100644
--- a/classes/xml/xmlquery/argument/Argument.class.php
+++ b/classes/xml/xmlquery/argument/Argument.class.php
@@ -1,17 +1,57 @@
 <?php
-
+/**
+ * Argument class
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/xml/xmlquery/argument
+ * @version 0.1
+ */
 class Argument {
-
+	/**
+	 * argument value
+	 * @var mixed
+	 */
 	var $value;
+	/**
+	 * argument name
+	 * @var string
+	 */
 	var $name;
+	/**
+	 * argument type
+	 * @var string
+	 */
 	var $type;
+	/**
+	 * result of argument type check
+	 * @var bool
+	 */
 	var $isValid;
+	/**
+	 * error message
+	 * @var Object
+	 */
 	var $errorMessage;
+	/**
+	 * column operation
+	 */
 	var $column_operation;
-	
-	var $uses_default_value; // Check if arg value is user submnitted or default
-	var $_value; // Caches escaped and toString value so that the parsing won't happen multiple times;
+	/**
+	 * Check if arg value is user submnitted or default
+	 * @var mixed
+	 */
+	var $uses_default_value;
+	/**
+	 * Caches escaped and toString value so that the parsing won't happen multiple times
+	 * @var mixed
+	 */
+	var $_value; // 
 
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param mixed $value
+	 * @return void
+	 */
 	function Argument($name, $value) {
 		$this->value = $value;
 		$this->name = $name;
@@ -60,6 +100,11 @@ class Argument {
 		return $this->value;
 	}
 
+	/**
+	 * mixed value to string
+	 * @param mixed $value
+	 * @return string
+	 */
 	function toString($value) {
 		if (is_array($value)) {
 			if (count($value) === 0)
@@ -71,6 +116,11 @@ class Argument {
 		return $value;
 	}
 
+	/**
+	 * escape value
+	 * @param mixed $value
+	 * @return mixed
+	 */
 	function escapeValue($value) {
 		$column_type = $this->getType();
 		if ($column_type == 'column_name') {
@@ -80,7 +130,8 @@ class Argument {
 		if (!isset($value))
 			return null;
 
-		if (in_array($column_type, array('date', 'varchar', 'char', 'text', 'bigtext'))) {
+		$columnTypeList = array('date'=>1, 'varchar'=>1, 'char'=>1, 'text'=>1, 'bigtext'=>1);
+		if (isset($columnTypeList[$column_type])) {
 			if (!is_array($value))
 				$value = $this->_escapeStringValue($value);
 			else {
@@ -106,6 +157,11 @@ class Argument {
 		return $value;
 	}
 
+	/**
+	 * escape string value
+	 * @param string $value
+	 * @return string
+	 */
 	function _escapeStringValue($value) {
 		$db = &DB::getInstance();
 		$value = $db->addQuotes($value);
@@ -135,6 +191,11 @@ class Argument {
 		}
 	}
 
+	/**
+	 * check filter by filter type
+	 * @param string $filter_type
+	 * @return void
+	 */
 	function checkFilter($filter_type) {
 		if (isset($this->value) && $this->value != '') {
 			global $lang;
diff --git a/classes/xml/xmlquery/argument/ConditionArgument.class.php b/classes/xml/xmlquery/argument/ConditionArgument.class.php
index e47a57bd9..e5471a79c 100644
--- a/classes/xml/xmlquery/argument/ConditionArgument.class.php
+++ b/classes/xml/xmlquery/argument/ConditionArgument.class.php
@@ -1,11 +1,28 @@
 <?php
-
+	/**
+	 * ConditionArgument class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery/argument
+	 * @version 0.1
+	 */
 	class ConditionArgument extends Argument {
+		/**
+		 * Operator keyword. for example 'in', 'notint', 'between'
+		 * @var string
+		 */
 		var $operation;
 
 
+		/**
+		 * constructor
+		 * @param string $name
+		 * @param mixed $value
+		 * @param string $operation
+		 * @return void
+		 */
 		function ConditionArgument($name, $value, $operation){
-			if(isset($value) && in_array($operation, array('in', 'notin', 'between')) && !is_array($value) && $value != ''){
+			$operationList = array('in'=>1, 'notin'=>1, 'not_in'=>1, 'between'=>1);
+			if(isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != ''){
 				$value = str_replace(' ', '', $value);
 				$value = str_replace('\'', '', $value);
 				$value = explode(',', $value);
@@ -14,6 +31,10 @@
 			$this->operation = $operation;
 		}
 
+		/**
+		 * create condition value. set $this->value
+		 * @return void
+		 */
 		function createConditionValue(){
 			if(!isset($this->value)) return;
 
@@ -57,22 +78,23 @@
                                     if(!is_array($value)) $this->value = array($value);
                                 break;
                             case 'notin':
+							case 'not_in':
                                     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
-			*/
+		* 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(){
 			if($this->type)
 			{				
diff --git a/classes/xml/xmlquery/argument/SortArgument.class.php b/classes/xml/xmlquery/argument/SortArgument.class.php
index 639b10a06..fc83d1c6f 100644
--- a/classes/xml/xmlquery/argument/SortArgument.class.php
+++ b/classes/xml/xmlquery/argument/SortArgument.class.php
@@ -1,5 +1,10 @@
 <?php
-
+	/**
+	 * SortArgument class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery/argument
+	 * @version 0.1
+	 */
 	class SortArgument extends Argument {
 
             function getValue(){
diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
index 0dc053ab1..e5fa9793d 100644
--- a/classes/xml/xmlquery/queryargument/DefaultValue.class.php
+++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
@@ -1,15 +1,53 @@
 <?php
-
+	/**
+	 * DefaultValue class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery/queryargument
+	 * @version 0.1
+	 */
 	class DefaultValue {
+		/**
+		 * Column name
+		 * @var string
+		 */
 		var $column_name;
+		/**
+		 * Value
+		 * @var mixed
+		 */
 		var $value;
+		/**
+		 * sequnence status
+		 * @var bool
+		 */
 		var $is_sequence = false;
+		/**
+		 * operation status
+		 * @var bool
+		 */
                 var $is_operation = false;
+		/**
+		 * operation
+		 * @var string
+		 */
                 var $operation = '';
+				/**
+				 * Checks if value is plain string or name of XE function (ipaddress, plus, etc).
+				 * @var bool
+				 */
+                var $_is_string = false;
+				/**
+				 * Checks if value is string resulted from evaluating a piece of PHP code (see $_SERVER[REMOTE_ADDR])
+				 * @var bool
+				 */
+                var $_is_string_from_function = false;
 
-                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])
-
+		/**
+		 * constructor
+		 * @param string $column_name column name
+		 * @param mixed $value value
+		 * @return void
+		 */
 		function DefaultValue($column_name, $value){
                         $dbParser = &DB::getParser();
 			$this->column_name = $dbParser->parseColumnName($column_name);
diff --git a/classes/xml/xmlquery/queryargument/QueryArgument.class.php b/classes/xml/xmlquery/queryargument/QueryArgument.class.php
index a5840ce8b..ebeb7a30f 100644
--- a/classes/xml/xmlquery/queryargument/QueryArgument.class.php
+++ b/classes/xml/xmlquery/queryargument/QueryArgument.class.php
@@ -1,15 +1,53 @@
 <?php
-
+/**
+ * QueryArgument class
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/xml/xmlquery/queryargument
+ * @version 0.1
+ */
 class QueryArgument {
-
+	/**
+	 * Argument name
+	 * @var string
+	 */
 	var $argument_name;
+	/**
+	 * Variable name
+	 * @var string
+	 */
 	var $variable_name;
+	/**
+	 * Argument validator
+	 * @var QueryArgumentValidator
+	 */
 	var $argument_validator;
+	/**
+	 * Column name
+	 * @var string
+	 */
 	var $column_name;
+	/**
+	 * Table name
+	 * @var string
+	 */
 	var $table_name;
+	/**
+	 * Operation
+	 * @var string
+	 */
 	var $operation;
+	/**
+	 * Ignore value
+	 * @var bool
+	 */
 	var $ignore_value;
 
+	/**
+	 * constructor
+	 * @param object $tag tag object
+	 * @param bool $ignore_value
+	 * @return void
+	 */
 	function QueryArgument($tag, $ignore_value = false) {
 		static $number_of_arguments = 0;
 
@@ -64,6 +102,10 @@ class QueryArgument {
 		return false;
 	}
 
+	/**
+	 * Change QueryArgument object to string
+	 * @return string
+	 */
 	function toString() {
 		if ($this->isConditionArgument()) {
 			// Instantiation
diff --git a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
index 4424c3f5b..e99486f1f 100644
--- a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
+++ b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
@@ -1,6 +1,15 @@
 <?php
-
+	/**
+	 * SortQueryArgument class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery/queryargument
+	 * @version 0.1
+	 */
 	class SortQueryArgument extends QueryArgument{
+			/**
+			 * Change SortQueryArgument object to string
+			 * @return string
+			 */
             function toString(){
                 $arg = sprintf("\n" . '${\'%s_argument\'} = new SortArgument(\'%s\', %s);' . "\n"
                                         , $this->argument_name
diff --git a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
index aa3fef3d4..dbf8ce3a9 100644
--- a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
+++ b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
@@ -1,16 +1,56 @@
 <?php
+	/**
+	 * QueryArgumentValidator class
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /classes/xml/xmlquery/queryargument/validator
+	 * @version 0.1
+	 */
 	class QueryArgumentValidator {
+		/**
+		 * Argument name
+		 * @var string
+		 */
 		var $argument_name;
+		/**
+		 * Default value
+		 * @var string
+		 */
 		var $default_value;
+		/**
+		 * Notnull status setting, if value should be not null, this value is 'notnull'
+		 * @var string
+		 */
 		var $notnull;
+		/**
+		 * Filter for value type, for example number
+		 * @var string
+		 */
 		var $filter;
+		/**
+		 * Minimum length for value
+		 * @var int
+		 */
 		var $min_length;
+		/**
+		 * Maximum length for value
+		 * @var int
+		 */
 		var $max_length;
 
 		var $validator_string;
 
+		/**
+		 * Query argument for validate
+		 * @var QueryArgument object
+		 */
 		var $argument;
 
+		/**
+		 * constructor
+		 * @param Xml_Node_ $tag tag object by Query xml file parse
+		 * @param QueryArgument $argument
+		 * @return void
+		 */
 		function QueryArgumentValidator($tag, $argument){
 			$this->argument = $argument;
 			$this->argument_name = $this->argument->getArgumentName();
diff --git a/classes/xml/xmlquery/tags/column/ColumnTag.class.php b/classes/xml/xmlquery/tags/column/ColumnTag.class.php
index 8ffe77373..33edeba26 100644
--- a/classes/xml/xmlquery/tags/column/ColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/ColumnTag.class.php
@@ -1,19 +1,28 @@
 <?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. 
+	/**
+	 * ColumnTag class
+	 * 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. 
 	 *
-     **/
-
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class ColumnTag {
+		/**
+		 * Column name
+		 * @var string
+		 */
 		var $name;
 		
+		/**
+		 * constructor
+		 * @param string $name
+		 * @return void
+		 */
 		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
index 500d25b6d..0bef31920 100644
--- a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
@@ -1,15 +1,24 @@
 <?php
-    /**
-     * @class InsertColumnTag
-     * @author Arnia Software
-     * @brief Models the <column> tag inside an XML Query file whose action is 'insert'
-     *
-     **/
-
-
+	/**
+	 * InsertColumnTag
+	 * Models the <column> tag inside an XML Query file whose action is 'insert'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class InsertColumnTag extends ColumnTag {
+		/**
+		 * argument
+		 * @var QueryArgument object
+		 */
 		var $argument;
 
+		/**
+		 * constructor
+		 * @param object $column
+		 * @return void
+		 */
 		function InsertColumnTag($column) {
 			parent::ColumnTag($column->attrs->name);
 			$dbParser = DB::getParser();
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php
new file mode 100644
index 000000000..86ac458dc
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php
@@ -0,0 +1,31 @@
+<?php
+	/**
+	 * InsertColumnTagWithoutArgument
+	 * Models the <column> tag inside an XML Query file whose action is 'insert-select'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
+	class InsertColumnTagWithoutArgument extends ColumnTag {
+		/**
+		 * constructor
+		 * @param object $column
+		 * @return void
+		 */
+		function InsertColumnTagWithoutArgument($column) {
+			parent::ColumnTag($column->attrs->name);
+			$dbParser = DB::getParser();
+			$this->name = $dbParser->parseColumnName($this->name);
+		}
+
+		function getExpressionString(){
+			return sprintf('new Expression(\'%s\')', $this->name);
+		}
+
+		function getArgument(){
+			return null;
+		}
+
+	}
+?>
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
index 88ed19ccb..0cfca653c 100644
--- a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
@@ -1,14 +1,24 @@
 <?php
-    /**
-     * @class InsertColumnsTag
-     * @author Arnia Software
-     * @brief Models the <column> tag inside an XML Query file whose action is 'insert'
-     *
-     **/
-
+	/**
+	 * InsertColumnsTag class
+	 * Models the <column> tag inside an XML Query file whose action is 'insert'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class InsertColumnsTag{
+		/**
+		 * Column list
+		 * @var array value is InsertColumnTag object
+		 */
 		var $columns;
 
+		/**
+		 * constructor
+		 * @param array|string $xml_columns
+		 * @return void
+		 */
 		function InsertColumnsTag($xml_columns) {
 			$this->columns = array();
 
@@ -19,10 +29,15 @@
 
 			foreach($xml_columns as $column){
 				if($column->name === 'query') $this->columns[] = new QueryTag($column, true);
+				else if(!isset($column->attrs->var) && !isset($column->attrs->default)) $this->columns[] = new InsertColumnTagWithoutArgument($column);
 				else $this->columns[] = new InsertColumnTag($column);
 			}
 		}
 
+		/**
+		 * InsertColumnTag object to string
+		 * @return string
+		 */
 		function toString(){
 			$output_columns = 'array(' . PHP_EOL;
 			foreach($this->columns as $column){
@@ -33,6 +48,10 @@
 			return $output_columns;
 		}
 
+		/**
+		 * Return argument list
+		 * @return array
+		 */
 		function getArguments(){
 			$arguments = array();
 			foreach($this->columns as $column){
@@ -43,4 +62,4 @@
 
 	}
 
-?>
\ 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
index 5f9e2a7f7..bef7e0fd2 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
@@ -1,16 +1,29 @@
 <?php
-
-    /**
-     * @class SelectColumnTag
-     * @author Arnia Software
-     * @brief Models the <column> tag inside an XML Query file whose action is 'select'
-     *
-     **/
-
+	/**
+	 * SelectColumnTag
+	 * Models the <column> tag inside an XML Query file whose action is 'select'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class SelectColumnTag extends ColumnTag{
+		/**
+		 * alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * click count status
+		 * @var bool
+		 */
 		var $click_count;
 		
+		/**
+		 * constructor
+		 * @param string|object $column
+		 * @return void
+		 */
 		function SelectColumnTag($column){
 			if ($column == "*" || $column->attrs->name == '*')
 			{
@@ -32,6 +45,8 @@
 			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);
+			if(strpos($this->name, '$') === 0)
+					return sprintf('new SelectExpression($args->%s)', substr($this->name, 1));
 			$dbParser = DB::getParser();
 			return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias) .'\'': '');	
 		}
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
index 22f6c024e..47ec7446f 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
@@ -1,8 +1,23 @@
 <?php
-
+	/**
+	 * SelectColumnTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class SelectColumnsTag {
+		/**
+		 * Column list
+		 * @var array value is SelectColumnTag object
+		 */
 		var $columns;
 
+		/**
+		 * constructor
+		 * @param Xml_Node_ $xml_columns
+		 * @return void
+		 */
 		function SelectColumnsTag($xml_columns_tag){
 			if (!$xml_columns_tag)
 			    $xml_columns_tag = new Xml_Node_();
@@ -35,6 +50,10 @@
 			}
 		}
 
+		/**
+		 * SelectColumnTag object to string
+		 * @return string
+		 */
 		function toString(){
 			$output_columns = 'array(' . PHP_EOL;
 			foreach($this->columns as $column){
@@ -48,6 +67,10 @@
 			return $output_columns;
 		}
 
+		/**
+		 * Return argument list
+		 * @return array
+		 */
 		function getArguments(){
 			$arguments = array();
 			foreach($this->columns as $column){
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
index 1e53e2410..e2616ac34 100644
--- a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
@@ -1,18 +1,29 @@
 <?php
-
-    /**
-     * @class UpdateColumnTag
-     * @author Arnia Software
-     * @brief Models the <column> tag inside an XML Query file whose action is 'update'
-     *
-     **/
-
-
-
+	/**
+	 * UpdateColumnTag
+	 * Models the <column> tag inside an XML Query file whose action is 'update'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class UpdateColumnTag extends ColumnTag {
+		/**
+		 * argument
+		 * @var QueryArgument object
+		 */
 		var $argument;
+		/**
+		 * default value
+		 * @var string
+		 */
                 var $default_value;
 
+		/**
+		 * constructor
+		 * @param object $column
+		 * @return void
+		 */
 		function UpdateColumnTag($column) {
 			parent::ColumnTag($column->attrs->name);
 			$dbParser = DB::getParser();
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
index eb6ca94ea..dfa6b9a6b 100644
--- a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
@@ -1,15 +1,24 @@
 <?php
-
-    /**
-     * @class UpdateColumnsTag
-     * @author Arnia Software
-     * @brief Models the <column> tag inside an XML Query file whose action is 'update'
-     *
-     **/
-
+	/**
+	 * UpdateColumnsTag
+	 * Models the <column> tag inside an XML Query file whose action is 'update'
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/column
+	 * @version 0.1
+	 */
 	class UpdateColumnsTag{
+		/**
+		 * Column list
+		 * @var array value is UpdateColumnTag object
+		 */
 		var $columns;
 
+		/**
+		 * constructor
+		 * @param array|string $xml_columns
+		 * @return void
+		 */
 		function UpdateColumnsTag($xml_columns) {
 			$this->columns = array();
 
@@ -21,6 +30,10 @@
 			}
 		}
 
+		/**
+		 * UpdateColumnTag object to string
+		 * @return string
+		 */
 		function toString(){
 			$output_columns = 'array(' . PHP_EOL;
 			foreach($this->columns as $column){
@@ -31,6 +44,10 @@
 			return $output_columns;
 		}
 
+		/**
+		 * Return argument list
+		 * @return array
+		 */
 		function getArguments(){
 			$arguments = array();
 			foreach($this->columns as $column){
@@ -41,4 +58,4 @@
 
 	}
 
-?>
\ 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
index 2fa3609db..068c62479 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
@@ -1,9 +1,29 @@
 <?php
-
+	/**
+	 * ConditionGroupTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/condition
+	 * @version 0.1
+	 */
 	class ConditionGroupTag {
+		/**
+		 * condition list
+		 * @var string|array value is ConditionTag object
+		 */
 		var $conditions;
+		/**
+		 * pipe
+		 * @var string
+		 */
 		var $pipe;
 
+		/**
+		 * constructor
+		 * @param string|array $conditions
+		 * @param string $pipe
+		 * @return void
+		 */
 		function ConditionGroupTag($conditions, $pipe = ""){
 			$this->pipe = $pipe;
 
@@ -19,6 +39,10 @@
 			return $this->conditions;
 		}
 
+		/**
+		 * ConditionTag object to string
+		 * @return string
+		 */
 		function getConditionGroupString(){
 			$conditions_string = 'array('.PHP_EOL;
 			foreach($this->conditions as $condition){
@@ -39,4 +63,4 @@
 		}
 
 	}
-?>
\ 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
index f916e16ac..dbb37c82a 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
@@ -1,22 +1,54 @@
 <?php
-
 	/**
-	 * @class ConditionTag
-	 * @author Corina
-	 * @brief Models the <condition> tag inside an XML Query file. Base class.
+	 * ConditionTag
+	 * Models the <condition> tag inside an XML Query file. Base class.
 	 *
+	 * @author Corina
+	 * @package /classes/xml/xmlquery/tags/condition
+	 * @version 0.1
 	 */
-
 	class ConditionTag {
+		/**
+		 * operation for example 'in', 'between', 'not in'...
+		 * @var string
+		 */
 		var $operation;
+		/**
+		 * Column name
+		 * @var string
+		 */
 		var $column_name;
-
+		/**
+		 * Pipe
+		 * @var string
+		 */
 		var $pipe;
+		/**
+		 * Argument name
+		 * @var string
+		 */
 		var $argument_name;
+		/**
+		 * QueryArgument object
+		 * @var QueryArgument
+		 */
 		var $argument;
+		/**
+		 * Default column
+		 * @var string
+		 */
 		var $default_column;
-
+		/**
+		 * QueryTag object
+		 * @var QueryTag
+		 */
                 var $query;
+
+		/**
+		 * constructor
+		 * @param object $condition
+		 * @return void
+		 */
 		function ConditionTag($condition){
 			$this->operation = $condition->attrs->operation;
 			$this->pipe = $condition->attrs->pipe;
@@ -38,7 +70,8 @@
 			}
 			else {
                             if(isset($condition->attrs->default)){
-                              if(in_array($this->operation, array('in', 'between', 'not in'))){
+								$operationList = array('in'=>1, 'between'=>1, 'not in'=>1);
+                              if(isset($operationList[$this->operation])){
                                     $default_value = $condition->attrs->default;
                                     if(strpos($default_value, "'") !== false)
                                         $default_value = "\"" . $default_value . "\"";
diff --git a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
index 5e8b30b12..e5a6ef206 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
@@ -1,7 +1,23 @@
 <?php
+	/**
+	 * ConditionsTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/condition
+	 * @version 0.1
+	 */
 	class ConditionsTag {
+		/**
+		 * ConditionGroupTag list
+		 * @var array value is ConditionGroupTag object
+		 */
 		var $condition_groups;
 
+		/**
+		 * constructor
+		 * @param object $xml_conditions
+		 * @return void
+		 */
 		function ConditionsTag($xml_conditions){
 			$this->condition_groups = array();
 			if (!$xml_conditions)
@@ -29,6 +45,10 @@
 			}
 		}
 
+		/**
+		 * ConditionGroupTag object to string
+		 * @return string
+		 */
 		function toString(){
 			$output_conditions = 'array(' . PHP_EOL;
 			foreach($this->condition_groups as $condition){
diff --git a/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
index 3b59989f6..690b1893d 100644
--- a/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
@@ -1,11 +1,21 @@
 <?php 
-
+	/**
+	 * JoinConditionsTag class
+	 *
+	 * @author Corina
+	 * @package /classes/xml/xmlquery/tags/condition
+	 * @version 0.1
+	 */
 	class JoinConditionsTag extends ConditionsTag {
-		
+		/**
+		 * constructor
+		 * @param object $xml_conditions
+		 * @return void
+		 */
 		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
index d492859b5..5da76bd08 100644
--- a/classes/xml/xmlquery/tags/group/GroupsTag.class.php
+++ b/classes/xml/xmlquery/tags/group/GroupsTag.class.php
@@ -1,8 +1,23 @@
 <?php 
-
+	/**
+	 * GroupsTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/group
+	 * @version 0.1
+	 */
 	class GroupsTag {
+		/**
+		 * column list
+		 * @var array
+		 */
 		var $groups;
 		
+		/**
+		 * constructor
+		 * @param array|string $xml_groups
+		 * @return void
+		 */
 		function GroupsTag($xml_groups){			
 			$this->groups = array();
 			
diff --git a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
index d819c5318..3f3a5bc7c 100644
--- a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
@@ -1,12 +1,43 @@
 <?php
-
+	/**
+	 * IndexTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/navigation
+	 * @version 0.1
+	 */
 	class IndexTag {
+		/**
+		 * argument name
+		 * @var string
+		 */
 		var $argument_name;
+		/**
+		 * QueryArgument object
+		 * @var QueryArgument
+		 */
 		var $argument;
+		/**
+		 * Default value
+		 * @var string
+		 */
 		var $default;
+		/**
+		 * Sort order
+		 * @var string
+		 */
 		var $sort_order;
+		/**
+		 * Sort order argument
+		 * @var SortQueryArgument object
+		 */
 		var $sort_order_argument;
 
+		/**
+		 * constructor
+		 * @param object $index
+		 * @return void
+		 */
 		function IndexTag($index){
 			$this->argument_name = $index->attrs->var;
 
@@ -18,7 +49,8 @@
 
                         // Sort order - asc / desc
 			$this->sort_order = $index->attrs->order;
-			if(!in_array($this->sort_order, array("asc", "desc"))){
+			$sortList = array('asc'=>1, 'desc'=>1);
+			if(!isset($sortList[$this->sort_order])){
 				$arg = new Xml_Node_();
 				$arg->attrs = new Xml_Node_();
 				$arg->attrs->var = $this->sort_order;
diff --git a/classes/xml/xmlquery/tags/navigation/LimitTag.class.php b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php
index 8f3618057..c77c928c3 100644
--- a/classes/xml/xmlquery/tags/navigation/LimitTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php
@@ -1,11 +1,38 @@
 <?php
-
+	/**
+	 * LimitTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/navigation
+	 * @version 0.1
+	 */
 	class LimitTag {
+		/**
+		 * Value is relate to limit query
+		 * @var array
+		 */
 		var $arguments;
+		/**
+		 * QueryArgument object
+		 * @var QueryArgument
+		 */
 		var $page;
+		/**
+		 * QueryArgument object
+		 * @var QueryArgument
+		 */
 		var $page_count;
+		/**
+		 * QueryArgument object
+		 * @var QueryArgument
+		 */
 		var $list_count;
 
+		/**
+		 * constructor
+		 * @param object $index
+		 * @return void
+		 */
 		function LimitTag($index){
 			if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs){
 				$this->page = new QueryArgument($index->page);
diff --git a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
index a428cad98..d5f66c873 100644
--- a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
@@ -1,11 +1,43 @@
 <?php
+	/**
+	 * NavigationTag class
+	 *
+	 * @author Arnia Software
+	 * @package /classes/xml/xmlquery/tags/navigation
+	 * @version 0.1
+	 */
 	class NavigationTag {
+		/**
+		 * Order
+		 * @var array
+		 */
 		var $order;
+		/**
+		 * List count
+		 * @var int
+		 */
 		var $list_count;
+		/**
+		 * Page count
+		 * @var int
+		 */
 		var $page_count;
+		/**
+		 * Page
+		 * @var int
+		 */
 		var $page;
+		/**
+		 * Limit
+		 * @var LimitTag object
+		 */
 		var $limit;
 
+		/**
+		 * constructor
+		 * @param object $xml_navigation
+		 * @return void
+		 */
 		function NavigationTag($xml_navigation){
 			$this->order = array();
             if($xml_navigation) {
@@ -31,6 +63,10 @@
             }
 		}
 
+		/**
+		 * NavigationTag object to string
+		 * @return string
+		 */
 		function getOrderByString(){
 			$output = 'array(' . PHP_EOL;
 			foreach($this->order as $order){
@@ -41,6 +77,10 @@
 			return $output;
 		}
 
+		/**
+		 * LimitTag object to string
+		 * @return string
+		 */
 		function getLimitString(){
 			if ($this->limit)	return $this->limit->toString();
 			else return "";
diff --git a/classes/xml/xmlquery/tags/query/QueryTag.class.php b/classes/xml/xmlquery/tags/query/QueryTag.class.php
index 20bf79f1a..ef9dab3e2 100644
--- a/classes/xml/xmlquery/tags/query/QueryTag.class.php
+++ b/classes/xml/xmlquery/tags/query/QueryTag.class.php
@@ -1,25 +1,104 @@
 <?php
-
+/**
+ * QueryTag class
+ *
+ * @author Arnia Software
+ * @package /classes/xml/xmlquery/tags/query
+ * @version 0.1
+ */
 class QueryTag {
-
+	/**
+	 * Action for example, 'select', 'insert', 'delete'...
+	 * @var string
+	 */
 	var $action;
+	/**
+	 * Query id
+	 * @var string
+	 */
 	var $query_id;
+	/**
+	 * Priority
+	 * @var string
+	 */
 	var $priority;
+	/**
+	 * column type list
+	 * @var array
+	 */
 	var $column_type;
+	/**
+	 * Query stdClass object
+	 * @var object
+	 */
 	var $query;
-	//xml tags
+	/**
+	 * Columns in xml tags
+	 * @var object
+	 */
 	var $columns;
+	/**
+	 * Tables in xml tags
+	 * @var object
+	 */
 	var $tables;
+	/**
+	 * Subquery in xml tags
+	 * @var object
+	 */
+	var $subquery;
+	/**
+	 * Conditions in xml tags
+	 * @var object
+	 */
 	var $conditions;
+	/**
+	 * Groups in xml tags
+	 * @var object
+	 */
 	var $groups;
+	/**
+	 * Navigation in xml tags
+	 * @var object
+	 */
 	var $navigation;
+	/**
+	 * Arguments in xml tags
+	 * @var object
+	 */
 	var $arguments;
+	/**
+	 * PreBuff
+	 * @var string
+	 */
 	var $preBuff;
+	/**
+	 * Buff
+	 * @var string
+	 */
 	var $buff;
+	/**
+	 * Subquery status
+	 * @var bool
+	 */
 	var $isSubQuery;
+	/**
+	 * Join type
+	 * @var string
+	 */
 	var $join_type;
+	/**
+	 * alias
+	 * @var string
+	 */
 	var $alias;
 
+	/**
+	 * constructor
+	 * @param object $query
+	 * @param bool $isSubQuery
+	 * @return void
+	 */
 	function QueryTag($query, $isSubQuery = false) {
 		$this->action = $query->attrs->action;
 		$this->query_id = $query->attrs->id;
@@ -37,9 +116,12 @@ class QueryTag {
 		$this->getColumns();
 		$tables = $this->getTables();
 		$this->setTableColumnTypes($tables);
+		$this->getSubquery(); // Used for insert-select
 		$this->getConditions();
 		$this->getGroups();
 		$this->getNavigation();
+		
+		
 		$this->getPrebuff();
 		$this->getBuff();
 	}
@@ -77,19 +159,20 @@ class QueryTag {
 		}
 	}
 
-	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 getColumns(){
+		if($this->action == 'select'){
+			return $this->columns =  new SelectColumnsTag($this->query->columns);
+		}else if($this->action == 'insert' || $this->action == 'insert-select'){
+			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() {
+		if($this->isSubQuery) return;
 		// TODO Check if this work with arguments in join clause
 		$arguments = $this->getArguments();
 
@@ -159,11 +242,13 @@ class QueryTag {
 		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;
+        $buff .= '$query->setTables(' . $this->tables->toString() .');'.PHP_EOL;
+		if($this->action == 'insert-select')
+				$buff .= '$query->setSubquery(' . $this->subquery->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;
@@ -176,7 +261,13 @@ class QueryTag {
 			return $this->tables = new TablesTag($this->query->tables);
 	}
 
-	function getConditions() {
+	function getSubquery(){
+		if($this->query->query){
+			$this->subquery = new QueryTag($this->query->query, true);
+		}
+	}
+	
+	function getConditions(){
 		return $this->conditions = new ConditionsTag($this->query->conditions);
 	}
 
@@ -207,11 +298,13 @@ class QueryTag {
 		return $this->buff;
 	}
 
-	function getArguments() {
+	function getArguments(){
 		$arguments = array();
 		if ($this->columns)
 			$arguments = array_merge($arguments, $this->columns->getArguments());
-		$arguments = array_merge($arguments, $this->tables->getArguments());
+		if($this->action =='insert-select')
+			$arguments = array_merge($arguments, $this->subquery->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
index 00196502a..2c23a786c 100644
--- a/classes/xml/xmlquery/tags/table/HintTableTag.class.php
+++ b/classes/xml/xmlquery/tags/table/HintTableTag.class.php
@@ -1,20 +1,26 @@
 <?php
-
 	/**
-	 * @class HintTableTag
-	 * @author Arnia Sowftare
-	 * @brief Models the <table> tag inside an XML Query file
-         *      and the corresponding <index_hint> tag
+	 * HintTableTag
+	 * Models the <table> tag inside an XML Query file and the corresponding <index_hint> tag
 	 *
+	 * @author Arnia Sowftare
+	 * @package /classes/xml/xmlquery/tags/table
+	 * @version 0.1
 	 */
-
 	class HintTableTag extends TableTag {
+		/**
+		 * Action for example, 'select', 'insert', 'delete'...
+		 * @var array
+		 */
                 var $index;
 
-                /**
-                 * @brief Initialises Table Tag properties
-                 * @param XML <table> tag $table
-                 */
+		/**
+		 * constructor
+		 * Initialises Table Tag properties
+		 * @param object $table XML <table> tag
+		 * @param array $index
+		 * @return void
+		 */
 		function HintTableTag($table, $index){
                         parent::TableTag($table);
                         $this->index = $index;
diff --git a/classes/xml/xmlquery/tags/table/TableTag.class.php b/classes/xml/xmlquery/tags/table/TableTag.class.php
index e9ee67866..1c4d066af 100644
--- a/classes/xml/xmlquery/tags/table/TableTag.class.php
+++ b/classes/xml/xmlquery/tags/table/TableTag.class.php
@@ -1,34 +1,62 @@
 <?php 
-	
 	/**
-	 * @class TableTag
-	 * @author Arnia Sowftare
-	 * @brief Models the <table> tag inside an XML Query file
+	 * TableTag
+	 * 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>
 	 *
-         * @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>
+	 * @author Arnia Sowftare
+	 * @package /classes/xml/xmlquery/tags/table
+	 * @version 0.1
 	 */
-
 	class TableTag {
+		/**
+		 * Unescaped name
+		 * @var string
+		 */
 		var $unescaped_name;
+		/**
+		 * name
+		 * @var string
+		 */
 		var $name;
+		/**
+		 * alias
+		 * @var string
+		 */
 		var $alias;
+		/**
+		 * Join type
+		 * @example 'left join', 'left outer join', 'right join', 'right outer join'
+		 * @var string
+		 */
 		var $join_type;
+		/**
+		 * Condition object
+		 * @var object
+		 */
 		var $conditions;
+		/**
+		 * JoinConditionsTag
+		 * @var JoinConditionsTag object
+		 */
 		var $conditionsTag;
-                /**
-                 * @brief Initialises Table Tag properties
-                 * @param XML <table> tag $table
-                 */
+
+		/**
+		 * constructor
+		 * Initialises Table Tag properties
+		 * @param object $table XML <table> tag
+		 * @return void
+		 */
 		function TableTag($table){
 			$dbParser = DB::getParser();
                         
@@ -47,7 +75,8 @@
 		}
 		
 		function isJoinTable(){
-			if(in_array($this->join_type,array('left join','left outer join','right join','right outer join')) 
+			$joinList = array('left join'=>1, 'left outer join'=>1, 'right join'=>1, 'right outer join'=>1);
+			if(isset($joinList[$this->join_type])
 				&& count($this->conditions)) return true;
 			return false;
 		}
@@ -60,12 +89,12 @@
 			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 
-                 */
+		/**
+		 * 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();
 
diff --git a/classes/xml/xmlquery/tags/table/TablesTag.class.php b/classes/xml/xmlquery/tags/table/TablesTag.class.php
index b52121e47..bd48e66d0 100644
--- a/classes/xml/xmlquery/tags/table/TablesTag.class.php
+++ b/classes/xml/xmlquery/tags/table/TablesTag.class.php
@@ -1,24 +1,34 @@
 <?php
-
 	/**
-	 * @class TablesTag
-	 * @author Arnia Sowftare
-	 * @brief Models the <tables> tag inside an XML Query file
+	 * TablesTag class
+	 * 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>
 	 *
-         * @abstract
-         *   Example
-         *      <tables>
-         *          <table name="documents" alias="doc" />
-         *      </tables>
-         *   Attributes
-         *      None.
-         *   Children
-         *      Can have children of type <table> or <query>
+	 * @author Arnia Sowftare
+	 * @package /classes/xml/xmlquery/tags/table
+	 * @version 0.1
 	 */
-
 	class TablesTag {
+		/**
+		 * Table list
+		 * @var array
+		 */
 		var $tables;
 
+		/**
+		 * constructor
+		 * @param object $xml_tables_tag
+		 * @param object $xml_index_hints_tag
+		 * @return void
+		 */
 		function TablesTag($xml_tables_tag, $xml_index_hints_tag = NULL){
                     $this->tables = array();
 
@@ -42,7 +52,7 @@
                             $this->tables[] = new QueryTag($tag, true);
                         }
                         else {
-                            if(isset($indexes) && $indexes && isset($indexes[$tag->attrs->name]))
+                            if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])
                                 $this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);
                             else
                                 $this->tables[] = new TableTag($tag);
diff --git a/common/css/xe.css b/common/css/xe.css
index 2c2dc211f..d9c896acf 100644
--- a/common/css/xe.css
+++ b/common/css/xe.css
@@ -2,15 +2,15 @@
 /* NHN (developers@xpressengine.com) */
 /* Element Reset */
 body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}
-img{border:0}
-.xe_content{word-break:break-all;word-wrap:break-word}
+body{word-wrap:break-word}
+a img{border:0}
 .xe_content img{max-width:100%;height:auto}
 @media \0screen{.xe_content img{max-width:none}}
 /* Button Area */
 .btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}
 .btnArea:after{content:"";display:block;clear:both}
 .btnArea .etc{float:left}
-/* Button */
+/* Button - Legacy Code (Don't use it. It will be removed as soon as possible.) */
 .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 *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
diff --git a/common/css/xe.min.css b/common/css/xe.min.css
index c047e787e..0688e87e8 100644
--- a/common/css/xe.min.css
+++ b/common/css/xe.min.css
@@ -1 +1 @@
-@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}img{border:0}.xe_content{word-break:break-all;word-wrap:break-word}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.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 *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[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 *[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}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:0;text-decoration:underline;cursor:pointer}#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{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.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}.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}.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:0;width:100%;height:100%;opacity:.5;z-index:2;filter: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
+@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}body{word-wrap:break-word}a img{border:0}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.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 *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[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 *[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}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:0;text-decoration:underline;cursor:pointer}#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{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.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}.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}.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:0;width:100%;height:100%;opacity:.5;z-index:2;filter: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/lang/lang.info b/common/lang/lang.info
index 840a2b044..4f7adec8e 100644
--- a/common/lang/lang.info
+++ b/common/lang/lang.info
@@ -7,6 +7,6 @@ fr,Français
 de,Deutsch
 ru,Русский
 es,Español
-tr,Turkçe
+tr,Türkçe
 vi,Tiếng Việt
 mn,Mongolian
diff --git a/common/lang/lang.xml b/common/lang/lang.xml
index 59598bf1e..c557b7626 100644
--- a/common/lang/lang.xml
+++ b/common/lang/lang.xml
@@ -3002,6 +3002,10 @@ Xin vui lòng kiểm tra lại thông tin Database.]]></value>
 		<value xml:lang="zh-TW"><![CDATA[註冊失敗。]]></value>
 		<value xml:lang="de"><![CDATA[Misserfolg der Registrierung]]></value>
 	</item>
+	<item name="fail_to_update">
+		<value xml:lang="ko"><![CDATA[수정하지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Fail to update.]]></value>
+	</item>
 	<item name="fail_to_delete">
 		<value xml:lang="ko"><![CDATA[삭제 실패했습니다.]]></value>
 		<value xml:lang="en"><![CDATA[Failed to delete.]]></value>
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 7fa3a5799..75be1b9dc 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -4,85 +4,43 @@
 }
 <!--@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="{$lang_type}" xml:lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml">
 <!--@end-->
+<html lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml"|cond="$db_info->use_html5!='Y'">
 <head>
 {@$css_files=Context::getCssFile()}
 {@$js_files=Context::getJsFile()}
 <!-- META -->
 	<meta charset="UTF-8" cond="$db_info->use_html5=='Y'"/><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" cond="$db_info->use_html5!='Y'" />
 
-<!--@if($module_info->module)-->
-    <meta name="module" content="{$module_info->module}" />
-<!--@end-->
-<!--@if($module_info->skin)-->
-    <meta name="module_skin" content="{$module_info->skin}" />
-<!--@end-->
-<!--@if($layout_info->title)-->
-    <meta name="layout" content="{$layout_info->title} ({$layout_info->layout})" />
-<!--@end-->
-<!--@if($layout_info->author)-->
-    <!--@foreach($layout_info->author as $author)-->
-    <meta name="layout_maker" content="{$author->name} ({$author->homepage})" />
-    <!--@endforeach-->
-<!--@end-->
-    <meta http-equiv="imagetoolbar" content="no" />
-    <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-->
-<!--@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-->
-<!--@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}" />
-<!--@end-->
-<!--@if($general_rss_url)-->
-    <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-->
+	<meta name="Generator" content="XpressEngine" />
+<!-- TITLE -->
+	<title>{Context::getBrowserTitle()}</title>
+<!-- CSS -->
+<block loop="$css_files=>$key,$css_file">
+<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]></block>
+	<link rel="stylesheet" href="{$css_file['file']}" type="text/css"|cond="$db_info->use_html5!='Y'" media="{$css_file['media']}" />
+<block cond="$css_file['targetie']"><![endif]--></block>
+</block>
+<!-- JS -->
+<block loop="$js_files=>$key,$js_file">
+<block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block>
+	<script type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script>
+<block cond="$js_file['targetie']"><![endif]--></block>
+</block>
+	<block cond="$db_info->use_html5=='Y'"><!--[if lt IE 9]><script src="../js/html5.js"></script><![endif]--></block>
 
-<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
-<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+<!-- RSS -->
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" cond="$rss_url" /><link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" cond="$general_rss_url" />
 
-{@ $ssl_actions = Context::getSSLActions() }
-    <script type="text/javascript">//<![CDATA[
-        var current_url = "{$current_url}";
-        var request_uri = "{$request_uri}";
-<!--@if($vid)-->var xeVid = "{$vid}";<!--@end-->
-        var current_mid = "{$mid}";
-        var waiting_message = "{$lang->msg_call_server}";
-        var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->);
-        var default_url = "{Context::getDefaultUrl()}";
-        <!--@if(Context::get("_http_port"))-->var http_port = {Context::get("_http_port")};<!--@end-->
-        <!--@if(Context::get("_https_port"))-->var https_port = {Context::get("_https_port")};<!--@end-->
-        <!--@if(Context::get("_use_ssl") && Context::get("_use_ssl") == "always")-->var enforce_ssl = true;<!--@end-->
+	<link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" cond="$rss_url" /><link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" cond="$general_rss_url" />
 
-    //]]></script>
-
-    {Context::getHtmlHeader()}
+<!-- ICON -->
+	<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
 
+	<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+{Context::getHtmlHeader()}
 </head>
 <body{Context::getBodyClass()}>
 	<script type="text/javascript"|cond="$db_info->use_html5!='Y'">
diff --git a/config/config.inc.php b/config/config.inc.php
index f2e53b33a..92a7efee2 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -1,8 +1,9 @@
 <?php
     /**
+     * set the include of the class file and other environment configurations
+	 *
      * @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);
@@ -10,35 +11,52 @@
     if(!defined('__ZBXE__')) exit();
 
     /**
-     * @brief display XE's full version
+     * Display XE's full version
      * Even The file should be revised when releasing altough no change is made
-     **/
-	define('__XE_VERSION__', '1.5.2.7');
-    define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
+     */
+	define('__XE_VERSION__', '1.5.3');
+
+	/**
+	 * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
+	 */
+    define('__ZBXE_VERSION__', __XE_VERSION__);
 
     /**
-     * @brief The base path to where you installed zbXE Wanted
-     **/
+     * The base path to where you installed zbXE Wanted
+     */
     define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
 
 
-	/**
-	 * @brief 쿠키 이외의 값에서도 세션을 인식할 수 있도록 함(파일업로드 등에서의 문제 수정)
-	 **/
+	// Set can use other method instead cookie to store session id(for file upload)
 	ini_set('session.use_only_cookies', 0);
 
 
     if(file_exists(_XE_PATH_.'config/package.inc.php')) {
         require _XE_PATH_.'config/package.inc.php';
     } else {
+		/**
+		 * Package type
+		 */
 		define('_XE_PACKAGE_','XE');
+
+		/**
+		 * Location
+		 */
 		define('_XE_LOCATION_','en');
+
+		/**
+		 * Location site
+		 */
 		define('_XE_LOCATION_SITE_','http://www.xpressengine.org/');
+
+		/**
+		 * Download server
+		 */
 		define('_XE_DOWNLOAD_SERVER_','http://en.download.xpressengine.org/');
 	}
 
-    /**
-     * @brief user configuration files which override the default settings
+    /*
+     * user configuration files which override the default settings
      * save the following information into config/config.user.inc.php
      * <?php
      * define('__DEBUG__', 0);
@@ -57,111 +75,167 @@
         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);
+    if(!defined('__DEBUG__'))
+	{
+		/**
+		 * output debug message(bit value)
+		 *
+		 * <pre>
+		 * 0: generate debug messages/not display
+		 * 1: display messages through debugPrint() function
+		 * 2: output execute time, Request/Response info
+		 * 4: output DB query history
+		 * </pre>
+		 */
+		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);
+    if(!defined('__DEBUG_OUTPUT__'))
+	{
+		/**
+		 * output location of debug message
+		 *
+		 * <pre>
+		 * 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)
+		 * </pre>
+		 */
+		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');
+    if(!defined('__DEBUG_PROTECT__'))
+	{
+		/**
+		 * output comments of the firePHP console and browser
+		 *
+		 * <pre>
+		 * 0: No limit (not recommended)
+		 * 1: Allow only specified IP addresses
+		 * </pre>
+		 */
+		define('__DEBUG_PROTECT__', 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);
+    if(!defined('__DEBUG_PROTECT_IP__'))
+	{
+		/**
+		 * Set a ip address to allow debug
+		 */
+		define('__DEBUG_PROTECT_IP__', '127.0.0.1');
+	}
 
-    /**
-     * @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);
+    if(!defined('__DEBUG_DB_OUTPUT__'))
+	{
+		/**
+		 * DB error message definition
+		 *
+		 * <pre>
+		 * 0: No output
+		 * 1: files/_debug_db_query.php connected to the output
+		 * </pre>
+		 */
+		define('__DEBUG_DB_OUTPUT__', 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);
+    if(!defined('__LOG_SLOW_QUERY__'))
+	{
+		/**
+		 * Query log for only timeout query among DB queries
+		 *
+		 * <pre>
+		 * 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
+		 * </pre>
+		 */
+		define('__LOG_SLOW_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);
+    if(!defined('__DEBUG_QUERY__'))
+	{
+		/**
+		 * Leave DB query information
+		 *
+		 * <pre>
+		 * 0: Do not add information to the query
+		 * 1: Comment the XML Query ID
+		 * </pre>
+		 */
+		define('__DEBUG_QUERY__', 0);
+	}
 
-    /**
-     * @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);
+    if(!defined('__OB_GZHANDLER_ENABLE__'))
+	{
+		/**
+		 * option to enable/disable a compression feature using ob_gzhandler
+		 *
+		 * <pre>
+		 * 0: Not used
+		 * 1: Enabled
+		 * Only particular servers may have a problem in IE browser when sending a compression
+		 * </pre>
+		 */
+		define('__OB_GZHANDLER_ENABLE__', 1);
+	}
 
-    /**
-     * @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);
+    if(!defined('__ENABLE_PHPUNIT_TEST__'))
+	{
+		/**
+		 * decide to use/not use the php unit test (Path/tests/index.php)
+		 *
+		 * <pre>
+		 * 0: Not used
+		 * 1: Enabled
+		 * </pre>
+		 */
+		define('__ENABLE_PHPUNIT_TEST__', 0);
+	}
 
-	/**
-	 * @brief CDN prefix
-	 **/
-	if(!defined('__XE_CDN_PREFIX__')) define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/');
+    if(!defined('__PROXY_SERVER__'))
+	{
+		/**
+		 * __PROXY_SERVER__ has server information to request to the external through the target server
+		 * FileHandler:: getRemoteResource uses the constant
+		 */
+		define('__PROXY_SERVER__', null);
+	}
 
-	/**
-	 * @brief CDN version
-	 **/
-	if(!defined('__XE_CDN_VERSION__')) define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%');
+	if(!defined('__XE_CDN_PREFIX__'))
+	{
+		/**
+		 * CDN prefix
+		 */
+		define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/');
+	}
 
-    /**
-     * @brief Require specific files when using Firebug console output
-     **/
+	if(!defined('__XE_CDN_VERSION__'))
+	{
+		/**
+		 * CDN version
+		 */
+		define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%');
+	}
+
+    // 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
-	 **/
+	// 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 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.
-		 **/
+		// 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');
diff --git a/config/func.inc.php b/config/func.inc.php
index 89264df4a..d9c5b629c 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -1,15 +1,13 @@
 <?php
     /**
-     * @file   config/func.inc.php
+     * function library files for convenience
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief function library files for convenience
     **/
 
     if(!defined('__XE__') && !defined('__ZBXE__')) exit();
 
-    /**
-     * @brief define clone for php5
-     **/
+    // define clone for php5
     if (version_compare(phpversion(), '5.0') < 0) {
         eval('
             function clone($object) {
@@ -18,9 +16,7 @@
         ');
     }
 
-    /**
-     * @brief define an empty function to avoid errors when iconv function doesn't exist
-     **/
+    // 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) {
@@ -31,13 +27,22 @@
 
 	if ( !function_exists('htmlspecialchars_decode') )
 	{
+		/**
+		 * Decode html special characters
+		 *
+		 * @param string $text
+		 * @return string
+		 */
 		function htmlspecialchars_decode($text)
 		{
 			return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
 		}
 	}
 
-    // time zone
+    /**
+	 * Time zone
+	 * @var array
+	 */
     $time_zone = array(
         '-1200' => '[GMT -12:00] Baker Island Time',
         '-1100' => '[GMT -11:00] Niue Time, Samoa Standard Time',
@@ -66,9 +71,9 @@
         '+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',
+        '+0800' => '[GMT +08:00] China 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',
+        '+0900' => '[GMT +09:00] Korea Standard Time, Japan 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',
@@ -81,111 +86,125 @@
     ) ;
 
     /**
-     * @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
-     **/
+     * Define a function to use {@see ModuleHandler::getModuleObject()} ($module_name, $type)
+	 *
+     * @param string $module_name The module name to get a instance
+     * @param string $type disp, proc, controller, class
+     * @param string $kind admin, null
+     * @return mixed 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
-     **/
+     * Create a controller instance of the module
+	 *
+     * @param string $module_name The module name to get a controller instance
+     * @return mixed 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
+     * Create a admin controller instance of the module
+	 *
+     * @param string $module_name The module name to get a admin controller instance
+     * @return mixed 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
+     * Create a view instance of the module
+	 *
+     * @param string $module_name The module name to get a view instance
+     * @return mixed 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
+     * Create a mobile instance of the module
+	 *
+     * @param string $module_name The module name to get a mobile instance
+     * @return mixed Module mobile instance
      **/
     function &getMobile($module_name) {
         return getModule($module_name, 'mobile');
     }
 
     /**
-     * @brief module의 admin view 객체 생성용
-     * @param module_name 모듈이름
-     * @return module admin view instance
+     * Create a admin view instance of the module
+	 *
+     * @param string $module_name The module name to get a admin view instance
+     * @return mixed 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
+     * Create a model instance of the module
+	 *
+     * @param string $module_name The module name to get a model instance
+     * @return mixed 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
+     * Create an admin model instance of the module
+	 *
+     * @param string $module_name The module name to get a admin model instance
+     * @return mixed 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
+     * Create an api instance of the module
+	 *
+     * @param string $module_name The module name to get a api instance
+     * @return mixed 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
+     * Create a wap instance of the module
+	 *
+     * @param string $module_name The module name to get a wap instance
+     * @return mixed 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
+     * Create a class instance of the module
+	 *
+     * @param string $module_name The module name to get a class instance
+     * @return mixed 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
+     * The alias of DB::executeQuery()
+	 *
+	 * @see DB::executeQuery()
+     * @param string $query_id (module name.query XML file)
+     * @param object $args values of args object
+	 * @param string[] $arg_columns Column list
+     * @return object Query result data
      **/
     function executeQuery($query_id, $args = null, $arg_columns = null) {
         $oDB = &DB::getInstance();
@@ -193,10 +212,14 @@
     }
 
     /**
-     * @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 to handle the result of DB::executeQuery() as an array
+	 *
+	 * @see DB::executeQuery()
+	 * @see executeQuery()
+     * @param string $query_id (module name.query XML file)
+     * @param object $args values of args object
+	 * @param string[] $arg_columns Column list
+     * @return object Query result data
      **/
     function executeQueryArray($query_id, $args = null, $arg_columns = null) {
         $oDB = &DB::getInstance();
@@ -208,8 +231,10 @@
     }
 
     /**
-     * @brief DB:: alias of getNextSequence() 
-     * @return big int
+     * Alias of DB::getNextSequence()
+	 *
+	 * @see DB::getNextSequence()
+     * @return int
      **/
     function getNextSequence() {
         $oDB = &DB::getInstance();
@@ -217,14 +242,17 @@
     }
 
     /**
-     * @brief define a function to use Context::getUrl()
+     * Get a encoded url. Define a function to use Context::getUrl()
+	 *
+     * getUrl() returns the URL transformed from given arguments of RequestURI
+	 * <ol>
+     *  <li>argument format follows as (key, value).
+     * ex) getUrl('key1', 'val1', 'key2',''): transform key1 and key2 to val1 and '' respectively</li>
+     * <li>returns URL without the argument if no argument is given.</li>
+     * <li>URL made of args_list added to RequestUri if the first argument value is ''.</li>
+	 * </ol>
+	 *
      * @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();
@@ -236,6 +264,12 @@
 		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
     }
 
+	/**
+	 * Get a not encoded(html entity) url
+	 *
+	 * @see getUrl()
+	 * @return string
+	 */
     function getNotEncodedUrl() {
         $num_args = func_num_args();
         $args_list = func_get_args();
@@ -246,6 +280,12 @@
 		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
     }
 
+	/**
+	 * Get a encoded url. If url is encoded, not encode. Otherwise html encode the url.
+	 *
+	 * @see getUrl()
+	 * @return string
+	 */
     function getAutoEncodedUrl() {
         $num_args = func_num_args();
         $args_list = func_get_args();
@@ -255,9 +295,11 @@
 
 		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
     }
+
     /**
-     * @brief return the value adding request uri to getUrl()
-     * to get the full url
+     * Return the value adding request uri to getUrl() to get the full url
+	 *
+	 * @return string
      **/
     function getFullUrl() {
         $num_args = func_num_args();
@@ -273,6 +315,11 @@
         return $url;
     }
 
+    /**
+     * Return the value adding request uri to getUrl() to get the not encoded full url
+	 *
+	 * @return string
+     **/
     function getNotEncodedFullUrl() {
         $num_args = func_num_args();
         $args_list = func_get_args();
@@ -289,12 +336,10 @@
     }
 
     /**
-     * @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
+     * getSiteUrl() returns the URL by transforming the given argument value of domain
      * The first argument should consist of domain("http://" not included) and path
      * 
+     * @return string
      **/
     function getSiteUrl() {
         $num_args = func_num_args();
@@ -308,6 +353,12 @@
         return Context::getUrl($num_args, $args_list, $domain);
     }
 
+    /**
+     * getSiteUrl() returns the not encoded URL by transforming the given argument value of domain
+     * The first argument should consist of domain("http://" not included) and path
+     * 
+     * @return string
+     **/
     function getNotEncodedSiteUrl() {
         $num_args = func_num_args();
         $args_list = func_get_args();
@@ -321,8 +372,9 @@
     }
 
     /**
-     * @brief return the value adding request uri to the getSiteUrl()
-     * To get the full url
+     * Return the value adding request uri to the getSiteUrl() To get the full url
+     *
+	 * @return string
      **/
     function getFullSiteUrl() {
         $num_args = func_num_args();
@@ -343,17 +395,21 @@
     }
 
     /**
-     * @brief return if domain of the virtual site is url type or id type
+     * Return if domain of the virtual site is url type or id type
+	 *
+	 * @param string $domain
+	 * @return bool
      **/
     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
+     * Put a given tail after trimming string to the specified size
+	 *
+     * @param string $string The original string to trim
+     * @param int $cut_size The size to be
+     * @param string $tail Tail to put in the end of the string after trimming
      * @return string
      **/
 	function cut_str($string, $cut_size = 0, $tail = '...')
@@ -403,6 +459,11 @@
 		return $output;
 	}
 
+	/**
+	 * Get a time gap between server's timezone and XE's timezone
+	 *
+	 * @return int
+	 */
     function zgap() {
         $time_zone = $GLOBALS['_time_zone'];
         if($time_zone < 0) $to = -1; else $to = 1;
@@ -422,8 +483,9 @@
     }
 
     /**
-     * @brief YYYYMMDDHHIISS format changed to unix time value
-     * @param str: time value in format of YYYYMMDDHHIISS
+     * YYYYMMDDHHIISS format changed to unix time value
+	 *
+     * @param string $str Time value in format of YYYYMMDDHHIISS
      * @return int
      **/
     function ztime($str) {
@@ -444,7 +506,11 @@
     }
 
     /**
-     * @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.
+     * 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.
+	 *
+	 * @param string $date Time value in format of YYYYMMDDHHIISS
+	 * @param string $format If gap is within a day, returns this format.
+	 * @return string
      **/
     function getTimeGap($date, $format = 'Y.m.d') {
         $gap = time() + zgap() - ztime($date);
@@ -459,7 +525,11 @@
     }
 
     /**
-     * @brief Name of the month return
+     * Name of the month return
+	 *
+	 * @param int $month Month
+	 * @param boot $short If set, returns short string
+	 * @return string
      **/
     function getMonthName($month, $short = true) {
         $short_month = array('','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
@@ -468,10 +538,11 @@
     }
 
     /**
-     * @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
+     * Change the time format YYYYMMDDHHIISS to the user defined format
+	 *
+     * @param string|int $str YYYYMMDDHHIISS format time values
+     * @param string $format 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) {
@@ -537,6 +608,12 @@
         return $string;
     }
 
+	/**
+	 * Returns encoded value of given email address for email scraping
+	 *
+	 * @param string $email The email
+	 * @return string
+	 */
 	function getEncodeEmailAddress($email) {
 	    $return = '';
 		for ($i=0,$c=strlen($email);$i<$c;$i++) {
@@ -546,13 +623,15 @@
 	}
 
     /**
-     * @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
-     *
+     * Prints debug messages 
+	 *
      * 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
+	 *
+     * @param mixed $debug_output Target object to be printed
+     * @param bool $display_option boolean Flag whether to print seperator (default:true)
+	 * @param string $file Target file name
+     * @return void
      **/
     function debugPrint($debug_output = null, $display_option = true, $file = '_debug_message.php') {
         if(!(__DEBUG__ & 1)) return;
@@ -608,7 +687,8 @@
 
 
     /**
-     * @brief microtime() return
+     * microtime() return
+	 *
      * @return float
      **/
     function getMicroTime() {
@@ -617,9 +697,10 @@
     }
 
     /**
-     * @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
+     * Delete the second object vars from the first argument
+	 *
+     * @param object $target_obj An original object
+     * @param object $del_obj Object vars to delete from the original object
      * @return object
      **/
     function delObjectVars($target_obj, $del_obj) {
@@ -645,11 +726,13 @@
     }
 
     /**
-     * @brief change error_handing to debugPrint on php5 higher 
-     * @param errno
-     * @param errstr
-     * @return file
-     * @return line
+     * Change error_handing to debugPrint on php5 higher 
+	 *
+     * @param int $errno
+     * @param string $errstr
+     * @param string $file
+     * @param int $line
+	 * @return void
      **/
     function handleError($errno, $errstr, $file, $line) {
         if(!__DEBUG__) return;
@@ -663,9 +746,10 @@
     }
 
     /**
-     * @brief Trim a given number to a fiven size recursively
-     * @param no : a given number
-     * @param size : a given digits
+     * Trim a given number to a fiven size recursively
+	 *
+     * @param int $no A given number
+     * @param int $size A given digits
      **/
     function getNumberingPath($no, $size=3) {
         $mod = pow(10, $size);
@@ -675,14 +759,20 @@
     }
 
     /**
-     * @brief decode the URL in Korean
+     * Decode the URL in Korean
+	 *
+	 * @param string $str The url
+	 * @return string
      **/
     function url_decode($str) {
         return preg_replace('/%u([[:alnum:]]{4})/', '&#x\\1;',$str);
     }
 
     /**
-     * @brief Pre-block the codes which may be hacking attempts
+     * Pre-block the codes which may be hacking attempts
+	 *
+	 * @param string $content Taget content
+	 * @return string
      **/
     function removeHackTag($content) {
         // change the specific tags to the common texts
@@ -700,7 +790,10 @@
     }
 
     /**
-     * @brief xmp tag 확인 및 닫히지 않은 경우 추가
+     * Check xmp tag, close it.
+	 *
+	 * @param string $content Target content
+	 * @return string
      **/
 	function checkXmpTag($content) {
 		$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
@@ -713,6 +806,12 @@
 		return $content;
 	}
 
+	/**
+	 * Remove src hack(preg_replace_callback)
+	 *
+	 * @param array $match
+	 * @return string
+	 */
     function removeSrcHack($match) {
         $tag = strtolower($match[2]);
 
@@ -762,6 +861,12 @@
 
     // convert hexa value to RGB
     if(!function_exists('hexrgb')) {
+		/**
+		 * Convert hexa value to RGB
+		 *
+		 * @param string $hexstr
+		 * @return array
+		 */
         function hexrgb($hexstr) {
           $int = hexdec($hexstr);
 
@@ -772,9 +877,12 @@
     }
 
     /**
-     * @brief php function for mysql old_password()
+     * 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
+	 *
+	 * @param string $password
+	 * @return string
      **/
     function mysql_pre4_hash_password($password) {
         $nr = 1345345333;
@@ -800,7 +908,9 @@
     }
 
     /**
-     * return the requested script path
+     * Return the requested script path
+	 *
+	 * @return string
      **/
     function getScriptPath() {
         static $url = null;
@@ -809,7 +919,9 @@
     }
 
     /**
-     * return the requested script path
+     * Return the requested script path
+	 *
+	 * @return string
      **/
 	function getRequestUriByServerEnviroment()
 	{
@@ -817,9 +929,12 @@
 	}
 
     /**
-     * php unescape function of javascript's escape
+     * 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
+	 *
+	 * @param string $source
+	 * @return string
      **/
     function utf8RawUrlDecode ($source) {
         $decodedStr = '';
@@ -852,6 +967,12 @@
         return $decodedStr;
     }
 
+	/**
+	 * Returns utf-8 string of given code
+	 *
+	 * @param int $num
+	 * @return string
+	 */
     function _code2utf($num){
         if($num<128)return chr($num);
         if($num<2048)return chr(($num>>6)+192).chr(($num&63)+128);
@@ -860,7 +981,14 @@
         return '';
     }
 
-
+	/**
+	 * Get whether utf8 or not given string
+	 *
+	 * @param string $string
+	 * @param bool $return_convert If set, returns converted string
+	 * @param bool $urldecode
+	 * @return bool|string
+	 */
     function detectUTF8($string, $return_convert = false, $urldecode = true) {
         if($urldecode) $string = urldecode($string);
 
@@ -874,7 +1002,12 @@
         return $is_utf8;
     }
 
-
+	/**
+	 * get json encoded string of data
+	 *
+	 * @param mixed $data
+	 * @return string
+	 */
     function json_encode2($data) {
         switch (gettype($data)) {
             case 'boolean':
@@ -907,7 +1040,12 @@
         }
     }
 
-
+	/**
+	 * Get is current user crawler
+	 *
+	 * @param string $agent if set, use this value instead HTTP_USER_AGENT
+	 * @return bool
+	 */
     function isCrawler($agent = null) {
         if(!$agent) $agent = $_SERVER['HTTP_USER_AGENT'];
         $check_agent = array('bot', 'spider', 'google', 'yahoo', 'daum', 'teoma', 'fish', 'hanrss', 'facebook');
@@ -929,6 +1067,13 @@
         return false;
     }
 
+	/**
+	 * Remove embed media for admin
+	 *
+	 * @param string $content
+	 * @param int $writer_member_srl
+	 * @return void
+	 */
 	function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 	{
 		if(!Context::get('is_logged')) return;
@@ -955,6 +1100,11 @@
 		return;
 	}
 
+	/**
+	 * Require pear
+	 *
+	 * @return void
+	 */
 	function requirePear()
 	{
 		if(version_compare(PHP_VERSION, "5.3.0") < 0)
@@ -968,6 +1118,11 @@
 		}
 	}
 
+	/**
+	 * Print raw html header
+	 *
+	 * @return void
+	 */
 	function htmlHeader()
 	{
 		echo <<<HTMLHEADER
@@ -980,22 +1135,44 @@
 HTMLHEADER;
 	}
 
+	/**
+	 * Print raw html footer
+	 *
+	 * @return void
+	 */
 	function htmlFooter()
 	{
 		echo '</body></html>';
 	}
 
+	/**
+	 * Print raw alert message script
+	 *
+	 * @param string $msg
+	 * @return void
+	 */
 	function alertScript($msg)
 	{
 		if(!$msg) return;
 		echo '<script type="text/javascript">alert("'.$msg.'");</script>';
 	}
 
+	/**
+	 * Print raw close window script
+	 *
+	 * @return void
+	 */
 	function closePopupScript()
 	{
 		echo '<script type="text/javascript">window.close();</script>';
 	}
 
+	/**
+	 * Print raw reload script
+	 *
+	 * @param bool $isOpener
+	 * @return void
+	 */
 	function reload($isOpener = false)
 	{
 		$reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()';
diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css
index f02ffb225..e3794dfd3 100644
--- a/layouts/xe_official/css/default.css
+++ b/layouts/xe_official/css/default.css
@@ -3,7 +3,7 @@
 /* Default Skin - Start */
 .selectLang{margin:0;padding:0}
 /* Site Layout - Body Wrap */
-body{background:#fff url(../images/default/bgBody.gif) repeat-x left top;font-family:Tahoma, Geneva, sans-serif}
+html{background:#fff url(../images/default/bgBody.gif) repeat-x left top;font-family:Tahoma, Geneva, sans-serif}
 .xe{width:960px;margin:1.5em auto 0 auto}
 /* Site Layout - Header */
 .header{position:relative;width:960px;height:120px;background:url(../images/default/bgHeader.jpg) no-repeat right top;margin-bottom:10px;z-index:2}
diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 2ac45a4dd..8b89b030a 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -1,22 +1,24 @@
 <?php
-    /**
-     * @class  addonAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin controller class of addon modules
-     **/
-
     require_once(_XE_PATH_.'modules/addon/addon.controller.php');
 
+    /**
+     * Admin controller class of addon modules
+     * @author NHN (developers@xpressengine.com)
+     **/
     class addonAdminController extends addonController {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
 		/**
-		 * @brief Set addon activate
+		 * Set addon activate
+		 *
+		 * @return Object
 		 **/
 		function procAddonAdminSaveActivate()
 		{
@@ -109,7 +111,9 @@
 		}
 
         /**
-         * @brief Add active/inactive change
+         * Add active/inactive change
+		 *
+		 * @return Object
          **/
         function procAddonAdminToggleActivate() {
 			$oAddonModel = &getAdminModel('addon');
@@ -130,7 +134,9 @@
         }
 
         /**
-         * @brief Add the configuration information input
+         * Add the configuration information input
+		 *
+		 * @return Object
          **/
         function procAddonAdminSetupAddon() {
             $args = Context::getRequestVars();
@@ -150,14 +156,19 @@
             $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));
+			$this->setRedirectUrl(getNotEncodedUrl('', 'module', $module, 'act', 'dispAddonAdminSetup', 'selected_addon', $addon_name), $output);
         }
 
 
 
         /**
-         * @brief Add-on
-         * Adds Add to DB
+         * Adds addon to DB
+		 *
+		 * @param string $addon Addon name
+		 * @param int $site_srl Site srl
+		 * @param string $gtype site or global
+		 * @param string $isUsed Whether to use
+		 * @return Object
          **/
         function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N') {
             $args->addon = $addon;
@@ -168,8 +179,13 @@
         }
 
         /**
-         * @brief Add-activated
-         * addons add-ons to the table on the activation state sikyeojum
+         * Activate addon
+		 *
+         * @param string $addon Addon name
+		 * @param int $site_srl Site srl
+		 * @param string $type pc or modile
+		 * @param string $gtype site or global
+		 * @return Object
          **/
         function doActivate($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
             $args->addon = $addon;
@@ -181,9 +197,12 @@
         }
 
         /**
-         * @brief Disable Add-ons
+         * Deactivate Addon
          *
-         * addons add a table to remove the name of the deactivation is sikige
+		 * @param string $addon Addon name
+		 * @param int $site_srl Site srl
+		 * @param string $type pc or mobile
+		 * @param string $gtype site or global
          **/
         function doDeactivate($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
             $args->addon = $addon;
diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index 3d20773d6..c6263f1a5 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -1,20 +1,23 @@
 <?php
     /**
-     * @class  addonAdminModel
+     * Admin model class of addon module
      * @author NHN (developers@xpressengine.com)
-     * @brief admin model class of addon modules
      **/
-
     class addonAdminModel extends addon {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Wanted to add the path to
+         * Returns a path of addon
+		 *
+		 * @param string $addon_name Name to get path
+		 * @return string Returns a path
          **/
         function getAddonPath($addon_name) {
             $class_path = sprintf('./addons/%s/', $addon_name);
@@ -23,7 +26,9 @@
         }
 
 		/**
-		 * @brief Get addon list for super admin
+		 * Get addon list for super admin
+		 *
+		 * @return Object
 		 **/
 		function getAddonListForSuperAdmin()
 		{
@@ -51,7 +56,11 @@
 		}
 
         /**
-         * @brief Wanted to add the kind of information and
+         * Returns addon list
+		 *
+		 * @param int $site_srl Site srl
+		 * @param string $gtype site or global
+		 * @return array Returns addon list
          **/
         function getAddonList($site_srl = 0, $gtype = 'site') {
             // Wanted to add a list of activated
@@ -96,7 +105,12 @@
         }
 
         /**
-         * @brief Modules conf/info.xml wanted to read the information
+         * Returns a information of addon
+		 *
+		 * @param string $addon Name to get information
+		 * @param int $site_srl Site srl
+		 * @param string $gtype site or global
+		 * @return object Returns a information
          **/
         function getAddonInfoXml($addon, $site_srl = 0, $gtype = 'site') {
             // Get a path of the requested module. Return if not exists.
@@ -260,12 +274,11 @@
 
                         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->type = $val->type->body ? $val->type->body : 'text';
                             $obj->description = $val->description->body;
                             $obj->value = $extra_vals->{$obj->name};
                             if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
@@ -294,7 +307,11 @@
         }
 
         /**
-         * @brief Add to the list of active guhaeom
+         * Returns activated addon list
+		 *
+		 * @param int $site_srl Site srl
+		 * @param string $gtype site or global
+		 * @return array Returns list
          **/
         function getInsertedAddons($site_srl = 0, $gtype = 'site') {
             $args->list_order = 'addon';
@@ -315,7 +332,13 @@
         }
 
         /**
-         * @brief Add-on is enabled, check whether
+         * Returns whether to activate
+		 *
+		 * @param string $addon Name to check
+		 * @param int $site_srl Site srl
+		 * @param string $type pc or mobile
+		 * @param string $gtype site or global
+		 * @return bool If addon is activated returns true. Otherwise returns false.
          **/
         function isActivatedAddon($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
             $args->addon = $addon;
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index 1dc31eaa7..3513925e0 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -1,21 +1,23 @@
 <?php
     /**
-     * @class  addonAdminView
+     * Admin view class of addon modules
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of addon modules
      **/
-
     class addonAdminView extends addon {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
             $this->setTemplatePath($this->module_path.'tpl');
         }
 
         /**
-         * @brief Add Management main page (showing the list)
+         * Add Management main page (showing the list)
+		 *
+		 * @return Object
          **/
         function dispAddonAdminIndex() {
 			$oAdminModel = &getAdminModel('admin');
@@ -39,7 +41,9 @@
         }
 
         /**
-         * @biref Setting out the details pop-up add-on
+         * Display setup page
+		 *
+		 * @return Object
          **/
         function dispAddonAdminSetup() {
             $site_module_info = Context::get('site_module_info');
@@ -86,7 +90,9 @@
         }
 
         /**
-         * @brief Add details (conf/info.xml) a pop-out
+         * Display information
+		 *
+		 * @return Object
          **/
         function dispAddonAdminInfo() {
             $site_module_info = Context::get('site_module_info');
diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 3e95b9bb7..95dfff327 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -1,14 +1,14 @@
 <?php
     /**
-     * @class  addon
+     * High class of addon modules
      * @author NHN (developers@xpressengine.com)
-     * @brief high class of addon modules
      **/
-
     class addon extends ModuleObject {
 
         /**
-         * @brief Implement if additional tasks are necessary when installing
+         * Implement if additional tasks are necessary when installing
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
             // Register to add a few
@@ -28,7 +28,9 @@
         }
 
         /**
-         * @brief a method to check if successfully installed
+         * A method to check if successfully installed
+		 *
+		 * @return bool
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
@@ -42,7 +44,9 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             $oDB = &DB::getInstance();
@@ -78,7 +82,9 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @return Object
          **/
         function recompileCache() {
         }
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index c5af9828f..f7d74d7b5 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -1,21 +1,23 @@
 <?php
     /**
-     * @class  addonController
+     * Addon module's controller class
      * @author NHN (developers@xpressengine.com)
-     * @brief addon module's controller class
      **/
-
-
     class addonController extends addon {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Main/Virtual-specific add-on file, the location of the cache Wanted
+         * Returns a cache file path
+		 *
+		 * @param $type pc or mobile
+		 * @return string Returns a path
          **/
         function getCacheFilePath($type = "pc") {
 			static $addon_file;
@@ -38,7 +40,11 @@
 
 
         /**
-         * @brief Add-on mid settings
+         * Returns mid list that addons is run
+		 *
+		 * @param string $selected_addon Name to get list
+		 * @param int $site_srl Site srl
+		 * @return string[] Returns list that contain mid
          **/
         function _getMidList($selected_addon, $site_srl = 0) {
 
@@ -50,7 +56,12 @@
 
 
         /**
-         * @brief Add-on mid settings
+         * Adds mid into running mid list
+		 *
+		 * @param string $selected_addon Addon name to add mid
+		 * @param string $mid Module id to add
+		 * @param int $site_srl Site srl
+		 * @return void
          **/
         function _setAddMid($selected_addon,$mid, $site_srl=0) {
             // Wanted to add the requested information
@@ -63,7 +74,12 @@
 
 
         /**
-         * @brief Add-on mid settings
+         * Deletes mid from running mid list
+		 *
+		 * @param string $selected_addon Addon name to delete mid
+		 * @param string $mid Module id to delete
+		 * @param int $site_srl Site srl
+		 * @return void
          **/
         function _setDelMid($selected_addon,$mid,$site_srl=0) {
             // Wanted to add the requested information
@@ -83,7 +99,12 @@
         }
 
         /**
-         * @brief Add-on mid settings
+         * Set running mid list
+		 *
+		 * @param string $selected_addon Addon name to set
+		 * @param string[] $mid_list List to set
+		 * @param int $site_srl Site srl
+		 * @return void
          **/
         function _setMid($selected_addon,$mid_list,$site_srl=0) {
             $args->mid_list =  join('|@|',$mid_list);
@@ -93,7 +114,9 @@
 
 
         /**
-         * @brief Add mid-on
+		 * Adds mid into running mid list
+		 *
+		 * @return Object
          **/
         function procAddonSetupAddonAddMid() {
             $site_module_info = Context::get('site_module_info');
@@ -105,7 +128,9 @@
         }
 
         /**
-         * @brief Add mid Delete
+         * Deletes mid from running mid list
+		 *
+		 * @return Object
          **/
         function procAddonSetupAddonDelMid() {
             $site_module_info = Context::get('site_module_info');
@@ -118,7 +143,12 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @param int $site_srl Site srl
+		 * @param string $type pc or mobile
+		 * @param string $gtype site or global
+		 * @return void
          **/
         function makeCacheFile($site_srl = 0, $type = "pc", $gtype = 'site') {
             // Add-on module for use in creating the cache file
@@ -155,7 +185,13 @@
         }
 
         /**
-         * @brief Add-On Set
+         * Save setup
+		 *
+		 * @param string $addon Addon name
+		 * @param object $extra_vars Extra variables
+		 * @param int $site_srl Site srl
+		 * @param string $gtype site or global
+		 * @return Object
          **/
         function doSetup($addon, $extra_vars,$site_srl=0, $gtype = 'site') {
             if(!is_array($extra_vars->mid_list))	unset($extra_vars->mid_list);
@@ -168,7 +204,10 @@
         }
 
         /**
-         * @brief Remove add-on information in the virtual site
+         * Remove add-on information in the virtual site
+		 *
+		 * @param int $site_srl Site srl
+		 * @return void
          **/
         function removeAddonConfig($site_srl) {
             $addon_path = _XE_PATH_.'files/cache/addons/';
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index df1db1bbd..0e15ae57b 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -9,6 +9,7 @@
 		</block>
 	</li>
 	<li cond="$addon_info->homepage">{$lang->homepage}: <a href="{$addon_info->homepage}" target="_blank">{$addon_info->homepage}</a></li>
+	<li cond="$addon_info->license">{$lang->addon_license}: <a href="{$addon_info->license_link}"|cond="$addon_info->license_link" target="_blank">{$addon_info->license}</a></li>
 </ul>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index a61d409a9..55bc061da 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -1,15 +1,16 @@
 <?php
-    /**
-     * @class  adminAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin controller class of admin module
-     **/
-
+	/**
+	 * adminAdminController class
+	 * admin controller class of admin module
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/admin
+	 * @version 0.1
+	 */
     class adminAdminController extends admin {
-        /**
-         * @brief initialization
-         * @return none
-         **/
+		/**
+		 * initialization
+		 * @return void
+		 */
         function init() {
             // forbit access if the user is not an administrator
             $oMemberModel = &getModel('member');
@@ -17,6 +18,10 @@
             if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
         }
 
+		/**
+		 * Admin menu reset
+		 * @return void
+		 */
 		function procAdminMenuReset(){
 			$menuSrl = Context::get('menu_srl');
 			if (!$menuSrl) return $this->stop('msg_invalid_request');
@@ -30,10 +35,10 @@
 			$this->setRedirectUrl(Context::get('error_return_url'));
 		}
 
-        /**
-         * @brief Regenerate all cache files
-         * @return none
-         **/
+		/**
+		 * Regenerate all cache files
+		 * @return void
+		 */
         function procAdminRecompileCacheFile() {
 			// rename cache dir
 			$temp_cache_dir = './files/cache_'. time();
@@ -92,10 +97,10 @@
             $this->setMessage('success_updated');
         }
 
-        /**
-         * @brief Logout
-         * @return none
-         **/
+		/**
+		 * Logout
+		 * @return void
+		 */
         function procAdminLogout() {
             $oMemberController = &getController('member');
             $oMemberController->procMemberLogout();
@@ -103,6 +108,10 @@
 			header('Location: '.getNotEncodedUrl('', 'module','admin'));
         }
 
+		/**
+		 * Insert theme information
+		 * @return void|object
+		 */
 		function procAdminInsertThemeInfo(){
 			$vars = Context::getRequestVars();
 			$theme_file = _XE_PATH_.'files/theme/theme_info.php';
@@ -160,17 +169,14 @@
             // 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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminTheme');
+			return $this->setRedirectUrl($returnUrl, $output);
 		}
 
 		/**
-		 * @brief Toggle favorite
-		 **/
+		 * Toggle favorite
+		 * @return void
+		 */
 		function procAdminToggleFavorite()
 		{
 			$siteSrl = Context::get('site_srl');
@@ -199,12 +205,14 @@
 			if (!$output->toBool()) return $output;
 
 			$this->add('result', $result);
-			$this->setRedirectUrl(Context::get('error_return_url'));
+
+			return $this->setRedirectUrl(Context::get('error_return_url'), $output);
 		}
 
 		/**
-		 * @brief enviroment gathering agreement
-		 **/
+		 * Enviroment gathering agreement
+		 * @return void
+		 */
 		function procAdminEnviromentGatheringAgreement()
 		{
 			$isAgree = Context::get('is_agree');
@@ -216,8 +224,9 @@
 		}
 
 		/**
-		 * @brief admin config update
-		 **/
+		 * Admin config update
+		 * @return void
+		 */
 		function procAdminUpdateConfig()
 		{
 			$adminTitle = Context::get('adminTitle');
@@ -252,16 +261,15 @@
 			}
 
 			$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;
-            }
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+			$this->setRedirectUrl($returnUrl);
 		}
 
 		/**
-		 * @brief admin logo delete
-		 **/
+		 * Admin logo delete
+		 * @return void
+		 */
 		function procAdminDeleteLogo()
 		{
             $oModuleModel = &getModel('module');
@@ -274,16 +282,15 @@
 			$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;
-            }
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+			$this->setRedirectUrl($returnUrl);
 		}
 
 		/**
-		 * @brief Insert favorite
-		 **/
+		 * Insert favorite
+		 * @return object query result
+		 */
 		function _insertFavorite($siteSrl, $module, $type = 'module')
 		{
 			$args->adminFavoriteSrl = getNextSequence();
@@ -295,8 +302,9 @@
 		}
 
 		/**
-		 * @brief Delete favorite
-		 **/
+		 * Delete favorite
+		 * @return object query result
+		 */
 		function _deleteFavorite($favoriteSrl)
 		{
 			$args->admin_favorite_srl = $favoriteSrl;
@@ -305,8 +313,9 @@
 		}
 
 		/**
-		 * @brief Delete favorite
-		 **/
+		 * Delete all favorite
+		 * @return object query result
+		 */
 		function _deleteAllFavorite()
 		{
 			$args = null;
@@ -314,6 +323,10 @@
 			return $output;
 		}
 
+		/**
+		 * Remove admin icon
+		 * @return object|void
+		 */
 		function procAdminRemoveIcons(){
 			$iconname = Context::get('iconname');
 			$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index cc1234e7d..f1b5e3eea 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -1,10 +1,28 @@
 <?php
-
+	/**
+	 * adminAdminModel class
+	 * admin model class of admin module
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/admin
+	 * @version 0.1
+	 */
     class adminAdminModel extends admin
     {
+		/**
+		 * Ftp root path
+		 * @var string
+		 */
         var $pwd;
+		/**
+		 * Buffer for Admin GNB menu
+		 * @var string
+		 */
 		var $gnbLangBuffer;
 
+		/**
+		 * Add file list to Object after sftp connect
+		 * @return void|Object
+		 */
         function getSFTPList()
         {
             $ftp_info =  Context::getRequestVars();
@@ -38,6 +56,10 @@
             $this->add('list', $list);
         }
 
+		/**
+		 * Add file list to Object after ftp connect
+		 * @return void|Object
+		 */
         function getAdminFTPList()
         {
 			Context::loadLang('./modules/autoinstall/lang');
@@ -98,6 +120,11 @@
             $this->add('list', $list);
         }
 
+		/**
+		 * Parameter arrange for send to XE collect server
+		 * @param string $type 'WORKING', 'INSTALL'
+		 * @return string
+		 */
 		function getEnv($type='WORKING') {
 
 			 $skip = array(
@@ -156,6 +183,10 @@
 			return $param;
 		}
 
+		/**
+		 * Return theme info list by theme directory list
+		 * @return array
+		 */
 		function getThemeList(){
 			$path = _XE_PATH_.'themes';
 			$list = FileHandler::readDir($path);
@@ -170,6 +201,12 @@
 			return $theme_info;
 		}
 
+		/**
+		 * Return theme info
+		 * @param string $theme_name
+		 * @param array $layout_list
+		 * @return object
+		 */
 		function getThemeInfo($theme_name, $layout_list = null){
 			if ($GLOBALS['__ThemeInfo__'][$theme_name]) return $GLOBALS['__ThemeInfo__'][$theme_name];
 
@@ -294,6 +331,10 @@
 			return $theme_info;
 		}
 
+		/**
+		 * Return theme module skin list
+		 * @return array
+		 */
 		function getModulesSkinList(){
 			if ($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__']) return $GLOBALS['__ThemeModuleSkin__'];
             $searched_list = FileHandler::readDir('./modules');
@@ -323,6 +364,10 @@
 			return $GLOBALS['__ThemeModuleSkin__'];
 		}
 
+		/**
+		 * Return admin menu language
+		 * @return array
+		 */
 		function getAdminMenuLang()
 		{
 			$currentLang = Context::getLangType();
@@ -356,8 +401,11 @@
 		}
 
 		/**
-		 * @brief Get admin favorite list
-		 **/
+		 * Get admin favorite list
+		 * @param int $siteSrl if default site, siteSrl is zero
+		 * @param bool $isGetModuleInfo
+		 * @return object
+		 */
 		function getFavoriteList($siteSrl = 0, $isGetModuleInfo = false)
 		{
 			$args->site_srl = $siteSrl;
@@ -382,8 +430,11 @@
 		}
 
 		/**
-		 * @brief Check available insert favorite
-		 **/
+		 * Check available insert favorite
+		 * @param int $siteSrl if default site, siteSrl is zero
+		 * @param string $module
+		 * @return object
+		 */
 		function isExistsFavorite($siteSrl, $module)
 		{
 			$args->site_srl = $siteSrl;
@@ -406,8 +457,9 @@
 		}
 
         /**
-         * @brief Return site list
-         **/
+         * Return site list
+		 * @return void
+         */
 		function getSiteAllList()
 		{
 			if(Context::get('domain')) $args->domain = Context::get('domain');
@@ -421,8 +473,10 @@
 		}
 
         /**
-         * @brief Return site count
-         **/
+         * Return site count
+		 * @param string $date
+		 * @return int
+         */
 		function getSiteCountByDate($date = '')
 		{
 			if($date) $args->regDate = date('Ymd', strtotime($date));
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index a0c3ad339..a004f8dfe 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -1,19 +1,28 @@
 <?php
-    /**
-     * @class  adminAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin view class of admin module
-     **/
-
+	/**
+	 * adminAdminView class
+	 * Admin view class of admin module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/admin
+	 * @version 0.1
+	 */
     class adminAdminView extends admin {
-
+		/**
+		 * layout list
+		 * @var array
+		 */
 		var $layout_list;
+		/**
+		 * easy install check file
+		 * @var array
+		 */
 		var $easyinstallCheckFile = './files/env/easyinstall_last';
 
         /**
-         * @brief Initilization
-         * @return none
-         **/
+         * Initilization
+         * @return void
+         */
         function init() {
             // forbit access if the user is not an administrator
             $oMemberModel = &getModel('member');
@@ -49,6 +58,10 @@
 			$this->checkEasyinstall();
         }
 
+		/**
+		 * check easy install
+		 * @return void
+		 */
 		function checkEasyinstall()
 		{
 			$lastTime = (int)FileHandler::readFile($this->easyinstallCheckFile);
@@ -78,12 +91,21 @@
 			$this->_markingCheckEasyinstall();
 		}
 
+		/**
+		 * update easy install file content
+		 * @return void
+		 */
 		function _markingCheckEasyinstall()
 		{
 			$currentTime = time();
 			FileHandler::writeFile($this->easyinstallCheckFile, $currentTime);
 		}
 
+		/**
+		 * Include admin menu php file and make menu url
+		 * Setting admin logo, newest news setting
+		 * @return void
+		 */
 		function makeGnbUrl($module = 'admin')
 		{
 			global $lang;
@@ -188,10 +210,10 @@
             Context::setBrowserTitle($browserTitle);
 		}
 
-        /**
-         * @brief Display Super Admin Dashboard
-         * @return none
-         **/
+		/**
+		 * Display Super Admin Dashboard
+		 * @return void
+		 */
         function dispAdminIndex() {
             // Get statistics
             $args->date = date("Ymd000000", time()-60*60*24);
@@ -293,10 +315,10 @@
             $this->setTemplateFile('index');
         }
 
-        /**
-         * @brief Display Configuration(settings) page
-         * @return none
-         **/
+		/**
+		 * Display Configuration(settings) page
+		 * @return void
+		 */
         function dispAdminConfigGeneral() {
 		    Context::loadLang('modules/install/lang');
 
@@ -340,10 +362,10 @@
 			$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
-         **/
+		/**
+		 * Display FTP Configuration(settings) page
+		 * @return void
+		 */
         function dispAdminConfigFtp() {
 		    Context::loadLang('modules/install/lang');
 
@@ -359,9 +381,9 @@
         }
 
 		/**
-         * @brief Display Admin Menu Configuration(settings) page
-         * @return none
-         **/
+		 * Display Admin Menu Configuration(settings) page
+		 * @return void
+		 */
 		function dispAdminSetup()
 		{
 			$oModuleModel = &getModel('module');
@@ -377,6 +399,10 @@
 		}
 
 
+		/**
+		 * Enviroment information send to XE collect server
+		 * @return void
+		 */
 		function showSendEnv() {
 			if(Context::getResponseMethod() != 'HTML') return;
 
@@ -411,6 +437,10 @@
 			}
 		}
 
+		/**
+		 * Display Admin theme Configuration(settings) page
+		 * @return void
+		 */
 		function dispAdminTheme(){
 			// choice theme file
 			$theme_file = _XE_PATH_.'files/theme/theme_info.php';
diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php
index a16d60b46..442ed2aaa 100644
--- a/modules/admin/admin.class.php
+++ b/modules/admin/admin.class.php
@@ -1,23 +1,25 @@
 <?php
-    /**
-     * @class  admin
-     * @author NHN (developers@xpressengine.com)
-     * @brief  base class of admin module
-     **/
-
+	/**
+	 * admin class
+	 * Base class of admin module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/admin
+	 * @version 0.1
+	 */
     class admin extends ModuleObject {
-
-        /**
-         * @brief install admin module
-         * @return new Object
-         **/
+		/**
+		 * Install admin module
+		 * @return Object
+		 */
         function moduleInstall() {
             return new Object();
         }
 
-        /**
-         * @brief if update is necessary it returns true
-         **/
+		/**
+		 * If update is necessary it returns true
+		 * @return bool
+		 */
         function checkUpdate() {
             $oDB = &DB::getInstance();
             if(!$oDB->isColumnExists("admin_favorite", "type")) return true;
@@ -25,10 +27,10 @@
             return false;
         }
 
-        /**
-         * @brief update module
-         * @return new Object
-         **/
+		/**
+		 * Update module
+		 * @return Object
+		 */
         function moduleUpdate() {
             $oDB = &DB::getInstance();
             if(!$oDB->isColumnExists("admin_favorite", "type"))
@@ -53,17 +55,17 @@
             return new Object();
         }
 
-        /**
-         * @brief regenerate cache file
-         * @return none
-         **/
+		/**
+		 * Regenerate cache file
+		 * @return void
+		 */
         function recompileCache() {
         }
 
-        /**
-         * @brief regenerate xe admin default menu
-         * @return none
-         **/
+		/**
+		 * Regenerate xe admin default menu
+		 * @return void
+		 */
 		function createXeAdminMenu()
 		{
 			//insert menu
@@ -238,6 +240,10 @@
 			$oMenuAdminConroller->makeXmlFile($menuSrl);
 		}
 
+		/**
+		 * Return parent menu key by child menu
+		 * @return string
+		 */
 		function _getGnbKey($menuName)
 		{
 			switch($menuName) {
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index cbf4de897..3a17c2197 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -5,54 +5,63 @@
 		<value xml:lang="en"><![CDATA[Primary]]></value>
 		<value xml:lang="jp"><![CDATA[基本]]></value>
 		<value xml:lang="zh-CN"><![CDATA[基本]]></value>
+		<value xml:lang="tr"><![CDATA[temel]]></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>
 		<value xml:lang="zh-CN"><![CDATA[高级]]></value>
+		<value xml:lang="tr"><![CDATA[ileri]]></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>
 		<value xml:lang="zh-CN"><![CDATA[其他]]></value>
+		<value xml:lang="tr"><![CDATA[diğer]]></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>
 		<value xml:lang="zh-CN"><![CDATA[当前]]></value>
+		<value xml:lang="tr"><![CDATA[durum]]></value>
 	</item>
 	<item name="latest_documents">
 		<value xml:lang="ko"><![CDATA[최근 글]]></value>
 		<value xml:lang="en"><![CDATA[Latest Documents]]></value>
 		<value xml:lang="jp"><![CDATA[最新記事]]></value>
 		<value xml:lang="zh-CN"><![CDATA[最新文档]]></value>
+		<value xml:lang="tr"><![CDATA[son Mesajlar]]></value>
 	</item>
 	<item name="latest_comments">
 		<value xml:lang="ko"><![CDATA[최근 댓글]]></value>
 		<value xml:lang="en"><![CDATA[Latest Comments]]></value>
 		<value xml:lang="jp"><![CDATA[最新のコメント]]></value>
 		<value xml:lang="zh-CN"><![CDATA[最新回复]]></value>
+		<value xml:lang="tr"><![CDATA[son Yorumlar]]></value>
 	</item>
 	<item name="latest_trackbacks">
 		<value xml:lang="ko"><![CDATA[최근 엮인글]]></value>
 		<value xml:lang="en"><![CDATA[Latest Trackbacks]]></value>
 		<value xml:lang="jp"><![CDATA[最新のトラックバック]]></value>
 		<value xml:lang="zh-CN"><![CDATA[最新引用]]></value>
+		<value xml:lang="tr"><![CDATA[Son Trackbacks]]></value>
 	</item>
 	<item name="notices">
 		<value xml:lang="ko"><![CDATA[공지]]></value>
 		<value xml:lang="en"><![CDATA[Notices]]></value>
 		<value xml:lang="jp"><![CDATA[お知らせ]]></value>
 		<value xml:lang="zh-CN"><![CDATA[通知]]></value>
+		<value xml:lang="tr"><![CDATA[Uyarılar]]></value>
 	</item>
 	<item name="favorites">
 		<value xml:lang="ko"><![CDATA[즐겨찾기]]></value>
 		<value xml:lang="en"><![CDATA[Favorites]]></value>
 		<value xml:lang="jp"><![CDATA[お気に入り]]></value>
 		<value xml:lang="zh-CN"><![CDATA[收藏]]></value>
+		<value xml:lang="tr"><![CDATA[Sık]]></value>
 	</item>
 	<item name="admin_info">
 		<value xml:lang="ko"><![CDATA[관리자 정보]]></value>
@@ -88,6 +97,7 @@
 		<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>
+		<value xml:lang="tr"><![CDATA[Kontrol Paneli]]></value>
 	</item>
 	<item name="start_module">
 		<value xml:lang="ko"><![CDATA[시작 모듈]]></value>
@@ -226,42 +236,49 @@
 			<value xml:lang="en"><![CDATA[Dashboard]]></value>
 			<value xml:lang="jp"><![CDATA[ダッシュボード]]></value>
 			<value xml:lang="zh-CN"><![CDATA[控制面板]]></value>
+			<value xml:lang="tr"><![CDATA[Kontrol Paneli]]></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="tr"><![CDATA[yer]]></value>
 		</item>
 		<item name="user">
 			<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="tr"><![CDATA[üye]]></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="tr"><![CDATA[içerik]]></value>
 		</item>
 		<item name="theme">
 			<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="tr"><![CDATA[tema]]></value>
 		</item>
 		<item name="extensions">
 			<value xml:lang="ko"><![CDATA[확장기능]]></value>
 			<value xml:lang="en"><![CDATA[Extensions]]></value>
 			<value xml:lang="jp"><![CDATA[拡張機能]]></value>
 			<value xml:lang="zh-CN"><![CDATA[扩展]]></value>
+			<value xml:lang="tr"><![CDATA[Eklentiler]]></value>
 		</item>
 		<item name="configuration">
 			<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="tr"><![CDATA[Ayarlar]]></value>
 		</item>
 	</item>
 	<item name="newest_news">
@@ -302,6 +319,7 @@
 		<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>
+		<value xml:lang="tr"><![CDATA[Varsayılan URL birden sitelerinde çalışan gereklidir. XE yükleme yolu da dahil olmak üzere URL girin. (Örneğin: http:// etki alanı / yükleme yolu)]]></value>
 	</item>
 	<item name="env_information">
 		<value xml:lang="ko"><![CDATA[환경 정보]]></value>
@@ -352,26 +370,16 @@
 		<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>
+		<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>
@@ -601,28 +609,33 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="en"><![CDATA[Select the supporting language(s).]]></value>
 		<value xml:lang="jp"><![CDATA[サポート言語を選択してください。]]></value>
 		<value xml:lang="zh-CN"><![CDATA[选择语言]]></value>
+		<value xml:lang="tr"><![CDATA[Dil ayarlarını destek olun.]]></value>
 	</item>
 	<item name="about_default_lang">
 		<value xml:lang="ko"><![CDATA[기본 언어를 선택하세요.]]></value>
 		<value xml:lang="en"><![CDATA[Select default language.]]></value>
 		<value xml:lang="zh-CN"><![CDATA[默认语言]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan dili seçin.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[清空cache缓存?]]></value>
+		<value xml:lang="tr"><![CDATA[Eksik ya da önbellek dosyaları silmek istediğinizden emin yanlış eskimiş?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[此过程可能需要耗费一段时间，是否继续?]]></value>
+		<value xml:lang="tr"><![CDATA[Bu uzun zaman alabilir. Eğer çalıştırmak istiyor musunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[是否使用SSL安全连接?]]></value>
+		<value xml:lang="tr"><![CDATA[SSL(Secure Sockets Layer) kullanmak istiyorsunuz?]]></value>
 	</item>
 	<item name="ssl_options" type="array">
 		<item name="none">
@@ -722,6 +735,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></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="tr"><![CDATA[Qmail etkinleştirin]]></value>
 	</item>
 	<item name="sftp">
 		<value xml:lang="ko"><![CDATA[SFTP 사용]]></value>
@@ -765,16 +779,19 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="en"><![CDATA[Use FTP Passive Mode?]]></value>
 		<value xml:lang="jp"><![CDATA[Passiveモードを使用しますか?]]></value>
 		<value xml:lang="zh-CN"><![CDATA[使用FTP被动模式?]]></value>
+		<value xml:lang="tr"><![CDATA[Pasif mod FTP kullanarak?]]></value>
 	</item>
 	<item name="about_use_sftp_support">
 		<value xml:lang="ko"><![CDATA[SFTP 를 사용하시겠습니까?]]></value>
 		<value xml:lang="en"><![CDATA[Use SFTP?]]></value>
 		<value xml:lang="zh-CN"><![CDATA[使用SFTP?]]></value>
+		<value xml:lang="tr"><![CDATA[SFTP kullan?]]></value>
 	</item>	
 	<item name="disable_sftp_support">
 		<value xml:lang="ko"><![CDATA[SFTP를 사용할 수 있는 환경이 아닙니다.]]></value>
 		<value xml:lang="en"><![CDATA[Does Not Use SFTP]]></value>
 		<value xml:lang="zh-CN"><![CDATA[关闭SFTP]]></value>
+		<value xml:lang="tr"><![CDATA[SFTP kullanmak için bir ortam değildir.]]></value>
 	</item>	
 	<item name="msg_self_restart_cache_engine">
 		<value xml:lang="ko"><![CDATA[Memcached 또는 캐쉬데몬을 재시작 해주세요.]]></value>
@@ -827,364 +844,418 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="en"><![CDATA[Report]]></value>
 		<value xml:lang="jp"><![CDATA[通報]]></value>
 		<value xml:lang="zh-CN"><![CDATA[报告]]></value>
+		<value xml:lang="tr"><![CDATA[Raporla]]></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="tr"><![CDATA[durum]]></value>
 	</item>
 	<item name="action">
 		<value xml:lang="ko"><![CDATA[실행]]></value>
 		<value xml:lang="en"><![CDATA[Execute]]></value>
 		<value xml:lang="jp"><![CDATA[実行]]></value>
 		<value xml:lang="zh-CN"><![CDATA[执行]]></value>
+		<value xml:lang="tr"><![CDATA[Yürütme]]></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>
 		<value xml:lang="zh-CN"><![CDATA[选择Module ID]]></value>
+		<value xml:lang="tr"><![CDATA[Modül ID seçin.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[开启CDN]]></value>
+		<value xml:lang="tr"><![CDATA[CDN kullanma]]></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>
 		<value xml:lang="zh-CN"><![CDATA[是否开启伪静态?]]></value>
+		<value xml:lang="tr"><![CDATA[Kısa bir adresi kullanmak istiyor musunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[设置本地时间.]]></value>
+		<value xml:lang="tr"><![CDATA[Yerel Zaman ayarlayın.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[设置HTML DTD标签头.]]></value>
+		<value xml:lang="tr"><![CDATA[HTML DTD ayarlayın.]]></value>
 	</item>
 	<item name="html5">
 		<value xml:lang="ko"><![CDATA[HTML5]]></value>
 		<value xml:lang="en"><![CDATA[HTML5]]></value>
 		<value xml:lang="zh-CN"><![CDATA[HTML5]]></value>
+		<value xml:lang="tr"><![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>
 		<value xml:lang="zh-CN"><![CDATA[XHTML 1.0 Transitional]]></value>
+		<value xml:lang="tr"><![CDATA[XHTML 1.0 Transitional]]></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>
 		<value xml:lang="zh-CN"><![CDATA[当用户使用移动终端访问页面的时候是否使用移动版?]]></value>
+		<value xml:lang="tr"><![CDATA[Bir mobil cihazda mobil sayfa bağlarken göstermek istiyorsunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[选择缩略图生成方式]]></value>
+		<value xml:lang="tr"><![CDATA[Bir küçük resim oluşturma yöntemleri seçiniz.]]></value>
 	</item>
 	<item name="input_footer_script">
 		<value xml:lang="ko"><![CDATA[하단(footer) 스크립트 삽입]]></value>
 		<value xml:lang="en"><![CDATA[Input footer script]]></value>
 		<value xml:lang="zh-CN"><![CDATA[输入页脚脚本]]></value>
+		<value xml:lang="tr"><![CDATA[Alt (footer) Script Enjeksiyon]]></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>
-		<value xml:lang="zh-CN"><![CDATA[该脚本将被插入到页面的底部.<br />页面管理将无效.]]></value>
+		<value xml:lang="ko"><![CDATA[최하단에 코드를 삽입합니다. 관리자 페이지에서는 수행되지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The script is inserted into the bottom of body. Manager page does not work.]]></value>
+		<value xml:lang="zh-CN"><![CDATA[该脚本将被插入到页面的底部. 页面管理将无效.]]></value>
+		<value xml:lang="tr"><![CDATA[Kodu eklemek Alt. Yönetici sayfa çalışmıyor.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[裁剪]]></value>
+		<value xml:lang="tr"><![CDATA[Crop (kırpma)]]></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>
 		<value xml:lang="zh-CN"><![CDATA[缩放]]></value>
+		<value xml:lang="tr"><![CDATA[Ratio(yüzde maç)]]></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>
 		<value xml:lang="zh-CN"><![CDATA[后台IP绑定]]></value>
+		<value xml:lang="tr"><![CDATA[Yöneticiler IP aralığını belirlemek için bir sayfa erişebilirsiniz.]]></value>
 	</item>
 	<item name="local_ip_address">
 		<value xml:lang="ko"><![CDATA[로컬 IP 주소]]></value>
 		<value xml:lang="en"><![CDATA[Local IP address]]></value>
 		<value xml:lang="zh-CN"><![CDATA[本地IP地址]]></value>	
+		<value xml:lang="tr"><![CDATA[Yerel IP adresi]]></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>
-		<value xml:lang="zh-CN"><![CDATA[请注意，只有绑定的IP才能访问后台。<br />IP信息将保存在 /files/config/db.config.php.<br />每行一个IP。]]></value>
+		<value xml:lang="ko"><![CDATA[해당 IP에 대해서만 관리자 페이지로 접근이 가능하므로 주의해주시기 바랍니다. IP대역 정보는 /files/config/db.config.php 파일에 저장됩니다. 여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please note that only the specified IP addresses can access the admin page. The information on IP address band is stored in  /files/config/db.config.php. Change the line to multiple IP.]]></value>
+	　　<value xml:lang="jp"><![CDATA[該当IPについてのみ管理者ページへアクセスできるため、注意してください。IP帯域情報は、/files/config/db.config.php ファイルに保存されます。Change the line to multiple IP.]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请注意，只有绑定的IP才能访问后台。IP信息将保存在 /files/config/db.config.php. 每行一个IP。]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece bu IP olası yönetici sayfasına erişmek için, bu yüzden açıklama lütfen. IP-bant bilgiler /files/config/db.config.php dosyasında saklanır. Satırı birden fazla öğe girin.]]></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>
-		<value xml:lang="zh-CN"><![CDATA[当设定FTP信息来启用快捷安装。<br />FTP的信息保存在 /files/config/ftp.config.php.<br />如果不启用快捷安装，请务必将开启PHP安全模式]]></value>
+		<value xml:lang="ko"><![CDATA[FTP 정보를 입력하면 쉬운 설치를 가능하도록 합니다. FTP정보는 files/config/ftp.config.php 파일에 저장됩니다. 쉬운 설치가 불가능한 경우 PHP의 safe_mode를 On으로 변경해야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[When you enter FTP information to enable easy installation.	The information on FTP is stored in files/config/ftp.config.php. If you are unable to easy install, PHP's 'safe_mode' must be changed 'On']]></value>
+		<value xml:lang="zh-CN"><![CDATA[当设定FTP信息来启用快捷安装。FTP的信息保存在 /files/config/ftp.config.php. 如果不启用快捷安装，请务必将开启PHP安全模式]]></value>
+		<value xml:lang="tr"><![CDATA[Kolay kurulum sağlayan FTP bilgilerini girdiğinizde. FTP bilgi, dosya / config / ftp.config.php dosyasında saklanır. Yüklemek mümkün ve PHP'nin safe_mode On kolay değilse değiştirilmesi gerekir.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[是否启用自定义favicon?]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer favicon kullanmak istiyor musunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[请上传16*16像素的<em>*.ico</em>文件.]]></value>
+		<value xml:lang="tr"><![CDATA[16 x 16 boyutunda <em>*.Ico</em> dosyalar yüklenebilir.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[是否启用移动版屏幕图标?]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer Mobil Ana ekran simgesine kullanmak istiyorsunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[请上传57*57像素或者114*114像素的<em>*.png</em>文件.]]></value>
+		<value xml:lang="tr"><![CDATA[57 x 57 veya 114 x 114 boyutu <em>*.Png</em> dosyalar yüklenebilir.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[是否启用通行证（SSO）?]]></value>
+		<value xml:lang="tr"><![CDATA[SSO(Single Sign On) kullanmak ister misiniz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[确认从CDN上获取XE core的css和js文件.]]></value>
+		<value xml:lang="tr"><![CDATA[CSS XE çekirdek, js dosyaları CDN teklif almak için deneyin.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[你想要整理session吗？]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer oturum temizlemek istiyor musunuz?]]></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>
 		<value xml:lang="zh-CN"><![CDATA[整理sessioon]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum temizleme]]></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>
 		<value xml:lang="zh-CN"><![CDATA[无效的icon格式]]></value>	
+		<value xml:lang="tr"><![CDATA[Simge biçimi yanlış.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[请上传文件.]]></value>
+		<value xml:lang="tr"><![CDATA[Dosyalar yüklenebilir.]]></value>
 	</item>
 	<item name="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="tr"><![CDATA[kurtarmak]]></value>
 	</item>
 	<item name="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="tr"><![CDATA[görmek]]></value>
 	</item>
 	<item name="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="tr"><![CDATA[seçmek]]></value>
 	</item>
 	<item name="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="tr"><![CDATA[silmek]]></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="tr"><![CDATA[eklemek]]></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>
 		<value xml:lang="zh-CN"><![CDATA[主题是包含布局等一系列正确安装的模块的皮肤集.当选用此主题.'皮肤设置'将会被自动选用,如果你不喜欢某些主题,你可以在皮肤设定里面编辑.]]></value>
+		<value xml:lang="tr"><![CDATA[Kavramı birlikte modülü şu anda yüklü derileri düzeni gibi temalar. Bir tema 'Skin Setting' seçtiğinizde bir öğe seçmek için özen gösteriyoruz. Eğer beğenmezseniz geri kısmından temayı 'Skin Setting' teması bazı ayarlanabilir.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[已选择的主题]]></value>
+		<value xml:lang="tr"><![CDATA[seçilen Tema]]></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>
 		<value xml:lang="zh-CN"><![CDATA[这是管理员设定的默认主题.此主题将会默认显示.]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici tarafından belirlenen bir tema. Varsayılan maruz kalma gibi bir tema ayarlamak yoksa.]]></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>
+	　　<value xml:lang="jp"><![CDATA[テーマの一部が気に入らなかった場合、スキンを選択してください。スキンを選択すると、「テーマ設定」は、「ユーザー定義」に設定されます。]]></value>
 		<value xml:lang="zh-CN"><![CDATA[如果你不喜欢某些主题，请自己选择一个皮肤。当你自定义一个皮肤后，'主题设置'将关联在'用户设置'下]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer istemiyorsanız tema parçası kendi cilt seçin. Kendi cilt 'Theme Setting' ayar 'User Defined' seçtiğinizde ayarlanır.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[已选择的布局]]></value>
+		<value xml:lang="tr"><![CDATA[seçilen düzeni]]></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>
 		<value xml:lang="zh-CN"><![CDATA[选择了 %s 皮肤]]></value>
+		<value xml:lang="tr"><![CDATA[Cilt seçilen %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>
 		<value xml:lang="zh-CN"><![CDATA[未选择 %s 皮肤]]></value>
+		<value xml:lang="tr"><![CDATA[Cildin Seçilen %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>
 		<value xml:lang="zh-CN"><![CDATA[已选择的主体没有相关的皮肤信息。请直接选择皮肤。]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen tema bu konu derileri hakkında bilgi yoktur. Kendi cilt seçin.]]></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>
 		<value xml:lang="zh-CN"><![CDATA[未选择]]></value>	
+		<value xml:lang="tr"><![CDATA[seçiniz yok]]></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>
 		<value xml:lang="zh-CN"><![CDATA[后台页面Logo]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Sayfa Logo]]></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>
 		<value xml:lang="zh-CN"><![CDATA[后台页面标题]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Sayfa Başlığı]]></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>
 		<value xml:lang="zh-CN"><![CDATA[添加后台菜单]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Menüsü ekle]]></value>
 	</item>
 	<item name="bug_report">
 		<value xml:lang="ko"><![CDATA[버그 리포트]]></value>
 		<value xml:lang="en"><![CDATA[Bug Report]]></value>
 		<value xml:lang="jp"><![CDATA[バグレポート]]></value>
 		<value xml:lang="zh-CN"><![CDATA[Bug反馈]]></value>
+		<value xml:lang="tr"><![CDATA[hata Raporu]]></value>
 	</item>
 	<item name="theme_setting">
 		<value xml:lang="ko"><![CDATA[테마 설정]]></value>
 		<value xml:lang="en"><![CDATA[Theme Setting]]></value>
 		<value xml:lang="zh-CN"><![CDATA[主题设置]]></value>
+		<value xml:lang="tr"><![CDATA[tema Ayarı]]></value>
 	</item>
 	<item name="skin_setting">
 		<value xml:lang="ko"><![CDATA[스킨 설정]]></value>
 		<value xml:lang="en"><![CDATA[Skin Setting]]></value>
 		<value xml:lang="zh-CN"><![CDATA[皮肤设置]]></value>
+		<value xml:lang="tr"><![CDATA[Cilt Ayarı]]></value>
 	</item> 
 	<item name="msg_thumbnail_not_exist">
 		<value xml:lang="ko"><![CDATA[썸네일이 없습니다]]></value>
 		<value xml:lang="en"><![CDATA[Thumbnail does not exist]]></value>
 		<value xml:lang="zh-CN"><![CDATA[缩略图不存在]]></value>
+		<value xml:lang="tr"><![CDATA[Küçük resim yok]]></value>
 	</item>
 	<item name="user_theme">
 		<value xml:lang="ko"><![CDATA[사용자 테마]]></value>
 		<value xml:lang="en"><![CDATA[User Theme]]></value>
 		<value xml:lang="zh-CN"><![CDATA[用户主题]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı Tema]]></value>
 	</item>
 	<item name="user_define">
 		<value xml:lang="ko"><![CDATA[사용자 정의 테마]]></value>
 		<value xml:lang="en"><![CDATA[User Defined]]></value>
 		<value xml:lang="zh-CN"><![CDATA[用户设置]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı Tanımlı]]></value>
 	</item>
 	<item name="by_you"> 
 		<value xml:lang="ko"><![CDATA[사용자 설정]]></value>
 		<value xml:lang="en"><![CDATA[By You]]></value>
 		<value xml:lang="zh-CN"><![CDATA[By You]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı Ayarları]]></value>
 	</item>
 	<item name="update_available">
 		<value xml:lang="ko"><![CDATA[업데이트 가능]]></value>
 		<value xml:lang="en"><![CDATA[Update Available]]></value>
 		<value xml:lang="zh-CN"><![CDATA[有可用的升级]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleme Mevcut]]></value>
 	</item> 
 	<item name="need_update_and_table">
 		<value xml:lang="ko"><![CDATA[DB Table 생성과 모듈 업데이트 필요]]></value>
 		<value xml:lang="en"><![CDATA[Need to Create DB Table and Update Module]]></value>
 		<value xml:lang="jp"><![CDATA[DBテーブルの生成とモジュールの更新が必要]]></value>
 		<value xml:lang="zh-CN"><![CDATA[请建立数据表和升级模块]]></value>
+		<value xml:lang="tr"><![CDATA[DB table oluşturma ve modülleri güncellemeniz gerekir]]></value>
 	</item> 
 	<item name="need_update">
 		<value xml:lang="ko"><![CDATA[모듈 업데이트 필요]]></value>
 		<value xml:lang="en"><![CDATA[Need to Update Module]]></value>
 		<value xml:lang="jp"><![CDATA[モジュールの更新が必要]]></value>
 		<value xml:lang="zh-CN"><![CDATA[请升级模块]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Güncelleme gerekiyor]]></value>
 	</item> 
 	<item name="need_table">
 		<value xml:lang="ko"><![CDATA[DB Table 생성 필요]]></value>
 		<value xml:lang="en"><![CDATA[Need to Create DB Table]]></value>
 		<value xml:lang="jp"><![CDATA[DBテーブルの生成が必要]]></value>
 		<value xml:lang="zh-CN"><![CDATA[请生成数据表]]></value>
+		<value xml:lang="tr"><![CDATA[DB table oluşturmak gerekiyor]]></value>
 	</item> 
 	<item name="admin_menu_setup">
 		<value xml:lang="ko"><![CDATA[관리자 메뉴 설정]]></value>
 		<value xml:lang="en"><![CDATA[Admin Menu Setup]]></value>
 		<value xml:lang="zh-CN"><![CDATA[后台菜单设置]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Menüsü Ayarı]]></value>
 	</item>
 	<item name="no_data">
 		<value xml:lang="ko"><![CDATA[등록된 데이터가 없습니다.]]></value>
 		<value xml:lang="en"><![CDATA[There is no data.]]></value>
 		<value xml:lang="zh-CN"><![CDATA[没有相关信息。]]></value>
+		<value xml:lang="tr"><![CDATA[Veri yok kayıtlıdır.]]></value>
 	</item>
 	<item name="cmd_admin_menu_reset">
 		<value xml:lang="ko"><![CDATA[관리자 메뉴 초기화]]></value>
 		<value xml:lang="en"><![CDATA[Reset admin menu]]></value> 
 		<value xml:lang="jp"><![CDATA[管理者メニューの初期化]]></value>
 		<value xml:lang="zh-CN"><![CDATA[重置后台菜单]]></value>
+		<value xml:lang="tr"><![CDATA[Admin menu sıfırlayın]]></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>
 		<value xml:lang="zh-CN"><![CDATA[请确认是否初始化后台菜单]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer admin menu başlatmak istiyor musunuz?]]></value>
 	</item>
 	<item name="ftp_form_title">
 		<value xml:lang="ko"><![CDATA[FTP 계정 정보 입력]]></value>
@@ -1275,6 +1346,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></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ün Kolay kurulum veya güncelleme etkindir.]]></value>
 	</item>
 	<item name="msg_safe_mode_ftp_config">
 		<value xml:lang="ko"><![CDATA[이 정보는 <strong>files/config/ftp.config.php</strong> 파일에 저장 됩니다. 설치 후 환경설정 페이지에서도 등록, 변경, 제거 할 수 있습니다.]]></value>
@@ -1282,6 +1354,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="zh-CN"><![CDATA[该信息将会保存在<strong>files/config/ftp.config.php</strong>里面。你可以安装后在设置页面里面增加、修改或者删除该信息。]]></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>
+		<value xml:lang="tr"><![CDATA[Bu bilgiler <strong>files/config/ftp.config.php</strong> bir dosyada saklanır. Kurulumdan sonra, Ayarlar sayfasında, değiştirmek kayıtlı ve kaldırılabilir.]]></value>
 	</item>
 	<item name="msg_ftp_no_directory">
 		<value xml:lang="ko"><![CDATA[FTP 접속에 성공했으나, 디렉토리 정보를 읽어올 수 없습니다. 서버 설정을 확인해주세요.]]></value>
@@ -1293,7 +1366,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="de"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
 		<value xml:lang="ru"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
 		<value xml:lang="es"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
-		<value xml:lang="tr"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
+		<value xml:lang="tr"><![CDATA[FTP bağlantısı başarılı olur, ancak dizin bilgileri okuyamıyor. Sunucu ayarlarını kontrol edin.]]></value>
 		<value xml:lang="vi"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
 		<value xml:lang="mn"><![CDATA[Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.]]></value>
 	</item>
@@ -1373,5 +1446,6 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="ko"><![CDATA[관리자 설정]]></value>
 		<value xml:lang="en"><![CDATA[Admin Setup]]></value>
 		<value xml:lang="zh-CN"><![CDATA[管理设置]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Ayarları]]></value>
 	</item>
 </lang>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 08bd80d73..a3dee0f05 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -576,6 +576,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
 /* 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}
+.x .sTog{float:right;border:0;background-color:transparent;width:28px;height:18px;opacity:.5;filter:alpha(opacity=50)}
 /* Responsive Layout */
 @media only all and (max-width:860px){
 .x .header .account ul{padding-right:10px}
@@ -676,3 +677,157 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
 .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}
+
+/*!
+ * Bootstrap v2.0.4
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world@twitter by@mdo and@fat.
+*/
+/* Bootstrap - Icon */
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}
+[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}
+.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}
+.icon-glass{background-position:0 0}
+.icon-music{background-position:-24px 0}
+.icon-search{background-position:-48px 0}
+.icon-envelope{background-position:-72px 0}
+.icon-heart{background-position:-96px 0}
+.icon-star{background-position:-120px 0}
+.icon-star-empty{background-position:-144px 0}
+.icon-user{background-position:-168px 0}
+.icon-film{background-position:-192px 0}
+.icon-th-large{background-position:-216px 0}
+.icon-th{background-position:-240px 0}
+.icon-th-list{background-position:-264px 0}
+.icon-ok{background-position:-288px 0}
+.icon-remove{background-position:-312px 0}
+.icon-zoom-in{background-position:-336px 0}
+.icon-zoom-out{background-position:-360px 0}
+.icon-off{background-position:-384px 0}
+.icon-signal{background-position:-408px 0}
+.icon-cog{background-position:-432px 0}
+.icon-trash{background-position:-456px 0}
+.icon-home{background-position:0 -24px}
+.icon-file{background-position:-24px -24px}
+.icon-time{background-position:-48px -24px}
+.icon-road{background-position:-72px -24px}
+.icon-download-alt{background-position:-96px -24px}
+.icon-download{background-position:-120px -24px}
+.icon-upload{background-position:-144px -24px}
+.icon-inbox{background-position:-168px -24px}
+.icon-play-circle{background-position:-192px -24px}
+.icon-repeat{background-position:-216px -24px}
+.icon-refresh{background-position:-240px -24px}
+.icon-list-alt{background-position:-264px -24px}
+.icon-lock{background-position:-287px -24px}
+.icon-flag{background-position:-312px -24px}
+.icon-headphones{background-position:-336px -24px}
+.icon-volume-off{background-position:-360px -24px}
+.icon-volume-down{background-position:-384px -24px}
+.icon-volume-up{background-position:-408px -24px}
+.icon-qrcode{background-position:-432px -24px}
+.icon-barcode{background-position:-456px -24px}
+.icon-tag{background-position:0 -48px}
+.icon-tags{background-position:-25px -48px}
+.icon-book{background-position:-48px -48px}
+.icon-bookmark{background-position:-72px -48px}
+.icon-print{background-position:-96px -48px}
+.icon-camera{background-position:-120px -48px}
+.icon-font{background-position:-144px -48px}
+.icon-bold{background-position:-167px -48px}
+.icon-italic{background-position:-192px -48px}
+.icon-text-height{background-position:-216px -48px}
+.icon-text-width{background-position:-240px -48px}
+.icon-align-left{background-position:-264px -48px}
+.icon-align-center{background-position:-288px -48px}
+.icon-align-right{background-position:-312px -48px}
+.icon-align-justify{background-position:-336px -48px}
+.icon-list{background-position:-360px -48px}
+.icon-indent-left{background-position:-384px -48px}
+.icon-indent-right{background-position:-408px -48px}
+.icon-facetime-video{background-position:-432px -48px}
+.icon-picture{background-position:-456px -48px}
+.icon-pencil{background-position:0 -72px}
+.icon-map-marker{background-position:-24px -72px}
+.icon-adjust{background-position:-48px -72px}
+.icon-tint{background-position:-72px -72px}
+.icon-edit{background-position:-96px -72px}
+.icon-share{background-position:-120px -72px}
+.icon-check{background-position:-144px -72px}
+.icon-move{background-position:-168px -72px}
+.icon-step-backward{background-position:-192px -72px}
+.icon-fast-backward{background-position:-216px -72px}
+.icon-backward{background-position:-240px -72px}
+.icon-play{background-position:-264px -72px}
+.icon-pause{background-position:-288px -72px}
+.icon-stop{background-position:-312px -72px}
+.icon-forward{background-position:-336px -72px}
+.icon-fast-forward{background-position:-360px -72px}
+.icon-step-forward{background-position:-384px -72px}
+.icon-eject{background-position:-408px -72px}
+.icon-chevron-left{background-position:-432px -72px}
+.icon-chevron-right{background-position:-456px -72px}
+.icon-plus-sign{background-position:0 -96px}
+.icon-minus-sign{background-position:-24px -96px}
+.icon-remove-sign{background-position:-48px -96px}
+.icon-ok-sign{background-position:-72px -96px}
+.icon-question-sign{background-position:-96px -96px}
+.icon-info-sign{background-position:-120px -96px}
+.icon-screenshot{background-position:-144px -96px}
+.icon-remove-circle{background-position:-168px -96px}
+.icon-ok-circle{background-position:-192px -96px}
+.icon-ban-circle{background-position:-216px -96px}
+.icon-arrow-left{background-position:-240px -96px}
+.icon-arrow-right{background-position:-264px -96px}
+.icon-arrow-up{background-position:-289px -96px}
+.icon-arrow-down{background-position:-312px -96px}
+.icon-share-alt{background-position:-336px -96px}
+.icon-resize-full{background-position:-360px -96px}
+.icon-resize-small{background-position:-384px -96px}
+.icon-plus{background-position:-408px -96px}
+.icon-minus{background-position:-433px -96px}
+.icon-asterisk{background-position:-456px -96px}
+.icon-exclamation-sign{background-position:0 -120px}
+.icon-gift{background-position:-24px -120px}
+.icon-leaf{background-position:-48px -120px}
+.icon-fire{background-position:-72px -120px}
+.icon-eye-open{background-position:-96px -120px}
+.icon-eye-close{background-position:-120px -120px}
+.icon-warning-sign{background-position:-144px -120px}
+.icon-plane{background-position:-168px -120px}
+.icon-calendar{background-position:-192px -120px}
+.icon-random{background-position:-216px -120px}
+.icon-comment{background-position:-240px -120px}
+.icon-magnet{background-position:-264px -120px}
+.icon-chevron-up{background-position:-288px -120px}
+.icon-chevron-down{background-position:-313px -119px}
+.icon-retweet{background-position:-336px -120px}
+.icon-shopping-cart{background-position:-360px -120px}
+.icon-folder-close{background-position:-384px -120px}
+.icon-folder-open{background-position:-408px -120px}
+.icon-resize-vertical{background-position:-432px -119px}
+.icon-resize-horizontal{background-position:-456px -118px}
+.icon-hdd{background-position:0 -144px}
+.icon-bullhorn{background-position:-24px -144px}
+.icon-bell{background-position:-48px -144px}
+.icon-certificate{background-position:-72px -144px}
+.icon-thumbs-up{background-position:-96px -144px}
+.icon-thumbs-down{background-position:-120px -144px}
+.icon-hand-right{background-position:-144px -144px}
+.icon-hand-left{background-position:-168px -144px}
+.icon-hand-up{background-position:-192px -144px}
+.icon-hand-down{background-position:-216px -144px}
+.icon-circle-arrow-right{background-position:-240px -144px}
+.icon-circle-arrow-left{background-position:-264px -144px}
+.icon-circle-arrow-up{background-position:-288px -144px}
+.icon-circle-arrow-down{background-position:-312px -144px}
+.icon-globe{background-position:-336px -144px}
+.icon-wrench{background-position:-360px -144px}
+.icon-tasks{background-position:-384px -144px}
+.icon-filter{background-position:-408px -144px}
+.icon-briefcase{background-position:-432px -144px}
+.icon-fullscreen{background-position:-456px -144px}
\ No newline at end of file
diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css
index 20c8402e2..f65e8058b 100644
--- a/modules/admin/tpl/css/admin.min.css
+++ b/modules/admin/tpl/css/admin.min.css
@@ -1 +1,2 @@
-@charset "utf-8";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}.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}.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}.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}.x .table th{background:#f8f8f8;white-space:nowrap}.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){background-color:#fafafa}.x .table tbody tr:hover{background:#ffd!important}.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.nowr,.x .table td.nowr{white-space:nowrap}.x .table th.title,.x .table td.title,.x .table th.text,.x .table td.text{width:100%}.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:hover{background:#ffd}.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 select[size],.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;resize:both}.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}.x .gnb{height:34px;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:after{content:"";display:block;clear:both}.x .gnb .nav{float:left;position:relative;display:inline-block;*display:inline;zoom:1;margin:0 0 0 20px;padding:1px;list-style:none}.x .gnb .nav ul{_position:absolute;display:block;_display:inline;zoom:1;clear:both;margin:0;padding:0;border:0;overflow:hidden}.x .gnb.active .nav{top:-5px;padding:5px 5px 5px 0;margin:0 0 -100% 20px;border:1px solid #aaa;background:#fff;box-shadow:0 0 10px #999;border-radius:5px}.x .gnb.active .nav ul{top:0;_position:relative;box-shadow:none;display:block;_display:inline;clear:both;padding:0;margin:0;border:0}.x .gnb .nav:after{content:"";display:block;clear:both}.x .gnb .nav li{position:relative;display:inline-block;*display:inline;zoom:1;vertical-align:top;overflow:hidden;margin:0}.x .gnb .nav li.activeOn{z-index:10}.x .gnb .nav li.activeOn>a{border:1px solid #ccc}.x .gnb .nav li li{display:block;_float:left;clear:both;overflow:hidden;border:0;margin:0}.x .gnb .nav li li:first-child{border:0}.x .gnb .nav li a{display:block;_float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:9px 0;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}.x .gnb .nav li a span{padding:0 15px;border-left:1px solid #fff}.x .gnb.active .nav li a span,.x .gnb .nav li:first-child a span,.x .gnb .nav li.activeOn+li a span{border:0;margin:0 0 0 1px}.x .gnb .nav li a:hover,.x .gnb .nav li a:active,.x .gnb .nav li a:focus{background:#f4f4f4}.x .gnb .nav li.activeOn>a{background:#fff;padding:8px 0}.x .gnb .nav li li a{color:#555;background:#fff;padding:5px 15px!important;font-weight:normal!important;border:0!important}.x .gnb .nav li li a:hover,.x .gnb .nav li li a:active,.x .gnb .nav li li a:focus{border:0;background:#eee}.x .gnb .bmk{position:relative;float:right;padding:8px 15px;margin:0 20px -100% 0;text-align:right;display:inline}.x .gnb .bmk.active{top:-5px;padding:12px 14px 10px 15px;background-color:#fff;border:1px solid #aaa;box-shadow:0 0 10px #999;border-radius:5px}.x .gnb .bmk .bmAnchor{height:16px;text-shadow:0 1px 0 #fff;display:inline-block;padding:0 0 0 20px;background:url(../img/iconFavorite.gif) no-repeat 0 -16px}.x .gnb .bmk ul{display:none}.x .gnb .bmk.active ul{position:relative;list-style:none;display:block!important;text-align:left;background:0;margin:0!important;padding:10px 0 0 0!important;border:0;box-shadow:none;border-radius:0}.x .gnb .bmk li{display:block;position:relative;padding:3px 15px 3px 0!important;white-space:nowrap}.x .gnb .bmk li a{display:inline;padding:0;background:none!important;font-weight:normal}.x .gnb .bmk li .action{position:absolute;top:0;right:0}.x .gnb .bmk li .action .text{text-decoration:none;width:16px;text-align:center;margin:0;padding:0;border:0;background:0;overflow:visible}.x .gnb .mnv{width:100%;height:32px;display:none}@media only all and (max-width:860px){.x .gnb{height:auto}.x .gnb .nav,.x .gnb .bmk{display:none}.x .gnb .mnv{display:block}}.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}.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}.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}.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}.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{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:99}.modal .bg{position:absolute;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter: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:0;padding:0;width:1px;height:1px;overflow:hidden}html.modalContainer,body.modalContainer{_height:100%;_width:100%}.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:0;padding:0;width:1px;height:1px;overflow:hidden}.x .h2Anchor{position:absolute;right:0;border:0;background:0;color:#00f;text-decoration:underline}.x .skipNav{margin:0;text-align:center}@media only all and (max-width:860px){.x .skipNav{display:none}}.x .skipNav a{position:absolute;width:1px;height:1px;display:block;padding:10px 0;font-weight:bold;overflow:hidden}.x .skipNav a:hover,.x .skipNav a:active,.x .skipNav a:focus{position:relative;width:auto;height:auto}.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 0 10px 20px;font-size:24px;line-height:32px;display:inline-block;*display:inline;zoom:1;vertical-align:middle}.x .header h1 *{vertical-align:middle}.x .header h1 a{display:inline-block;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 0 10px 20px;display:inline-block;*display:inline;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;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:-20px;padding:6px 4px!important;border:1px solid #666;border-top:0;background:#333}@media only all and (max-width:860px){.x .header #language{right:-10px}}.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}.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}.x .footer .vr{color:#ccc}.x .body{position:relative;z-index:1;padding:1em 20px 1em 260px;zoom:1}.x .body:after{content:"";display:block;clear:both}.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}.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}}.x .single{position:relative;float:none;width:auto;margin-left:-240px}.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}.x .siteMap h2 input{font-size:14px;font-weight:bold;padding:3px 4px;margin:0;border:0;background:transparent}.x .siteMap h2:hover input,.x .siteMap h2 input:focus{background:#ff0;border:1px dashed #ccc;margin:-1px}.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:0 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}.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}.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}.x #imageMark{right:0}.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 caption .side .text .hide,.x .easyList caption .side .details .show{display:none}.x .easyList caption .side .details .hide{display:inline}.x .easyList td p:first-child{margin:0}.x .easyList td p.update{background:#ffc;padding:.5em 1em;border:1px solid #fc9;border-left:0;border-right:0;text-align:center}.x .fontPreview{width:96%;border:1px solid #e9e9e9;zoom:1;padding:1em 2em;margin:.5em 0}.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}.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}.x .fvOff,.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0}.x .fvOn{background-position:0 -16px}.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}.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}.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}.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}.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}.x .desc.error{color:#f00}.x .desc.success{color:#080}.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}@media only all and (max-width:860px){.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}}.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
+@charset "utf-8";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}.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}.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}.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}.x .table th{background:#f8f8f8;white-space:nowrap}.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){background-color:#fafafa}.x .table tbody tr:hover{background:#ffd!important}.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.nowr,.x .table td.nowr{white-space:nowrap}.x .table th.title,.x .table td.title,.x .table th.text,.x .table td.text{width:100%}.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:hover{background:#ffd}.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 select[size],.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;resize:both}.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}.x .gnb{height:34px;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:after{content:"";display:block;clear:both}.x .gnb .nav{float:left;position:relative;display:inline-block;*display:inline;zoom:1;margin:0 0 0 20px;padding:1px;list-style:none}.x .gnb .nav ul{_position:absolute;display:block;_display:inline;zoom:1;clear:both;margin:0;padding:0;border:0;overflow:hidden}.x .gnb.active .nav{top:-5px;padding:5px 5px 5px 0;margin:0 0 -100% 20px;border:1px solid #aaa;background:#fff;box-shadow:0 0 10px #999;border-radius:5px}.x .gnb.active .nav ul{top:0;_position:relative;box-shadow:none;display:block;_display:inline;clear:both;padding:0;margin:0;border:0}.x .gnb .nav:after{content:"";display:block;clear:both}.x .gnb .nav li{position:relative;display:inline-block;*display:inline;zoom:1;vertical-align:top;overflow:hidden;margin:0}.x .gnb .nav li.activeOn{z-index:10}.x .gnb .nav li.activeOn>a{border:1px solid #ccc}.x .gnb .nav li li{display:block;_float:left;clear:both;overflow:hidden;border:0;margin:0}.x .gnb .nav li li:first-child{border:0}.x .gnb .nav li a{display:block;_float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:9px 0;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}.x .gnb .nav li a span{padding:0 15px;border-left:1px solid #fff}.x .gnb.active .nav li a span,.x .gnb .nav li:first-child a span,.x .gnb .nav li.activeOn+li a span{border:0;margin:0 0 0 1px}.x .gnb .nav li a:hover,.x .gnb .nav li a:active,.x .gnb .nav li a:focus{background:#f4f4f4}.x .gnb .nav li.activeOn>a{background:#fff;padding:8px 0}.x .gnb .nav li li a{color:#555;background:#fff;padding:5px 15px!important;font-weight:normal!important;border:0!important}.x .gnb .nav li li a:hover,.x .gnb .nav li li a:active,.x .gnb .nav li li a:focus{border:0;background:#eee}.x .gnb .bmk{position:relative;float:right;padding:8px 15px;margin:0 20px -100% 0;text-align:right;display:inline}.x .gnb .bmk.active{top:-5px;padding:12px 14px 10px 15px;background-color:#fff;border:1px solid #aaa;box-shadow:0 0 10px #999;border-radius:5px}.x .gnb .bmk .bmAnchor{height:16px;text-shadow:0 1px 0 #fff;display:inline-block;padding:0 0 0 20px;background:url(../img/iconFavorite.gif) no-repeat 0 -16px}.x .gnb .bmk ul{display:none}.x .gnb .bmk.active ul{position:relative;list-style:none;display:block!important;text-align:left;background:0;margin:0!important;padding:10px 0 0 0!important;border:0;box-shadow:none;border-radius:0}.x .gnb .bmk li{display:block;position:relative;padding:3px 15px 3px 0!important;white-space:nowrap}.x .gnb .bmk li a{display:inline;padding:0;background:none!important;font-weight:normal}.x .gnb .bmk li .action{position:absolute;top:0;right:0}.x .gnb .bmk li .action .text{text-decoration:none;width:16px;text-align:center;margin:0;padding:0;border:0;background:0;overflow:visible}.x .gnb .mnv{width:100%;height:32px;display:none}@media only all and (max-width:860px){.x .gnb{height:auto}.x .gnb .nav,.x .gnb .bmk{display:none}.x .gnb .mnv{display:block}}.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}.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}.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}.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}.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{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:99}.modal .bg{position:absolute;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter: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:0;padding:0;width:1px;height:1px;overflow:hidden}html.modalContainer,body.modalContainer{_height:100%;_width:100%}.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:0;padding:0;width:1px;height:1px;overflow:hidden}.x .h2Anchor{position:absolute;right:0;border:0;background:0;color:#00f;text-decoration:underline}.x .skipNav{margin:0;text-align:center}@media only all and (max-width:860px){.x .skipNav{display:none}}.x .skipNav a{position:absolute;width:1px;height:1px;display:block;padding:10px 0;font-weight:bold;overflow:hidden}.x .skipNav a:hover,.x .skipNav a:active,.x .skipNav a:focus{position:relative;width:auto;height:auto}.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 0 10px 20px;font-size:24px;line-height:32px;display:inline-block;*display:inline;zoom:1;vertical-align:middle}.x .header h1 *{vertical-align:middle}.x .header h1 a{display:inline-block;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 0 10px 20px;display:inline-block;*display:inline;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;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:-20px;padding:6px 4px!important;border:1px solid #666;border-top:0;background:#333}@media only all and (max-width:860px){.x .header #language{right:-10px}}.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}.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}.x .footer .vr{color:#ccc}.x .body{position:relative;z-index:1;padding:1em 20px 1em 260px;zoom:1}.x .body:after{content:"";display:block;clear:both}.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}.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}}.x .single{position:relative;float:none;width:auto;margin-left:-240px}.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}.x .siteMap h2 input{font-size:14px;font-weight:bold;padding:3px 4px;margin:0;border:0;background:transparent}.x .siteMap h2:hover input,.x .siteMap h2 input:focus{background:#ff0;border:1px dashed #ccc;margin:-1px}.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:0 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}.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}.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}.x #imageMark{right:0}.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 caption .side .text .hide,.x .easyList caption .side .details .show{display:none}.x .easyList caption .side .details .hide{display:inline}.x .easyList td p:first-child{margin:0}.x .easyList td p.update{background:#ffc;padding:.5em 1em;border:1px solid #fc9;border-left:0;border-right:0;text-align:center}.x .fontPreview{width:96%;border:1px solid #e9e9e9;zoom:1;padding:1em 2em;margin:.5em 0}.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}.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}.x .fvOff,.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0}.x .fvOn{background-position:0 -16px}.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}.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}.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}.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}.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}.x .desc.error{color:#f00}.x .desc.success{color:#080}.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}.x .sTog{float:right;border:0;background-color:transparent;width:28px;height:18px;opacity:.5;filter:alpha(opacity=50)}@media only all and (max-width:860px){.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}}.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}
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}
\ No newline at end of file
diff --git a/modules/admin/tpl/img/glyphicons-halflings-white.png b/modules/admin/tpl/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae
GIT binary patch
literal 8777
zcmZvC1yGz#v+m*$LXcp=A$ZWB0fL7wNbp_U*$~{_gL`my3oP#L!5tQYy99Ta`+g_q
zKlj|KJ2f@c)ARJx{q*b<Rc{fZDE|-E3z8Qg5C}{9v!pTzga8NZOmrk*O`5892Z0dh
z6y;PuJwHDK9$?(w-u|_L_3`o1($W%e0`}kWUyy&dCnqOQPfu4@SAgf?;o*P$z|s8t
zJh1KR>bkhN_!|Wn*Vos8{TEhUT@5e;_WJsIMMcG5%>DiS&dv_N`4@J0cnAQ-#>RjZ
z00W5t&tJ^l-QC*ST1-p~00u^9XJ=AUl7oW-;2a+x2k__T=grN{+1c4XK0ZL~^z^i$
zp&>vEhr@4fZWb380S18T&!0cQ3IKpHF)?v=b_NIm0Q>v<fKgXh*W25>wY7D0baZ)n
z31Fa5sELUQARIVaU0nqf0XzT+fB_63aA;@<$l~wse|mcA;^G1TmX?-)e)jkGPfkuA
z92@|!<>h5S_4f8QP-JRq>d&7)^Yin8l7K8gED$&_FaV?gY+wLjpoW%~7NDe=nHfMG
z5DO3j{R9kv5GbssrUpO)<pElNvVjx;Inad7%}rnn)BtoiIXM{s0C>Oyv<s*i2m!7M
zNCXUk1jq|?5|99_k&%%AIlu-a0ty3=KxY8j%*;&S3IIajE_Qc!f%*X_5DScgf&xH0
zumu>Vrlx>u0UKD0i;Dpm5S5dY16(DL5l{ixz|mhJU@&-OWCTb7_%}8-fE(P~+XIRO
zJU|wp1|S>|J3KrLcz^+v1f&BDpd>&MAaibR4#5A_4(MucZwG9E1h4@u0P@C8;oo+g
zIVj7kfJi{oV~E(NZ*h(@^<JQ`7oGGHtP>-(Q(C`Psb3KZ{N;^GB(a8NE*Vwc715!9
zr-H4Ao|T_c6+VT_JH9H+P3>iXSt!a$F`>s`jn`w9GZ_~B!{<w2b}Uz=xRP0Noee!5
zHGxHKH;uZjouChSB9)ldcOm@{14~ct04{b8>0soaiV|O_c^R2aWa%}O3jUE)WO=pa
zs~_Wz08z|ieY5A%$@FcBF9^!1a}m5ks@7gjn;67N>}S~Hrm`4sM5Hh`q7&5-N{|31
z6x1{ol7Bn<k_m&K*9NkB7ANp6;_WSmra!UL^eY+pz_w5LlB(g$UY9|-AP@zsw4|7-
zi|#>skoViZ<brlX21G1wL@^v%v2P&MSTZc8SKT&&Tq!~%Uw%k^(D<O<S;ewoH)@(b
zb2Z<#wBV6y-?HHFVJFRg^me&@Reg!dys6F1>0GqbLa#kW`Z<Hy>)VCjt1MysKg|rT
zi!?s#<KsBd5lg=VLu4^|xo0%enAx0mMXMSpk0KF_*gOS;jx!zP=@5TPN+S>#Ck>8c
zpi|>$lGlw#@yMNi&V4`6OBGJ(H&7lqLlcTQ&1zWriG_fL>BnFcr~?;E93{M-xIozQ
zO=EHQ#+?<}%@wbWWv23#!V70h9MOuUVaU>3kpTvYfc|LBw?&b*89~Gc9i&8tlT#kF
ztpbZoAzkdB+UTy=tx%L3Z4)I{zY(Kb)eg{InobSJmNwPZt$14aS-uc4eKuY<?xyi!
z`TeGpun(kP^7#~<fX0r^ExRQwveWDF;DOQbL}?LBzt>8h$dtfyxu^a%zA)<y|4;I#
zFU8x7%0eT|Hd@3!T6Anh3IoHrN%@H8e6ge;3u)_$N2H&Rv2`ml6;kL~xS07C5Nzt<
z>>fYI&)@ZXky?^{5>xSC?;w4r&td6vBdi%vHm4=XJH!3yL3?Ep+T5aU_>i;yr_XGq
zxZfCzUU@GvnoIk+_Nd`aky>S&H!b*{A%L>?*XPAgWL(Vf(k7qUS}>Zn=U(ZfcOc{B
z3*tOHH@t5Ub5D~#N7!Fxx}P2)sy{vE_l(R7$aW&CX>c|&HY+7};vUIietK%}!ph<X
z*_6&Ee=)&D@nDa!y{$f<(Q`UdM+|H2ksGEhG7utFYl`Y6pD#+4LC8Hw@6|1H-x{D`
zE$uaNS!i^Rx(%B(My5}1#H73>rCuh+;C@1usp;XLU<8Gq8P!rEI3<U)y>ieg#W$!=
zQcZr{hp>8sF?k&Yl0?B84OneiQxef-4TEFrq3O~JAZR}yEJHA|Xkqd49tR&8oq{zP
zY@>J^HBV*(gJvJZc_0VFN7Sx?H7#75E3#?N8<p*btH>Z!C+_f53YU}py<FUNWgSuj
zi^M}p>ggxx1?wQi5Yb-_`I`_V*SMx5+*P^b=ec5RON-k1cIlsBLk}(HiaJyab0`CI
zo0{<v3Q5P3@oM!6@v&t6RJy0OS}M??mGqk1x;(pa`FWA#n+2z37<uPHl{#HvB!^?r
zm9?WOv;Tt(gt*?Pw;;%nF3|I0gDBXPM>=1_LO$~oE2%Tl_}KURuX<`+mQN_sTdM&*
zkFf!Xtl^e^gTy6ON=&gTn6)$JHQq2)33R@_!#9?BLNq-Wi{U|rVX7Vny$l6#+S<va
z%-r+y8D)Cm{5=IM8|<{prj)kZfIZ$NiW0)fE9{-SR)@-;NBJtHk@DI_v*mK(N0#s#
z?S8~jyotdcJJAAUt_;Tr)fa|*cT)~*JZ!c_7yVpSb{r2MllfJDbfI~-7n_#K6lw4G
z^Eyhsh^z8eZs2;adrfk9ip%h;IP|>Z@KvQt@VYb%<9JfapI^b9j=wa+Tqb4ei;8c5
z&1>Uz@lVFv6T4Z*YU$r4G`g=91lSeA<=GRZ!*KTWKDPR}NPUW%peCUj`Ix_LDq!8|
zMH-V`Pv!a~QkTL||L@cqiTz)*G-0=ytr1KqTuFPan9y4gYD5>PleK`NZB$ev@W%t=
zkp)_=lBUTLZJpAtZg;pjI;7r2y|26-N7&a(h<zryrg`J^oeC|8V|qszB+|*eQ-(Dy
zbn*nJ1W|b4-1y?dTI6}3IPMw+-O0;Q@eMMtjjQ+G6QfN3ae61Yd9LfQx_UREWecK4
zMn7A~fOz)be1)Yg{2Ysl9G%s8-h-~@C;ALAL0r=<JP2uCe!T|wAywH1r;F|f_q8N(
zYp^0FkyL9uj<8bK@fyTtgo+DT)14B^<SigcSJotgDV02O!M(CS6_B&^bILwyV?Ng4
zm7WQp?{l<Obhuy=22?5<oQDiM22&u4rZrRVG|L9ABfY{=95aTyd~@a$o~1P#ji`=w
zBKmQqX}r3Nlk9Q|gR7)~#n6AzYk`#!R*d5x`A)hU(!1R1%^zXxNJ(kPCw4htU9^(O
zP4cYV^F(I>X|`1YNM9N8{>8JAu<en5+94bD>v}hp1v`3JHT-=5lbXpbMq7X~2J5Kl
zh7tyU`_AusMFZ{ej9D;Uyy;SQ!4nwgSnngsYBwdS&EO3NS*o04)*j<g2BLf;iAZ2(
z7Key$cc6ey>uAYl;57c2Ly0(DEZ8IY?zSph-kyxu+D`tt@oU{32J#I{vmy=#0ySPK
zA+i(A3yl)qmTz*$dZi#y9FS;$;h%bY+;StNx{_R56Otq+?pGe^T^{5d7Gs&?`_r`8
zD&dzOA|j8@3<oPyCd}SOX6AZj_;pT>A&FR5U3*eQNBf<4^4W_iS_()*8b4aaUzfk2
zzIcMWSEjm;EPZPk{j{1>oXd}pXAj!NaRm8{Sjz!D=~q3WJ@vmt6ND_?HI~|wUS1j5
z9!S1MKr7%nxoJ3k`GB^7yV~*{n~O~n6($~x5Bu{7s|JyXbAyKI4+tO(zZYMslK;Zc
zzeHGVl{`iP@jfSKq>R;{+djJ9n%$%EL()Uw+sykjNQdflkJZSjqV_QDWivbZS~S{K
zkE@T^Jcv)Dfm93!mf$XYnCT--_A$zo9MOkPB6&diM8MwOfV?+ApNv`moV@nqn>&lv
zYbN1-M|jc~sG|yLN^1R2=`+1ih3jCshg`iP&mY$GMTcY^W^T`WOCX!{-KHmZ#GiRH
zYl{|+KLn5!PCLtBy~9i}`#d^gCDDx$+GQb~uc;V#K3OgbbOG0j5{BRG-si%Bo{@lB
zGIt+Ain8^C`!*S0d0OSWVO+Z8<kqm;qPrHIJ!qB8;9h5*>9}}O8aFTZ>p&k}2gGCV
zh#<$gswePFxWGT$4DC^8@84_e*^KT74?7n8!$8cg=sL$OlKr&HMh@Rr5%*Wr!xoOl
zo7jItnj-xYgVTX)H1=A2bD(tle<tL7^Z!nJ*fwgn&QUe>EH57#V{xAeW_ezISg5OC
zg=k>hOLA^urTH_e6*vSYRqCm$J{xo}-x3@HH;bsHD1Z`Pzvsn}%cvfw%Q(}h`Dgtb
z0_J^niUmoCM5$*f)6}}qi(u;cPgxfyeV<wtcQgsqG?QDyA@6XXM7siU#+0#mP~AnX
z9f=bMes~9>aaVmOsG<)5`6tzU4wyhF;k|~|x>7-2hXpVBpc5k{L4M`Wbe6Q?tr^*B
z`Y*>6*&R#~%JlBIitlZ^qGe3s21~h3U|&k%%jeMM;6!~UH|+0+<5V-_zDqZQN7<fD
zM2vP&&BMr(%$M51tLpycNES^{gnGn-o~t&>9?n?!Aj!Nj`YMO9?j>uqI9-Tex+nJD
z%e0#Yca6(zqGUR|KITa?9x-#C0!JKJHO(+fy@1!B$%ZwJwncQW7vGYv?~!^`#L~Um
zOL++>4qmqW`0Chc0T23G8|vO)tK=Z2`gvS4*qpqhIJCEv9i&&$09VO8YOz|oZ+ubd
zNXVdLc&p=KsSgtmIPLN69P7xYkYQ1vJ?u1g)T!6Ru`k2wkdj*wDC)VryGu2=yb0?F
z>q~~e>KZ0d<sP$M^)hrN7IC)eGuv*?pAk#*4fxII<8rIx545@9E}-};{IJdo*}!V1
zkUgWQp<TD%7(QQhWkf*vd;SiT1P@}N?jaoKEV?lzqfa1pG1Y^}ikjNMM*Kb?m5(n&
zOz8{+G2z7JatI<J95R%#%#ATAzlwPl$?6)w6WH~ku?(FhO)k1eRlF4I5UqR?T`Iy=
z_bVtkxqs3lQGny-BS%nkzwrXhI_M|P4l_VNVoMjVRoZ*0(JkMQ#AdJLFBj%$oTBx9
z_5|g_ll0@cfLf<j;&lJ>_#7f3UgV%9MY1}vMgF{B8yfE{HL*pMyhYF)WDZ^^3vS8F
zGlOhs%g_~pS3=WQ#494@jAXwOtr^Y|TnQ5zki>qRG)(oPY*f}U_=ip_{qB0!%w7~G
zWE!P4p3khyW-JJnE>eECuYfI?^d366Shq!Wm#x&jA<tFBO~aWRutYg|6S!-V%dvXb
zjpm3-7^fYCzbWmx*ts$8ECu=f{D#|=T{2_Q?C-SVQTSi8ey{G^D$8U&*bY{vQ$kGG
zq$8)>o>=HdCllE$>DPO0N;y#4G)D2y#B@5=N=+F%Xo2n{gKcPcK2!hP*^WSXl+ut;
zyLvVoY>VL{H%Kd9^i~lsb8j4>$EllrparEOJNT?Ym>vJa$(P^tOG)5aVb_5w^*&M0
zYOJ`I`}<NkH4X@iCc57jNSqY3D>9}UoSnYg#E(&yyK(tqr^@n}qU2H2DhkK-`2He%
zgXr_4kpXoQHxAO9S`wEdmqGU4j=1JdG!OixdqB4PPP6<nq;ZS)73s_@N{54U_<mt#
zR{@UUroZJ1=lVB~3y%RbLLE=9Mh=pj4wNruVxXLk8pKH)JVr{Hbx`P1XQ>RXA}>GM
zumruUUH|ZG2$bBj)Qluj&uB=dRb)?^qomw?Z$X%#D+Q*O97eHrgVB2*mR$bFBU`*}
zIem?dM)i}raTFDn@5^caxE^XFXVhBePmH9fqcTi`TLaXiueH=@06sl}>F%}h9H_e9
z>^O?LxM1EjX}NVppaO@NNQr=AtHcH-BU{yBT_vejJ#J)l^cl69Z7$sk`82Zyw7Wxt
z=~J?hZm{f@W}|96FUJfy65Gk8?^{^yjhOahUMCNNpt5DJw}ZKH7b!bGiFY9y6OY&T
z_N)?Jj(MuLTN36ZCJ6<obtKS{VOOSzs>I5Xy7uVlrb$o*Z%=-)kPo9s?<^Yqz~!Z*
z_mP<Y8YDC3(vm~>8(unFq65XSi!$@YtieSQ!<7IEOaA9VkKI?lA`*(nURv<D`3vIl
zzk?RMHDq|}aqs!Q7n{<V(L>fKL8cX}-+~uw9|_5)uC2`ZHca<BJSyCJ7L7R3^ezpJ
zixdU%^Arizo-zh;Lga89_J>eX7L8aG6Ghleg@F9aG%X$#g6^yP5apnB>YTz&EfS{q
z9UVfSyEIczebC)qlVu5cOoMzS_jrC|)rQlAzK7sfiW0`M8mVIohazPE9Jzn*qPt%6
zZL8RELY@L09B83@Be;x5V-IHnn$}{RAT#<2JA%ttlk#^(%u}CGze|1JY5MPhbfnYG
zIw%$XfBmA-<_pKLpGKwbRF$#P;@_)ech#>vj25sv25VM$ouo)?BXdRcO{)*OwTw)G
zv43W~T6ekBMtUD%5Bm>`<n0ehww;K9t*_z=^iZoM2Gjm6Wx6QTWDzOX28g|i7p-G(
znPo(pGb2-Hja^(5g>^Ltv!w4~65N!Ut5twl!Agrzyq4O2Fi3pUMtCU~>9gt_=h-f%
z;1&OuSu?A_sJvIvQ+dZNo3?m1%b1+s&UAx?8sUHEe_sB7zkm4R%6)<@oYB_i5>3Ip
zIA+?jVdX|zL{)?TGpx+=Ta>G80}0}Ax+722$XFNJsC1gcH56{8B)*)eU#r~HrC&}`
z|EWW92&;6y;3}!L5zXa385@?-D%>dSvyK;?jqU2t_R3wvBW;$!j45uQ7tyEIQv<v(
zw)qBpyRhiKBMR9HV)v2ZJdk>a;Db}r&bR3kqNSh)Q_$MJ#Uj3Gj1F;)sO|%6z#@<+
zi{pbYsYS#u`X$Nf($OS+lhw>xgjos1OnF^$-I$u;qhJswhH~p|ab*nO>zBrtb0ndn
zxV0uh!LN`&xckTP+JW}gznSpU492)u+`f{9Yr)js`NmfYH#Wdtradc0TnKNz@Su!e
zu$9}G_=ku;%4xk}eXl>)KgpuT>_<`Ud(A^a++K&pm3LbN;gI}ku@YVrA%FJBZ5$;m
zobR8}OLtW4-i+qPPLS-(7<>M{)rhiPoi@?&vDeVq5%fmZk=mDdRV>Pb-l7pP1y6|J
z8I>sF+TypKV=_<SBxSgNFy@5`t70+_4F<*(g54PNEt&4u%OoVR^n+$TL)qKdP6c)n
z-CoP*_kXZ4vBsj8M^2Y0nDq-^4r-wgu2Y-3fmi6ooPIXTI%UdJhw@7KgR=N+Vl3NO
zcl8-&i~^e%3E1G+u&^#M&5!sI)la$uQ2y&KsaZjx^r8D68BTZd^NrAV{0u$=#SH#4
zLE2)q%<UADH&I$um|>^NwBU^>4JJq<*14GLfM2*XQzYdlqqjnE)gZsPW^E@mp&ww*
zW9i>XL=uwLVZ9pO*8K>t>vdL~Ek_NUL$?LQi5sc#1Q-f6-ywKcIT8Kw?C<o*=Aa~-
z*eA0Mgmu5-j8rTh^;={1$#X=Ck5Gk;@KK#haYa^sXr0^_^Q84%+WOl3?#Mc#{{d}B
z>(_3pbR`e|)%9S-({if|E+hR2W!&qfQ&UiF^I!|M#xhdWsen<tq75@@WHX{+T3S~F
znoMw2v{^ia4`fkd=3p<6XkL)!lsI%8iq@>v^wpKCBiuxXbnp85`{i|;BM?Ba`lqTA
zyRm=UWJl&E{8JzYDHFu>*Z10-?#A8D|5jW9Ho0*CAs0fAy~MqbwYuOq9jjt9*nuHI
zbDwKvh)5Ir$r!fS5|;?Dt>V+@F*v8=TJJF)TdnC#Mk>+tGDGCw;A~^PC`gUt*<(|i
zB{{g{`uFehu`$fm4)&k7`u{xIV)yvA(%5SxX9MS80p2EKnL<HSdiWFiAy=3UmV-rj
zc%^|o`X!t!vuYErrUzbG?ostY(qs7GE^=Z33k*P+F6r($h_?W-bHJ|GUK@Wlv9++M
zG}?Z?8{_X${_c9aOXw4qfk0vTaVRH6FMOnFD?w|zo{zKKg$8wzW&yufWk&idB=+9!
z^dTI@g=>t<HJ%Cd%{u~X`lRpMFg&X{m?Nw#T4cg*?z{+rC($M4z9RHV@8KoueD7_)
z8T@i-6RG$5%_Y`lSjj|?wSvITK5c4g0!Uq49VAn-H<9~;vn7~hBdYuDOt2$gtNuBm
zo8$Y{2lwMxZNbfb$Hm0T528Og7Jfl!35edSr>CZ>tlX>*Z6nd&6-<c}7z{sZ9V^Ux
zMNgR3$iH97>Mv$5rHD*<Fmux@1NkgiA%VmyOAwal{&*L*?*@Cl?&!jtcf3KL{{|8z
z_($$R;SoAei#gUO@=7)M7s~2aAxJ>db;&IBK3KH&M<+ArlGXDRdX1VVO4)&R$f4<g
z`M~bg9+=(|cc^a3vB10?3GZiq$o|Zromh?lE2%m!alG4CIrvmRZHZVSM>NxXI>GBh
zSv|h>5GDAI(4E`@F?En<q4iBUtn-fux#Jt=qU6#PBE4-GhP)}OK!CI;i(sJ6^VIJF
zwJMEAeGKMb_^`VbA1hFYio)roSCrLG-NL5Yqhb{sh3_zt(Zg93UP*;!m?}k&V`1AB
zNYPri&yVkXW8uO1geXM3Oj&$G%~#Jd%h;?JDKwrq;P+!t&4W1Z^1?Ikguvk#bK?Bx
z$w5M*LxgRe=jz?UiDBbfC1I3!cjeMD*ueh4W0S*z6=TAf+ZYkG$}FGti`ipjpIK>W
zS>#c&Gw6~_XL`qQG4bK`W*>hek4LX*efn6|_MY+rXkNyAuu?NxS%L7~9tD3cn7&p(
zCtfqe6sjB&Q-Vs7BP5+%;#Gk};4xtwU!KY0XXbmkUy$kR9)!~?*v)qw00!+Yg^#H>
zc#8*z6zZo>+(bud?K<*!QO<vKd$8TBt^HLIw%iB>4ehiTCK&PD4G&n)Tr9X_3r-we
z?fI+}-G~Yn93gI6F{}Dw_SC*FLZ)5(85zp4%uubtD)J)UELLkvGk4#tw&Tuss<g@J
zd3(n+h;=s-joD7pea}*kl|?T5<3W!rK}V)#HpvFL3uRc{oe_mV<z1l~^m1_TkJDu3
z;JtNs6#g&&@E09TG{#Z`zh|EKwRTiJr)s50$5?Nrhn68HAr=rV#m>a)mTD$R2&O~{
zCI3>fr-!-b@EGRI%g0L8UU%%u_<;e9439JNV;4KSxd|78v+I+8^rmM<g+mx0&Si$a
zgf1uYC03KcCN)Lz!>f3f40Jb}wEszROD?xBZu>Ll3;sUIoNxDK3|j3*sam2tC@@e$
z^!;+AK>efeBJB%ALsQ{uFui)oD<x}JL&L^@dTz{b&_?*nsS;lNnoJ@(k9d5xVq$|w
z<ejC>oq()2USi?n=6C3#eetz?wPswc={I<8x=(8lE4EIsUfyGNZ{|KYn1IR|=E==f
z(;!A5(-2y^2xRFCSPqzHAZn5RCN_bp22T(KEtjA(rFZ%>a4@STrHZflxKoqe9Z4@^
zM*scx_y73<sFS1_?6+u!sT9fvjld*kU~edMy>?Q{<Kw(x)TAd1JfBpLz7(Nk)Jsdz
zj7#eyM{0^=a(C#N_pwZ(&^&zZP@5Qw`oUBRW0i<S2ql<0tEs~>vt6?~WEl?2q*;@8
z3M*&@%l)SQmXkcUm)d@GT2#JdzhfSAP9|n#C;$E8X|pwD!r#X?0P>0ZisQ~TNqupW
z*lUY~+ikD`vQb?@SAWX#r*Y+;=_|oacL$2CL$^(mV}aKO77pg}O+-=T1oLBT5sL2i
z42Qth<Jh0Ysw=K%u7GarF`3bIM1>2+0@C`c+*D0*5!qy26sis<9a7>LN2{z%Qj49t
z=L@x`4$ALHb*3COHoT?5S_c(Hs}g!V>W^=6Q0}zaubkDn)(lTax0+!+%B}9Vqw6{H
zvL|BRM`O<@;eVi1DzM!tXtBrA20Ce@^Jz|>%X-t`vi-%WweXCh_LhI#bUg2*pcP~R
z*RuTUzBKLXO~~uMd&o$v3@d0shHfUjC6c539PE6rF&;Ufa(Rw@K1*m7?f5)t`MjH0
z)_V(cajV5Am>f!kWcI@5rE8t6$S>5M=k=aRZROH6fA^jJp~2NlR4;Q2>L$7F#RT#9
z>4@1RhWG`Khy>P2j1Yx^BBL{S`niMaxlSWV-JBU0-T9zZ%>7mR3l$~QV$({o0;jTI
ze5=cN^!Bc2bT|BcojXp~K#2cM>OTe*cM{Kg-j*CkiW)EGQot^}s;cy8_1_@JA0Whq
zlrNr+R;Efa+`6N)s5rH*|E)nYZ3uqkk2C(E7@A|3YI`ozP~9Lexx#*1(r8luq+YPk
z{J}c$<WQa$CfVIhsE>s`<i2`cEPYHzF!ZIy?L$}MhAPFqQe@_8Lh#cQAH~-zZ5p$u
zZauEKr<oluR2T6z2A|B^#roi2jr3F<X4&!ZjiXo?9nIbJ4iAii=A_@&#n$TqH^#R&
z{$qMQO7u^&7KEB6l{H~A;ylPsJw2kA4#E2@7dO%lsi+3{VJ4?~e4(Bz-tw&^YR9P1
zTlpCH(W_%+@#|?%RN0HM=U?pU5$E2f<RPK1fw%3KLs--hd|lj})1h|Y<6CA3NsuSI
zl=<<g*vcJW=6yZY`aXe5QUB~awgg5fxlu%7u#A8=UXt61U-7wGtR{L&XvKbUf-}PL
z<eXA6<<r^;=`XwtFN1~2J^$Y${#Q0Tyev?j!*Z4q^mjQ4ah)uW_s=JkrRS%l*Ut`>
zPM35Fx(YWB3Z5IYnN+L_4|jaR(5iWJi2~l&xy}aU7kW?o-V*6Av2wyZTG!E2KSW2*
zGRLQkQU;Oz##ie-Z4fI)WSRxn$(ZcD;TL+;^r=a4(G~H3ZhK$lSXZj?cvyY8%d9JM
zzc3#pD^W_QnWy#rx#;<pgDoauRid_B6w$J6XKKeAcZHU9rH9=s!y`%~e@hGc<c#A7
zRRTR`&dt`*;~VYcVGk-~aNB!?q#4B&%52?dI@=%LQ>c&N@sqHhrnHRmj<I9Tx4aSD
zVUQ}9lh=Kd&QIx0uCqYm3pFs_*L;b|$xyZks(AAwgYsH85PAL~ndH7DNUoZKBHCWu
z_<;@&ed^tpoO=DG4Hem|2>#i;s%zLm6SE(n&BWpd&f7>XnjV}OlZntI70fq%8~9<7
zMYaw`E-rp49-oC1N_uZTo)Cu%RR2QWdHpzQIcNsoDp`3xfP+`gI?tVQZ4X={qU?(n
zV>0ASES^Xuc;9JBji{)RnFL(Lez;8XbB1uWaMp@p?7xhXk6V#!6B@aP4Rz7-K%a>i
z?fvf}va_DGUXlI#4--`A3qK7J?-HwnG7O~H2;zR~RLW)_^#La!=}+>KW#anZ{|^D3
B7G?kd

literal 0
HcmV?d00001

diff --git a/modules/admin/tpl/img/glyphicons-halflings.png b/modules/admin/tpl/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..79bc568c21395d5a5ceab62fadb04457094b2ac7
GIT binary patch
literal 13826
zcma)jby!<pvo57jT3VnjRw(W+rMSBlC%6<sa0rq>@B+o%-915yyF0YFyB4?Ne(CRg
z-#O<#&wb84`D17H-t*49Gi$BAvS#fBDJx22pcA4aAt7PN%1EdpAw8RXk~3bSJRMO{
zLOPzl2q2PL5H+wV#M#IJgd}PLHU^Q&+8CLER6#~2F82K(0VJg7mlo<;5G{o-d_b@b
zi_u>l7MP9Q6B-FgKp19c1hfJ{$c#Z|7Pf*EM~$r%WELiZ6q=k0YzlVbAae^DR|k-q
ztD-v4)e6XKLLn?fCII7mGGGIO7?HtjtZg0nV1g9?*yVeY|6XRLAp1uJVkJoNAEdMt
zl*z=w4j?j47B*%e8y7nn*Jl>?&uqM(d6~#Qv9YtUvVUS_<7Q@O<KyJ!V`C@#*N5WC
zn}dldpQ?n^zkEHN2~wCtAa;DLtj^BPEY2J(U<Wf+c3xgyR<=*9pFS}^X)rsw*g}k8
z%(jk{|F$3jas)b9*g-77wq$=T8X1G35J8G3rvDLwjh%wRe;T%R{8yr$QpO51vSVdu
zVPmzi`5V_i+Kv!a(0|eRe`-6byV!wPRY8tmr~~k+JxnS84Sveq|Lo}BiYCDS)U$&+
zSpO5J36K?J4YC2*LL8q+vH!#9i8-H=gT+$=8d*z#fzZEqWhDeDpim1FJ}yp4E)HHc
zE*>s%DRy=VF;OnbPZB&l+~Sg=;$olKxc@r)Yv8{FpRTZ&JYl7zK5_7had2=;im|h^
zOS1E@^NNabNpOiuiHY)jW|#UmR@T-LVq^;h{dM{mYw=&$PyZv9Puu}y1OYp!gTdDS
z?kdXWU<laJ9BfA>uEt5GU<9<V{d@km9sk7?<Y3_hGLdos+mQX!5PTN@FaP4)Pw{d;
zMfm9{cy@Lk9&s+Q&rkfto}%Cs7p3?Y*5tn>?B8*-aqzJHUs!SW&!V4sCD=ZRit}=F
za#FB9kud@CK`bEFpnvsHQESM*Bx{Smy@b!&$kyyB9n2;mQzNJ~ghI&7+QrV?0tmKs
zG<38vvbHufF><gHVEx+}tu3Cg|49E~hV{Q0|L5|5>%IThd>Rse#s3_OPbdF5nnAWt
zL)hVIta5&^8bd;2&ytl8Rfo+Tcz~_-Bx?#ZE2<3oUBe})+zpAGX&=O$_aCJBN!CBt
zv~LUxtg{dH^uI`jCU#YZa*6x&AyIg@k@bxImc$%rVne48BslqY$+TLFj(v37h7yfx
z$^jmG#g_Rs?ETA?`?LMJ^OpUDIY(RQdGlgR?XG$OKf8PyqRZyid2g!3%@a^C1igpD
z2NKzV@<YXZRzt=Y>|1wiF}EtKQRH|$CJJ9)q3e}#g7m#Zl(d`W;iCBregW~kz}j^J
z#1PLChA^$d<LD)~70v_u8SpMwUpU|RTUhXDv)4)u3eW>al^V@@cK(w}dv%n<F-yr_
zJ0+WOh5^r5g-3kpjp$U*8q>2!w4^wV*y35J)-xE{$fXwc@pa}RzJm5M)#tr)iJZA7
zBA<^jjwJWvLx1>RPDIS^k*z$pgpiQZ-O2S}m#&N|<ZTk;+zEBQ`}T`YP;Agku1%ac
zdF3IxhLoFKg}Z?o_sxo?wnxo1QJ#tQ0j@Fy_%e6=p|~NjSVmognN?94Ct|3$I9mgZ
zO?D9u#IiS6GUF<?b8ar}gj+Suy$D2^=xrE7H;g&{Mz}?<Fm}V()*|ag#&;#ta`-Oa
z^=C0_f4W-_@0F5?Z9A66x_f+MlrOGf5o`cAI76nho6V|j`w^uW^1&VLU0_(nk66Wq
zhn$cATio3d4$7C)9KKLSR)7%_ZzZw-IWo?79xFuyLQ;hgtOvv{<$R>A4@|nID3F1~
z+{<)-J1C8b8ezW2FI#g<tpPT)n7ulrvbvVga9EcuE6q8{<>otv2}C#wQERQ(Bd4_}
zR$QREVi8_9nE3}6@Vks1@*cVLJrSLt#`lb0$M?!xg%%C;C!jFg2$sX)U0bprNA043
zt1cd;7o<embPqXu;3>NIanP3?<(O0mgAc`)87;35OB;`nL3-yw7Fq`<#Hqz;v+Mj?
z%y|w07f93V#m`17f@xa3g&Kss@<20hE22A#Ba2fDjWQe?u<#pkgd4DKg$db>BIa`q
zqEeb}1&O#H`nWg^GT=P^c&c$+@UcRMn~k-y&+aN^ic}0j)s9vGd$m}}SL4iw!tr4e
z74SRhmFujYvTL$e!;=bil=GRdGp3UA1~R?@@XL?>oK21E-g3xj0Gu;SC|l|8wmd~d
zG@8i53Tu3s9ldBp@%(!A6E=rZOl&LAvv1Nkj=ysQ(9(~g-8X6}A>#Y#1a(KQ1TAh(
z`*b|k%zN|vOG$C7_4PTiy8Lhr&r<ZAXnKecw+cwDu!BCqvZ4FFw_Yjl(R>Z~I!*iV
zG+W%bI&HR#n{T~n|CLrV#?k5#Et)n4f;XdM7~@Er-K9uS8vPNM>uZUibWxth=wqXp
zt{0wO*|bZs%9J3Y;Tj4)?d>OBZ>YUb@tFh)1KiKdOeB10_CBOTMml4P#hsP|NnH`$
zn8C$aG#8|gqT#i}vYTeH^aF(r1JFKcz$K3~!6}2FX0@^RHCL+33v-FhYXz#e!VN4~
z3pAY$kL`HvPAaz%ZKvX4N680T6G=`cF|!UT=iU?gUR}#z>rLnIjH4UiW&X!Z2Ih$B
z#MDHe_%!Yd4!bTFMGeNcO(+vEfWe=Y&#$#Dh_vk`s>hf<^Bj2jofdTiH?Cvh55o&b
zE2N(49<70oDa2DrZnfjbhn{Jl;CT6QCOL517j<Kfllf||_!IT}3nidZhU{i>sNXxh
ztk>S%Nl!1kKE!_Y1E%82zuk(#fmi4VMZZ|C9XG#t=_a%pE(?AS@K%j{n=lj?kEKY<
zW|3b0>CWE2bkN^RapDK@3*dIhwI~%Mb87ZxnF|-bX;tNwFf}3s_Ti{S8}(TUA=c4(
zY2Z!UZS&H=Pk;r%irg?jcz?{s!|V*#QA4{2Fzp37$r+}Z-K{*#DE7B^Inz!%Q9nU}
zU%!E(b~61SJ_R5KSY88G!*+2Crm?Vp1DUFviD)lB1c&Atk+dP7K7{oK1?N#HTx(Jx
zis^|e#sUW_TPZE3IGu1R+xV`&BV&1NNkrD4j;(NEKdkpSdz8YLZ}ya474taW7yY@8
zsA-+N{3&saE60RSnI802s?NYn0KiULv+`y9hNB!6%B_qCFHMhVOa;O!ge!LzPKbk(
zbOnDN{s12ui~i)C55qt9+S4F%_rqna@M}~Kvh3z-^-K67%2T=8H8g<_=LYj#`6IF<
z&#}t=5w#4@^{y}B4J8rm?|c7nu!l2bJZ`U-W4@aT)V{Bm!c%#8HewtNPwZ4>dYBdQ
z$`?MJMLJt7`j`p7Y7C@WWmQu(B(vQ&FMa>ZZpX>;(|`+m?2Yl|fhX43DejM5BMl`?
zr(v=9l4R8Y3}+Abj6x1X^T?$#`1;s>I24lFFFn~&HRgQK%%Ey(mn=20z;U>um1z~Q
zJG*-wAw;tG!?{U#JnA5M5rX*u%NF+}y;0xPbTQppWv;^8{aGUxG$gD!0YAlLo;KuE
zkFzemm@vHoQYYv<_b|t(esPHC%z-nLF5Q9^?&hl?0?g0d9hVSdDc=X~B?dQzaRfp;
z+2*{_ss{}_cv+!%k7WX20;r5{GER*rd{={D1l}-^Se~*W+_M}?z+w9HX;SR@AB6by
zI0}UM&nJY!1O!_&a8xRuf`=D<FjP6|{7s(tH$M}t2T`75E8=F2xS|LWlK5A6gIXAX
zTp>rhp4bwFD4GN;7|wXEpdq}@{E+u#{VT}-UEwtWPkxKl^Wa8Qi?#AQLxY4w+?_Y4
zd1glMwHFc0bg<G&^bpHR;@Ouu+r_01?D0$dqx{~6nvaQNR1kf^#hdN5oK_ZtI10m1
z14|EOja-ZqM<Xd_(i29l*wJ)W8&DWvdbgt*j%%OPd_}^)mUt{Ac|ZKw+k`3DaqhCQ
z%VcB|KHi^tR-@&;?!Fa(-+^H~sn|Y1Y!*i6SA5tj-M$Wge0UQaSuqimc27_}WVx-z
z<S{rC&+b;eRj`={xAlOW)V*13W<iEvwv_65*m36HwS=6&ofwLn2dcjtyp6?bX#5;R
zI1-f(Mpfm`mg*s3#MYP)MjpIT0(ZNnF7ZW&M?zeUqF_=Xc3kN+7l%E%-f^n*V<xsH
zRetif3(IjLlO5d)mVa<d6V+E$%y6j~){5~EF9-YAwnHmYDv|X@e9IOkM6u+as}}8+
zVg)KO?5%ewX<?(dli9u&;h*BbHhW+|QM|rNQ}j4)jGxAavk&{#?oPmZ>lfOS-7V_h
zjsOP>)fG0TPo!`fIkeDn-b_WlxJH)NqQqX{Cjt1+PPI$%JFTSWT#$Mj_6O?PY#fK3
zMy<B*OqFdohsbY4|0K5#Qr9nT$fU?ff$xHr3oBh=A%!S&tIQ5*ll&JaV^{~P&5-ED
z@-laI=ybsP=J`7qg8MuALo<WGREzRA6jZsnboFU8<mC^|LcGb})e*9bFgHMv!+DV%
z?WGPNh-p4mH<s+uLJ=S&*o0~LJTB0OGq>2&j?Y~|h<k&am-M7~G%k8*DNGs=Gv!R@
zsN}tTp|kDGDnPauoEHD?do|A3Ga>c!Xla$G$#xZ0%<v(2VY-|dCnPN4L1foERl;mL
zIs5ukyc(tC%z7zSSyYn{5f*>AyTx!yYt=5!)nk&0@J-$=t?&(X;8%~rQYD<{9lr1z
zs@8X~WZq3R1+cmT>`KWeE&^_UF>|q&Ay^}*sN63yo7B9nz}D!eQt$6m26sKn>O<zt
zm$-|ltznPdJjZ_x&Bv}On~iy;ZMGv1*azWrSG(s<$nw@fHDX+J1|b?HiID={Uw>$P
zmvsnQ7b9nJQ46`zs$s*Wtto!ux2}?)U%;Z5%hb7!$w!&8C`>TRG+*DdD0JLss5Xff
zBThm&kGp*Qxmrsc3GjV@6TVB6)l|r!wyRJP)U%eM@Of-k4FDYmUY)1+7EUyRGbs_`
zleaIf78kfz<{vx`Ls^b4Ogd8_rSR#I2AH%NK)|Vfh#}z~2k0bJcEvc$3He?p;bGVK
zyam;#Nl5X&J8j^k<~QS18sq4NPR$kE>m%=`^Ki#+ieK<Qw=A%osf*UK7?G&Gh21cC
zp7JDoZ<uJt%XQEDUQg<1#>pZYF?TTM<e!zSLCW}zk|DhK;hCLL$uyC!mqq~GD%^(8
zteXuv7WL;s!lKK{Mwl|d<Yqttpq~c#neitbZ?7}X)kytDN61;L{VHFIF_yf(5DP&p
z>#Jv80{<7eYn$&q2aN=p)lq6fG9}Dv2}g_RSVx*Iv-0C}kEWsUw>e$24l?hUH3zqG
z2Sa%=_ql^t*`t3yW7`PZ(-yol6mNfiUV1c7e)%BgzOh%HQQd^uq9gC3O*vPSi&V!$
zuJ-gy-6_@)r?@+~#wK<ALw@|WgiC-xvIy&qvuO1p;x!mtoY}#Dgr9citM0K#-<q5)
zjwsU|j7v6zeG4x;D}-}6lE}KLKqXG%eNdJ5y9Ap0J|apfjtjU3p+_MnYFGkM=7z8{
z{Hg>_V|QHgllM9B^dZanl<c344}r_4_d+IKQp$P>nPLZqhL-@Wql1PDLO_j>7Nz?o
z+_&sbFV42Gr7019rPl3IUH2}h2Wl+<I2~)RB+PUc+yr5Gl?`yTf0C3t(arML0{C?f
zD`dgLhb(V>=p46k?>x70Pnt9Gn_CduyDht`=S4b}9&F^387k|mAZg2^t9(aD+I+W{
z#<roC*)acB<WWuL({HqioU79@Hs0pNGBYOr-#G{1mAfEvQ+@|vGrtp!Ma#v`QM2r%
zHk3Z|g-Zr}Ol(qZbh0Eu$Ut-Y^2P4BAN&AiaV|0pJUv=JIYO=IlBxFRPj&xFgAlZA
znp%8AZ1Fe9E;24LZ9D((dhUOky8f?Ot+-9kD>iMaSJ%Slg$*$}d;|(Q|7`BKm3z9)
zh-*c!-WX<4{kD>(FE8TvP+#HUL}QrAKt*0vVL7!~ovM)?Ur`?N{))Ew;yk>PkfjG-
z*)^I$qo~mV?U!~Gwi(1*M)0+vT9Jy~`kGC^1<}kh2R4PgR^?53j%>|Ns{2kn=ewGn
zvPvguwaHo(xrDKI-<Zt$iNoHLjvS=oy#mS~RbTx?$4KiwSIRy!DHImhe8$p+=qChS
zSjtM_A|?tL<Ra@N7MylCUzWcLi2ku)^$Uu;V;!WRC0c%m43RzX$`{HV(v101Bs%hj
znmgw!ePH8R(0N2*n=YOCE*G)2{oZ(^+hV1b!VYm5x}hEy$cPr|qR-CI4=E~OShmtv
zi&n$sM5Q2PXzPaIYBwjBG^yLTjfKU(N^oHRg2;r((+33M-7L24q$i=|Sa*@_h8j<u
zpfUiky^f>r{x~q$onf~4u$MK|{q*`g)sDyNO(})q!R?7xZH;c=m6iWiHEU8Q0KT-e
zKaAgECVApd!3(FjK2!e|a^g^-5f7L7jB^GFCrwQ_*B`o?=jeoDN_*x+cXrv8gf$<x
z)wBYjD7J8&@}8K?SMKq00Bb;8psxMk4pSA4T(Z@nRt|CI3%Qr(j3h|31e{|GQgLE{
z*t59FuBF)DIxNFL`O_KA)l<a=^dH;?Qd0w}lT&H;`D9vG{_m9!h%<;%i5B?Ne-5$^
z?uUEOLC@viez2kZ>36NQ*!QC!Kwg5~wLak^RyUvu(CifB7CA>(1lu6}+<NHN`5t?-
zAuE(ME~MwCd*L1h>@1^DvB!>VYXX?9Ys*9wd&0abG}7TGJ`Ws<urompG(L@rxP6fT
z<+mE&Tc^32f#*HblnvLC!Hw$=42g7>H;FX_s&}n4v(1m|Q)++R8J>#?XO`$8g+3q`
zwN~X&6{@){!8Q1(2!in4P8(_gYuOhhFGZ;=C-6kTb%~vBQQ*b-=z*J+>E;6ujm;wX
zvb?kY(oC=+ca4)i4a#h@{dTzWSLS3ag^66Gpkn{ke!AC9A{1jMRP%OcQ)<<@nxJH}
zZIr?|jBinPoiR)snBOcecjcb@Wuh3my1iVRzl-u;gB}~Rjhub`?Cfu)nPL3L+b$kL
zO32z2XK-0_shy`%ZT9<2V<1qI5Rel|E7W{`Hg#M|m&O0`Ua-&p;v}tapS>wTE*On`
z756q!EO*AN?oxlV&@ybUeVWd1q~Tg`kpqG}F@V;VsN#&)R^`V00X5}(4*PmNqShEg
zQ<r?Laox*hYFR-DSEc#*L4r99UZdz4HnSo|Y>ih?Ga1nmgvx@-!Wngeg;A+L{F-(i
zf_X7=?WU?j|23>ePpP8OODXHU69Lw_MmSudzHtic8)MWn1BPdI_Ae4ykPB0u9il*G
zJ?$Q@);~I`)dd=AQuaxcTe2HSse|E|ii5U_*5>3~bz~#PL%91W(Nyd|=|ZA6*w`c7
z$R1sRD@XhF^&4gJ#exDQRqq3%$Y|oPc!wXV-=n37^UJ=Olj%RP#gEAol|$!AAbjxW
zXq&hxEZQyPL4JOa6I*343W#)9&u%!GDhw_3B>yJ7)O`Ae76GRZenb(|eWOMZU_spF
zuD{--T)B0<*4E?|ri0F<=p!twyj!hH;HlUN0Htt?hj8zO#!~F83W<H$n$)>|K9Lvq
z3{RaoPbjaDFu@z{^qW3cjj7kS$GR|;9I%R~LZ@6(ENvrteZFbkkow-9p%qZBx>J+M
zq8}TEyApxpU@n((iw0bRrJvc6Cd$y8wbf4?-w4%S5$Slysc^DTKW~+Y`!?zI;_DZL
zV9KO0`~P=A@%O2`KlPzF{xwsO>z5=mqo0Z23o-D!NekrdbEa^%TfV56v|FDM?4cKX
z@rrk@JJ?1_5irzO66hc^C*{*Ke&o=Ijw!R*ZAgtQC0ezeL17SocQu_m!6VUsNTcVG
zpwRaCZCIJ=OR~@li`X(c8LO9k&wjr&0Gd_GRou<{3Hu`Css}PU72iy4PZtFd(l9VK
zR)fk*&dPTy&yMX{o8@~bPnX0_Q@UX-RN+o|sC$;fpA|xTEugMj7@)yJ{4@bO3x^+O
zH0OTqp<RAP_eoKoS*kD@HNIqveerrB(WqveX5J|YlEjj-`IXx?Xh~5rz}&sLr&rS8
zJwKJPn{*PhgL5^sKck|@Ul*<IMz?uHOqzQ5lVrKwvIK(ogIPBb7yhQf{E=?FTXkrx
zv)73CU6=fZMWj}vHoPrlpXdzluwsZdiMi*L+P<oiPOCt$GncS_K4Zbf_fh6B0sn=L
zh{)7yj|!hD_ph&=*RgG+D@w0Lr1t1~r}(T+ve6xMn@f02WC&2Wy-@#T?kuQgg?rBv
zvT*4M)Z)d*0T_?zr;v<zUw*C5)SaRq49N4W!wHYEyQg;%&xr&mW>82(iEah+>0QWS
z$@9x&MNFG_ayE3OJxi@l$%9i2{OAD1go<gf3V@m!i1%!V>7t5}Sv8p*L*?_XV-Inr
zpe~mOfBekpsM*iZA4B0U-_aDDuQGQ>$du+c-pHfXyBaLv@T`?*-je(+>E!q1bXa1q
z14-*PWvM+oFg<Lt2k=(J>(z{YlRS2em5Pw1U1&De`{t$Pg={frAk6|^cDRB$0e*ut
zvJ=N0<2rG{&|2ECVoU=~V0R9rfUWk0Z${R3(A&#kkMCPoz`s?k7N+_8!1v32J*zyO
z<vKi}dMCpcI-XcsUIYMCp<^+WAMWB2?K_TExH&TtFVD3KItG5**3HDL?JNCmt)WLY
z)qS>R9Lv<X`IX+Ro;bt_cZ*k&9Y+x%T``~<*T@t`XaIxP5n$}uD#?YN1u>8#NK_E;
zsf^8eBN5l`rT5}^m`=Z(Oaw_(G`KLa6xX%V@W0keWi;An4+N4QThS_k{n&Vyk{0<f
zS1qfF9)I4aMdDat>!?N_d)(8r)?>J|F`-ZusfRTzNO)+h%L=-)$92e&Ck?1oAE(~~
z$-n~o0g*n;RB*mqiaAn=Wlm0w2D6Yu&4fY#;MU1bvU(~NK6m1FUoPk+w;|b?nzGkO
z_PUIl=pfDRhrLvm<;sb9>BFB~S<kKbw}|$#0<KC|f^!EQ<?3GNuT1Sh3~C%}%~@{z
zv{3NCe7Yh4O`dmeLFX@t7X`vCM^kE(9#{|Tk=#$W(79O4)`j>c4oJ;hS&xb#O~;<s
zdj!PUYcC`_V-z{W$MSke`EQthau4GPXOEhJR-v~USY?i}s4-M<C(<SUp*>Q7(2b8<
zQ9Hg8isf_ddK#6OY$>r#Kxz@D+gtkY>hy|#o8Z-=^bH`o)WbuhhdK98@PHbw2Zt=7
zV$-oYeC$U<;|<RNsVN_;RY&*bM_6iWdKNbB!Qyw=M&u%f9C2-nSr2AB@UTUm22k^0
z9b0l^vyAE;f3)EvifqbYqzV{@t0WMKV{i&(pdd?%5t2}iBu{QSR;(Eq)Yn_;5MRu!
zgE=M7>pnaU4187;%~hxdnq*JOnEGam?8hex6Iy=ZlWGzZv<Ng6Bh#xQm|za2a1T7f
zy3@YQ?ZREouiH|}E?|<k;3#@k$#(mv|EW)Rns$`%#jBo-E{tr6<(iHqCd=iRT1>-4
zoJ{KX4x(J5=P>qor+5;Qvhp3GFBpXJ9fO3crB!vqua&Y$iFJdsGsQL15;##Wtx)a!
zYY)JHGBW`d%x6ZI`{f6_r^+OdBbZk{<-B0y4iS|--^SLDWVMu&VT?M2Z|8*E=pfeq
z);Kt;$?dDKuIJvdZG|d_=QWvbk?X!+UMjWng_S4uk_M}7f`V03>h!f-=Qxpm9ReU7
za!V9@Dytw&Y;Dn_tG@+O7`;DiSse1^ilx|o^~@+CRqBxKgXtuFTdkV9s}V3?Sy6{S
z*XctI(Eyb3h^4g}R#0C=Al$1x3GX$~3fA}}eX>>DF+LFj4zJ()a-xd1d6P?W{`m*D
z*x%43iLpP6D8xOj1Z<^h)%1C*{<mv_xLF9)wG|AzC92rp7%TSb_Mk)J4Bn~A@3s{y
z8Eeq2FrMmC&9hJ};2tvPYhLDV;t3fH9G&M#I_TS-C{Vph0eQ=l8My@M;P3j>`|uBM
zAKe~zJa>J<dAp4Cr`E;kV=OOI(9RIrRhyS<gvu4veiksC@PE|IzcVqIC|=lfwEvCE
z<<y<3Q@cDWXj+8Lf6Ebj6C1qDuQ(2<A$5_O2YoIyQjmyikmi<~q(e`)JV^Q0m1Foy
z>T4Tqn|wxn>-+P9_i;yHBP@*ap6jMJgu7>d2GIq{>J`g;o%tKlmpM-RrSw{_pAKK;
zSq)!`7M=VE#*z4?xSu<n;nZp#Mmvumi6eW_H%R8hFwHi!LjtaQ-8yfFA3}M(asH04
z|Dr<-qY2llUa?3RJ%W2kx|%pd5yOfu7GEL9Z=<2q_FTtJxzzzTC!oLwM(c#BsCI1h
zRzySqy>gikUTPD}y7GXhB{U`6@}s8z0d@C`F9EQ3#s|A3?{zk{KOin$?&5UgsTdnL
zO1i!hQhbL?LiIIX*RA*iV$<q?e)IJ+<v5md0KRFXq47Ca^G6bw`pt&otolRtGk>~)
zB>zWXKyBeJC4}W_3SGU)PQseJzO;g~99>U&xx8@V2Qp$StzgO_?GxT!9UmQV2vt-^
zkab;==s?$tI#Akh4J+G|pAPYZQ5vA(8|@a9T2-p=)uPN<Lnig%WBf;pJE$vh6VJre
zcSa^lfh4lnh(Egb1XNdA!m7G{0rq}=rBHCiZg!}umpz)LzA=u4>{@6f@tmW11S)1s
z<dACJAv=ONwMWqE>!h%|zyG6Dc);F%IdWaK*t#r*khD51^8Ay)ixzUtt=#AX2VmjE
zOFg-|2AdD>SmMSf?bo9uRB)zYaT{m9I%7Vs)$dLGX>bj<#I2?S8OUQRh(mJrJhADZ
zT_^gL-3m0*JIokIbOUyiA8<V#BAI>3%98nW2{Wp2BW5akVi?klylc_3UwSpIlPTwb
zEIG-t+<qR#EIUhUXpna4y6Mcw;r)6g`~DbH#cK1a2cg0|%feb5OsHo&K8fl?XWHgh
z%Cfu*=WZ$#66ENu8Ly}-P7+g(q8`E!BIitlN{pOU<u;Xleazlc%I-&b+~jM<Tv}}H
zJ4w@)u0LPUA)*FsqV0b%PA`-bAbATf|DkF&)83fUO*(ud^znyThey0%MfPsYmkHlJ
z5?yv86?>EJ;a3(OZ-sGt+R_j^Z;x|qvj<LkYxslf@>Br|7-{wn4kOG&^GRt$u`kMx
zzV;Zy-UA7<<lmI2>xMJg(rd2`sKuS9&FoYuUoug>t*^~eJTjg>pWcBUABu-7%@{xM
zICt)A_$aq9KQ1!{${`~7GXd+8ZDmu`rjx$oiC@GP<}zwn_dR8&M)WQdC&iw3E)YGG
z>3e7ZNZUGzmYhW2?kKOPphuHB2q3zn7e!n3V8t*?@hpE5fc7snCI0l&iE)SiOs<Kf
zL!Z&na0_)e@@<g4eE)m=8Vr>(W%=b1^y8b;aHjB&KaO|McF*t%v`zlW*&h5@1@_C^
zu@=`+#rV2TS56Ee<a+Mhi{hYf9E$Qnk$Y2>Ch=>uP<-lPc^}fc208qOOb9~TKo;7L
zA~1!rYZOt)&{UFvJI5a$VIW+Rn=eIQsZ^sU)8hNGK};PpknpE84hIhht07)(ER+4_
zxLhMx$;116i@tQodN*XTcFS{<u5=vYD&H9rs*yKPMwHIa@82$a(JxiKmYw5f{fo2W
zWsy(=jDJ+J%h88)ISY?WAIBQIP$l`a!j$B=(v<qsc8lY#JdW!pS#EiE>`!fPjk0n}
z1udu3=k`@uaQK?j)YF!Z2n<rYCwJ&&vfLK(02y+tX(C$F7Uteyiy=1?-OFP4_+9AM
zX8+ofOnluRbzHt|UYpJ2?8d3_o%@H??oi)Q{owPmDQ5y^NQTDitY8T0cN==`1>=fc
zY`~>$*#BZX<DZ(47QvhNUkB_ZUw>+mGk=DFM0Z|L3%DK(H(w+__!4UF`kf9Jf(YzE
zR+p>6%a^g;g${|zdmK6-Gj(({7pl{TV*3&Z!Tg4cKvV0j;*Hb(Z#qmw#wdm`wZ8ts
zjI<!fi62>UMJ<g_X2DY-{x%R2rvh0bvjRCk8Z^_8A3Ma}!w^zvY<}uKk8aT8gU8E5
zM3t~ytrX?R)4Lt=jBVXqlb@^6)j6Z7cLsgtx?(TYd=C>`h#Vh4=S1zDw~a^H)q+6{
z#Hz!oYPE7ZFi~~AG7n#q$;s}pANs@VyV5vhU2&d`=@Es*pQh}pgHHCW`KB+GEa9ck
zW`9DlW`Wvi6+8Jp#bM-ebD50CjykM&Y5Nb{=n_#L!>gatGhc`j`D$a>B*m5@1=_tY
z1!7V55YfU?hSlU@@flw?^BFXCnLzGQ5nOAvVvjQP>otW|mQj7Pc1evAEdaVt_O7si
zLf)Opv3>@Ky-^Y?)9yR;H}8pcbX&{bu?-8JE^rhUOvU2ko_d9PU&9pXO^>cRZ#zZo
zCkq39jb4}nCKp>1oQXcr)#BC}eH;uS!al|lo`b0S;{)B1C!B9NGJ7sRRf8<l^_hN?
z8|uYrqM{IBNxPv(oEL2Cdlwsw%%i5EF8VF^>u~;@IH-gDB{~GwmgyVn+go-vI%&pi
z&YpjGP!eesJV1P}>w0bDVqj#o(Td$rcY=Dy(vmsW4Lu7vblFZ1AkwFt&8yEeH+$MF
z-`f?Kpo$}2=fdkh7scLN3X|LFczR*OC>3vQN$>T`HJ{7Et7(nPTo6piDNA7Mqp<sW
zK+Ob=g&|&xy}#?;o8jZwe*M>=3RT0d>DNW?+-b;wgbWc@xKrOgn@*hcG0Bl300~zM
z1cqJaF;{x*c%r%A4-dBquj5*G&bu!gKwoO_nS;LQT^1W`?RvhSP_8$3==>+aY-PTt
z>bq-vSj!54>+X4cy9uFc7n4e89$<D@TYO6Nosj>B@NcVD5A-ZJOxHgc`}0Xekmrnv
zFXt>J(de%xG=HqM%#sdc`1MGQF^WDoQiWxMaI(4dHmX&4!LlBo`(Of>F#wiHG2!fZ
zvB{2Q#2#f}GF24rrVMQV1q+OtDek8cd8z74b#rGk91~90<Nof;8ws)6dr)wA!~=2#
z%NOqFB6$o)>FBtkjwVnD<aq=diRRv#2Eb?~1Wgs-9v>n53id&|26Z`rO1<>1bMNki
zIionO>*HS1J4(aUYgwsF#kSB3LoKM6=_L4awnOEIti-PdFWHKvSHkYopzzkmO{#f!
zBCp*D{8xF0vlect8R3v&sfl^TuDXSf&P%wC74{#9?N5X!pC24<NDwbK+k|<bffHE2
zj_1I|)ypkjr4^qDsNAc%>A7h4?)2V-9N|c{C;w5wl|z8<2X0es$`*M5j(oF{0r&32
z`U~-Q8qfbA;nM54%Pd-|nK@0LdSA=5KyqV*g)A>?W!gQiNj|kKfej`z+TWeH!`Hpg
z4x)z(>^8nLqTC<9RW5iJvCjWHv7}1afGXDDjvlcDu^s2txL;E`C?VN3k?3wy4?Rg4
znmrvze0;v4z1-miFC~klv>fjZbDDi1Sb3^nk~4(v>AQ0kEgcS!BT@@JF<B7r4i%JP
z1@}jL(wq;Qor!ZFFL|Z8kW`8Wwl@6Um(?fAYD(9_EpgY;RMp+%4cxVt{b&-Zyv&|f
z9Z>n156+M2%+9d~_aj?sf*d7G$H=KZ+;~_5OXv~HkLZB`D1C0=ySHh6%$1n_d9W{Z
z&m>oGu#UW7!b=#@N;S*cUt1_&zh6G6Pp&1MS&qW^nP8>f9Vydi7A|Q=nJs1UqHe~%
zo8!0@d07eTQ)zRgq2lRbPX=U9X)}<}K~;F^6$@(xJg{M=ogF(BJK$Va())Mp;3$9P
zb1zLrct_$*_$9%}3(n0%gfU}7>#&k71PXy}!LO#cR3p!xc`NR8zFQw{A$DKq6Oeuw
z;ZC#iv;VMss-vmXR&ElJ5dxInx1l|}uEaG5i80LcV~4TkD%!RUD@5+~l+kiSOpS0(
zJ-iwpm}JCR@Sy?BW$_tvO%K-fQUFm-UCi;NK$-MsQoWnQXO+(qUd!{zFS!JepUfxD
zmmoFLB>{OkHam{gP2#GXZaq&=xio1Kop4j#`<I9IR437^u2WBDoOT##CDGJo@`aXn
zcGq@Qs#lGtH^+5F(=h+UCnD5ei)1W(>v}Qz6U1D0dc!ks4ikn<VWy}wXIzP|Vcj2*
z&Z#B(9CwK~tO?2Nf(5I}agU=3IXyyO)y7@hzG*G3qWqp8;V}sAT>{Y6ti#ZeqYgF+
z0jQIIQUvnReW)_53Z+>u>)Lw((~vxa6AFrr%d}nI!o7{spwl@ir`qH9j7o=6JXYD|
zsp>X-yI}#VHc1S{c}{E<G~;94lR1{tAiL<~RNW{EBJE$jm(S|=>|acAh>zF%*}R`4
zM+xtI9F&>Xs(IJooneFYo;l{cU*-2DT~2TUm;QwTC9RXwFSwqHS82mcZmDj8xVn(+
zhjg5e>~E9?3K-*RvJ)uCq0UIdRl~D85$B^#Nph2%)6FN1>6!u6+%oE;F=J5B=`W{`
zL<6;Qu8Pq|0+tS%yP10nmIgUV^r%Hyjyo|#W0hIVR`qiw@r)O7`K*l4Ma$$u=XQc$
z^#q3KLI6#VtuIxX4b;#_lx#bieZGmNS8?8jxHeTsE52O+t4ih5iw}=p7@DZs*!jev
z{i#&SO#GsN^zjC{G<~Nu|2>~?q2Z@<H(id)lLc>)UnNDB&2?wHQCn?p9v7YpNRPW1
zWM9#550th&<~(gv_Sok5g3e8tnTzkV2|gxe#kE{nUT{aP8n5=}qg4mCp!JuEcz=Ht
z&y3I7&uxdKU%P7D+5NV%Ok}hj@mimhKlv+R1bd8?zb|20JJD?Q?=vElsc#c2!VJmq
z&W&vW+CaWx`FG1VfMsEf)`p}0TTes}|I{%_X{<jeTvT>vj;}wDxh!zb$|D=4e756H
z7dp8?Ul~60@eSwbY!+Crzr*mLMSqj6ofW&@mJB8fIGm%=B28`wnbx8F8YnigN|~sB
z)ie@y57LaLin3|;u`JzFDsS0JCrG!Z4g+Nd*=-JadG7AesG5y*rMun?dHJhkCMW_%
zCa<Rq$dn3y^?_5xcYY-E4d<=7nSTFlb3KUGo~pc`vt34MsD@(n-78ySWJI^_=V->l
ztKYWr0+ECjETkqk!9jw#hv?D8BB>sVztP<9s&fY3kg7O(65kdl!pnzWhNl>mkKBOP
z9wGNuspXb&`T7gZLu#Y670KyIg|D$foZ^6CxK^NurqGjTAORgOb-D`MnNNRW8Xw=g
z8)`pHz^^@&DlTfcLBTlT7>c#c{d1Rs^_EM?6rpWz{8ZrZ3&E3&F=tOC;z<I4jZPAe
z*z~4-@QBOr*D0sNU)95$A<pzq1>Gnc>6#NjY1JQMZ!+8#j*!95<*U{5CE&b@6WIV=
z`L8w`z0>!&Y?@c9IUIXc)WVTOpF}^_=xxWoJZGv|AT41`N;g@MZhWeGa@pxlgGji8
zR3?G5Rb3_fNj8zy!w)Nl>leQXO0(UI&kdY+N-i0G7Z%q|`!Oo^N%yZLWCBLMop?7)
z`#d}b79JtI-AG(Fx@TIi!6u-D3-^!Dlae;43Yp1%MZ9XATQ^#ln*F21RntEEXZFkB
z`SV+qf>QWy^~x~X!#q&<(a*gW8Npq#5?J;o^<vsa44ZG5i&xC8mp5t3o$P7xZY1l~
z$E)V2RI$jK1!+4>D1<$rOl;PQ2b4cBvE-R>e$@3lbK}qIv=-<eG(bH&HC#EWd{A#l
zeduJ7rYYdKHNuC&#l~!XR`Azj3I(5q&XvpAE|yI00U`}orn<h1ffuN)^Rq42c6>-S
zEeI|aC9>S#V3jN>JO#=lUV`ja4_n@N34a(b9DsX~5L~fhJpe=AgZbr~VX+0ZQY{x^
z(k)K(A0~m<ch=gs)^5ya{8UlRxs4Zp4wN8$x{l`wN`eQ)$fo4icd2^<Aq2RHUgj@k
zwmOlkZl)sjMN3JvMaMO7gPN<7Cr{r=`?2Q3g@sNOqVHD(9vAK?Bn$Yavo<$c>NkFt
zA8e)|)*K0!nFmOg^$p@)RlWA0%f_jul)Ga}wOT-A_SHF)3v!5Ywj5XdkuSTR2s1b>
z60lzNZMkjx`b~_wapzIo-Eku>H`<lrjoG88{867$w1lOu7YIYgOVlGTtF~!G99+_d
zc8@P|AID=T3Bdc}4#aqc`|RTA2S;pP&CPP}iQuJvb+z2m1@UYL;;DW!UrWi@`LyY0
zr)l)M@1$n;-8%bA{8wtL<mUV9z?WE+_a|w~H1@h>NV#XFRgb*F@gDM&yDMiwX=D%B
zmzw)_!+<muKwP@Xpg(Q--KuPyNaT7q43!X&Hj)s~o}F;p7XtTmYs@+eU;&i)h9K+6
z+Tu8W(<O?$J;G6wq5j}FwODQTt2K-`ZgrY?FR8tRb$^<lEUsGa6E{7RaBL{?;oX#H
z>aX+zV8mY9at~%ev^rb^(0rwKSp(3};ZpMvxEwD2OjDaVA6Ry$0&8rtZV3pHxzf$?
zzAjYXA~;b|XCc95MUR%dTT@Z>0}uY<vX>+8y=;wW1vky{pKP;cOV}6&6tV$I;>`FK
z906wPfP<p%qof9_i{H^{B@Qy&O!tOL_|uLyf<C{y`NO8gqq)GL5iw}X(vP`Mnhrq*
z5CBR>rz9t=;&M?(W<zjs?gLlZcPE`~n%65Q@QX#0Ee$<PbgkRxDnV~*Ph*A^7B+P!
z`&YZrmews+XOgeTc&!0yMFa6A!i^M1GzYJHov(n-tyRG%Nj9g?vmQNrZxQ58F>wdm
z0?&;KzLQk84srC-9#ap*I_9GregSZjm<$6oiZ>h3ACEnS7A^faq{fPmD!rT69qQG%
zRVF#+RDZ(-Ue?g!$?;NT#p=8F8SV%EZ5ry{-5J)UN6Jj~-klPlw7o4w&aUp0pn@@)
z<bP?_6W%h(V6ls&F+pyre)EZ%bR@eE0yPJ2#L@9rD9nyjM>M(jp3}a6rP@=sC1ZvM
zV)jL-HO|elZ@x|hHXkrmGu9<XL|VeL$%?T3@3*i&d2_n85LFbpLVs0<l>uS2%=Jqa
zgIqpCmA+s{=XewW1!<j?lWP5ARk55ql#eiE`Y|Eq&b@clRrT<7g3qz>LqE)3%%mIO
z(8jQbk;xApH`iS0;h7M96j^_3N=#|-xP-=*>3=obmL(W)Au>jdy3E<<nzLBzdkYP`
zgv^ldx9G10&!D|1uT^k=m_8;)(G^jV_)^e8Jj;LajvMfXWO=mZ8^^?Cu!2C>UjD;R
zOI^Va(lW(qH`MjF&}RqCOifgKKA39SANA9=Qv4z+3Qey|4BJBzex_v%9=l5D-x<Vl
zX>JaG`?IF#?EKul!io4R+`>v>t_65&VXqROwiMr@*>SD)gNHL4^Ml5(vgCqod<Tos
zRoOR4{<H^}-cB0QEU;IqB<~PQ7do$v6e*-u-7|4$SJ(Z<=3JXuQNwlwjTcY(hChrJ
zLgNx>Jjd$~XNSPzt@GziL=mgy;Y+qBZh&1qKxwm{>$kMCyH2rN?F2%^-bX#z9QBC|
zNx?aIaFXEMqAKsMWDfWB@Pt3@$5LZ%DVDT70icB1BXM`F_#4rYqTkpk%w<fYkBm>f
tVgFekgZM{XhA!KlmFcR^%iaf4$rSfz)nO-hfB%&wE2$_^D)!aq{{YOB6}SKZ

literal 0
HcmV?d00001

diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index e16bc3e02..990fb4428 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -98,7 +98,6 @@ jQuery(function($){
 	});
 	$(window).resize();
 
-
 	// Popup list : 'Move to site' and 'Site map'
 	$('.header>.siteTool>a.i')
 		.bind('before-open.tc', function(){
@@ -1167,7 +1166,7 @@ $('.filebox')
 
 });
 
-/* insert fog layer */
+// insert fog layer
 function showWaitingFogLayer() {
 	var $bg = jQuery('<span class="bg"></span>');
 	$bg.height(jQuery(window).height());
@@ -1181,7 +1180,8 @@ function hideWaitingFogLayer() {
 	jQuery('.wfsr').unwrap();
 }
 
-/* install module */
+
+// install module
 function doInstallModule(module) {
     var params = new Array();
     params['module_name'] = module;
@@ -1189,7 +1189,7 @@ function doInstallModule(module) {
 	showWaitingFogLayer();
 }
 
-/* upgrade module */
+// upgrade module
 function doUpdateModule(module) {
     var params = new Array();
     params['module_name'] = module;
@@ -1202,17 +1202,18 @@ function completeInstallModule(ret_obj) {
     location.reload();
 }
 
-jQuery(document).ready(function($){
+jQuery(function($){
 	$('body').ajaxComplete(function(){ hideWaitingFogLayer() });
 });
 
-/* admin single column layout */
+// 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
 	}
 });
-/* Details toggle in admin table */
+
+// Details toggle in admin table
 jQuery(function($){
 	var viewBtn = $('.x .dsTg span.side>button.text');
 	var tdTitle = $('.x .dsTg td.title');
@@ -1230,3 +1231,23 @@ jQuery(function($){
 		details.slideToggle(200);
 	});
 });
+
+// Toggle Content
+jQuery(function($){
+	var $h2h3 = $('.x .content .h2, .x .content .h3').not('.portlet .h2, .modal .h2');
+	$h2h3.each(function(){
+		var $sTog = $('<button type="button" class="sTog" title="Open/Close"><i class="icon-chevron-up"></i></button>');
+		$(this).append($sTog);
+		$sTog.click(function(){
+			var $t = $(this);
+			var $sTogObj = $t.parent().nextUntil('.h2, .h3').not('.langEdit, .tgContent, .modal');
+			if($t.parent().next().is(':hidden')){
+				$t.find('i').attr('class','icon-chevron-up');
+				$sTogObj.slideDown(200);
+			} else {
+				$t.find('i').attr('class','icon-chevron-down');
+				$sTogObj.slideUp(200);
+			}
+		});
+	});
+});
\ No newline at end of file
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
index ed2a9f832..181fcab04 100644
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
@@ -1 +1 @@
-jQuery(function(d){var a=27;d(".form li").find('>input:text:not(".notmulti"),>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 e=d(this).prev().stop().animate({opacity:0,left:"25px"},"fast",function(){e.css("visibility","hidden");});}).blur(function(){var f=d(this),e;if(d.trim(f.val())==""){e=f.prev().stop().css("visibility","visible").animate({opacity:1,left:"5px"},"fast");}}).end().parent().css("position","relative");var b=d("input:radio+label,input:checkbox+label"),c=b.prev("input");c.change(function(){var e=d(this).attr("name");c.filter(function(){return this.name==e;}).next("label").css("font-weight","normal").end().filter(":checked").next("label").css("font-weight","bold").end();}).change();d(".form th>input:checkbox").change(function(){var f=d(this),e=f.data("name");f.closest("table").find("input:checkbox").filter(function(){var g=d(this);return !g.prop("disabled")&&((g.attr("name")==e)||(g.data("name")==e));}).prop("checked",f.prop("checked")).end().end().trigger("update.checkbox",[e,this.checked]);});d.fn.xePagination=function(){this.not(".xe-pagination").addClass("xe-pagination").find("span.tgContent").css("whiteSpace","nowrap").end().find("a.tgAnchor").each(function(e){var f=d(this);f.after(d(f.attr("href")));}).end();return this;};d(".pagination").xePagination();d(".portlet .action").css({display:"none",position:"absolute"}).parent().mouseleave(function(){d(this).find(">.action").fadeOut(100);}).mouseenter(function(){d(this).find(">.action").fadeIn(100);}).focusin(function(){d(this).mouseenter();}).focusout(function(){var e=d(this),f;clearTimeout(e.data("timer"));f=setTimeout(function(){if(!e.find(":focus").length){e.mouseleave();}},10);e.data("timer",f);});d(window).resize(function(){if(d(document).width()<1300){d(".dashboard>.section>br").remove();d(".dashboard>.section>.portlet:odd").after('<br style="clear:both" />');}else{d(".dashboard>.section>br").remove();d(".dashboard>.section>.portlet:eq(2),.dashboard>.section>.portlet:eq(5)").after('<br style="clear:both" />');}});d(window).resize();d(".header>.siteTool>a.i").bind("before-open.tc",function(){d(this).addClass("active").next("div.tgContent").find(">.section:gt(0)").hide().end().find(">.btnArea>button").show();}).bind("after-close.tc",function(){d(this).removeClass("active");}).next("#siteMapList").find(">.section:last").after('<p class="btnArea"><button type="button">&rsaquo; more</button></p>').find("+p>button").click(function(){d(this).hide().parent().prevAll(".section").show();});d.fn.xeMask=function(){this.each(function(){var e=d(this),g=e.text();var f=/^([\w\-\.]+?)@(([\w-]+\.)+[a-z]{2,})$/ig;if(f.test(g)){e.html(g.replace(/(@.+)$/,'<span class="ellipsis">...</span><span class="cover">$1</span>')).find(">.ellipsis").css({position:"absolute",zIndex:1}).hover(function(){d(this).next(".cover").mouseover();},function(){d(this).next(".cover").mouseout();}).end().find(">.cover").css({zIndex:2,opacity:0}).hover(function(){d(this).css("opacity",1).prev("span").css("visibility","hidden");},function(){d(this).css("opacity",0).prev("span").css("visibility","visible");}).end();}});};d(".masked").xeMask();});jQuery(function(a){a.fn.xeMenu=function(){this.attr("role","navigation").find(">.nav>li").attr("role","menuitem").find(">ul").css("height","0").end().filter(":has(>ul)").attr("aria-haspopup","true").end().end().find(">.nav").mouseover(function(){a(this).parent(".gnb").addClass("active").end().find(">li>ul").css("height","auto").end();}).mouseleave(function(){a(this).parent(".gnb").removeClass("active").end().find(">li>ul").css("height","0").end();}).focusout(function(){var b=a(this);setTimeout(function(){if(!b.find(":focus").length){b.mouseleave();}},1);}).delegate("a",{focus:function(){a(this).mouseover();}});this.find(">.bmk").removeClass("active").mouseover(function(){a(this).addClass("active");}).mouseleave(function(){a(this).removeClass("active");}).focusout(function(){var b=a(this);setTimeout(function(){if(!b.find(":focus").length){b.mouseleave();}},1);}).delegate("a",{focus:function(){a(this).mouseover();}});};a("div.gnb").xeMenu();a(".gnb>.mnv").change(function(){window.location.href=a(this).find("option:selected").val();});});jQuery(function(a){var b=27;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 f=a(this),c,e,d;c=a(f.attr("href"));if(!c.parent("body").length){e=a('<button type="button" class="modalClose" title="Close this layer">X</button>');e.click(function(){c.data("anchor").trigger("close.mw");});c.prepend('<span class="bg"></span>').append('<!--[if IE 6]><iframe class="ie6"></iframe><![endif]-->').find(">.fg").prepend(e).append(e.clone(true)).end().appendTo("body");}c.data("anchor",f);if(c.data("state")=="showing"){f.trigger("close.mw");}else{f.trigger("open.mw");}return false;}).bind("open.mw",function(){var f=a(this),c,d,e;c=a.Event("before-open.mw");f.trigger(c);if(c.isDefaultPrevented()){return false;}d=a(f.attr("href"));e=f.data("duration")||"fast";d.data("state","showing");a("html,body").addClass("modalContainer");function g(){f.trigger("after-open.mw");}a(document).bind("keydown.mw",function(h){if(h.which==b){f.trigger("close.mw");return false;}});d.fadeIn(e,g).find(">.bg").height(a(document).height()).end().find("button.modalClose:first").focus();}).bind("close.mw",function(){var f=a(this),c,d,e;c=a.Event("before-close.mw");f.trigger(c);if(c.isDefaultPrevented()){return false;}d=a(f.attr("href"));e=f.data("duration")||"fast";d.data("state","hiding");a("html,body").removeClass("modalContainer");function g(){f.trigger("after-close.mw");}d.fadeOut(e,g);f.focus();});};a("a.modalAnchor").xeModalWindow();a("div.modal").addClass("x").hide();});jQuery(function(b){var a=false;var c=27;b.fn.xeContentToggler=function(){this.not(".xe-content-toggler").addClass("xe-content-toggler").each(function(){var d=b(this);$layer=b(d.attr("href"));$layer.hide().not(".xe-toggling-content").addClass("xe-toggling-content").mousedown(function(e){a=true;}).focusout(function(e){setTimeout(function(){if(!a&&!$layer.find(":focus").length&&$layer.data("state")=="showing"){d.trigger("close.tc");}a=false;},1);});}).click(function(){var e=b(this),d;d=b(e.attr("href"));d.data("anchor",e);if(d.data("state")=="showing"){e.trigger("close.tc");}else{e.trigger("open.tc");}return false;}).bind("open.tc",function(){var h=b(this),e,f,g;e=b(h.attr("href"));f=h.data("effect");g=h.data("duration")||"fast";e.data("state","showing");h.trigger("before-open.tc");a=false;b(document).unbind("mousedown.tc keydown.tc").bind("mousedown.tc keydown.tc",function(j){if(j){if(j.type=="keydown"&&j.which!=c){return true;}if(j.type=="mousedown"){var k=b(j.target);if(k.is("html,.tgAnchor,.tgContent")||e.has(k).length){return true;}}}h.trigger("close.tc");return false;});function i(){h.trigger("after-open.tc");}switch(f){case"slide":e.slideDown(g,i);break;case"slide-h":var d=e.css({"overflow-x":"",width:""}).width();e.show().css({"overflow-x":"hidden",width:"0px"}).animate({width:d},g,function(){e.css({"overflow-x":"",width:""});i();});break;case"fade":e.fadeIn(g,i);break;default:e.show();h.trigger("after-open.tc");}}).bind("close.tc",function(){var g=b(this),d,e,f;b(document).unbind("mousedown.tc keydown.tc");d=b(g.attr("href"));e=g.data("effect");f=g.data("duration")||"fast";d.data("state","hiding");g.trigger("before-close.tc");function h(){g.trigger("after-close.tc");}switch(e){case"slide":d.slideUp(f,h);break;case"slide-h":d.animate({width:0},f,function(){d.hide();h();});break;case"fade":d.fadeOut(f,h);break;default:d.hide();g.trigger("after-close.tc");}});return this;};b("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();function e(h){var k,g=h.site_list,f,j;b.empty();c.closest(".modulefinder").find(".moduleList,.moduleIdList").attr("disabled","disabled");if(h.error||!a.isArray(g)){c.trigger("close.tc");return;}for(f=0,j=g.length;f<j;f++){k=a("<li />").appendTo(b);a('<button type="button" />').text(g[f].domain).data("site_srl",g[f].site_srl).appendTo(k);}}a.exec_json("admin.getSiteAllList",{domain:d},e);}).end().find(".tgContent.suggestion").delegate("button","click",function(){var c,b;c=a(this);b=c.closest(".modulefinder");function d(h){var f,g=h.module_list,e;if(h.error||!g){return;}f=b.find(".moduleList").data("module_list",g).removeAttr("disabled").empty();for(e in g){if(!g.hasOwnProperty(e)){continue;}a("<option />").attr("value",e).text(g[e].title).appendTo(f);}f.prop("selectedIndex",0).change().focus();if(!f.is(":visible")){f.slideDown(100,function(){b.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show");}).trigger("show");}}b.find("a.tgAnchor.findsite").trigger("close.tc");a.exec_json("module.procModuleAdminGetList",{site_srl:c.data("site_srl")},d);}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var e,c,f,d;e=a(this);f=e.val();d=e.data("module_list");if(!d[f]){return;}d=d[f].list;c=e.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var b in d){if(!d.hasOwnProperty(b)){continue;}a("<option />").attr("value",d[b].module_srl).text(d[b].browser_title).appendTo(c);}c.prop("selectedIndex",0).change();});return this;};a(".modulefinder").xeModuleFinder();});jQuery(function(d){var c=false,b=d('<tr class="placeholder"><td>&nbsp;</td></tr>');d.fn.xeSortableTable=function(){this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(e){var m,l,q,s,r,f,h,k,g,j,o,n,p;if(e.which!=1){return;}m=d(this);l=m.closest("tr");q=m.closest("table");p=q.get(0).offsetParent;r=l.height();f=l.width();before_event=d.Event("before-drag.st");q.trigger(before_event);if(before_event.isDefaultPrevented()){return false;}k={x:e.pageX,y:e.pageY};h=a(l.get(0),p);$clone=l.attr("target",true).clone(true).appendTo(q);n=(s=q.find("thead th")).length;s.filter("[colspan]").attr("colspan",function(t,i){n+=i-1;});b.find("td").attr("colspan",n);g=[];q.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var i=d(this),t;t=a(this,p);g.push({top:t.top,bottom:t.top+i.height(),$item:i});});$clone.addClass("draggable").css({position:"absolute",opacity:0.6,width:f,height:r,left:h.left,top:h.top,zIndex:100});b.css({position:"absolute",opacity:0.6,width:f,height:"10px",left:h.left,top:h.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(q);l.css("opacity",0.6);d(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(w){var x,u,v,t,z,y;o=null;x={x:k.x-w.pageX,y:k.y-w.pageY};u=h.top-x.y;for(t=0,z=g.length;t<z;t++){y=g[t];if((t&&y.top>u)||((t<z-1)&&y.bottom<u)){continue;}o={element:y.$item};if(y.top>u-12){o.state="before";b.css("top",y.top-5);}else{o.state="after";b.css("top",y.bottom-5);}}$clone.css({top:u});}).bind("mouseup.st",function(i){var t;c=false;d(document).unbind("mousemove.st mouseup.st");l.removeAttr("target").css("opacity","");$clone.remove();b.remove();if(!o){return;}t=d(o.element);t[o.state](l);q.trigger("after-drag.st");});});return this;};d("table.sortable").xeSortableTable();function a(f,e){var h=0,g=0;while(f&&f!=e){h+=f.offsetTop;g+=f.offsetLeft;f=f.offsetParent;}return{top:h,left:g};}});jQuery(function(h){var m=null,a=null,b=0,k=null,i=false,n=false,p;var c=27,o=38,l=40,e=13;h(".multiLangEdit").delegate("input.vLang:text,textarea.vLang",{textchange:function(){var s=h(this),u=h.trim(s.val()),q,t;if(a){clearTimeout(a);a=null;}t=s.data("mle-container");q=p.find(">ul");if(!u||i){i=false;q.parent().hide();s.prev("input.vLang").val("");return;}s.data("mle-langkey").val("");s.prev("input.vLang").val(u);function r(){s.addClass("loading");if(q.parent().is(":visible")){q.parent().hide();}show_waiting_message=false;h.exec_json("module.getLangListByLangcodeForAutoComplete",{search_keyword:u},(function(w){return function(x){v(x,w);};})(b++));show_waiting_message=true;}function v(A,w){var y=A.results,z,x,B;if(A.error||!y||(b!=w+1)){return;}s.removeClass("loading");q.empty();for(x=0,B=y.length;x<B;x++){z=h('<button type="button" class="_btnLang" />').data("langkey",y[x].name).text(y[x].value);h("<li />").append(z).appendTo(q);}p.trigger("show");}a=setTimeout(r,100);},keydown:function(u){var v,r,q,t,s=u.which;v=h(this);r=p.find(">ul");if(!p.is(":visible")||h.inArray(s,[o,l,e,c])<0){return true;}if(s==c){p.trigger("hide");return false;}q=r.find("button.active");if(s==e){q.click();return false;}if(!q.length){r.find("li>button:first").addClass("active");return false;}if(s==o){t=q.parent().prev("li").find(">button");if(!t.length){t=r.find(">li:last>button");}}else{if(s==l){t=q.parent().next("li").find(">button");if(!t.length){t=r.find(">li:first>button");}}}q.removeClass("active");t.addClass("active");return false;},focus:function(){var r=h(this),q=h.trim(r.val()),s=r.closest(".multiLangEdit");r.after(p);if(!r.data("mle-container")){r.data("mle-container",s);}if(!r.data("mle-langkey")){r.data("mle-langkey",s.find("input.vLang:first"));}(function(){var t=h.trim(r.val());if(t!=q){q=t;r.trigger("textchange");}m=setTimeout(arguments.callee,50);})();},blur:function(){clearTimeout(m);m=null;h(this).closest(".multiLangEdit").focusout();},focusout:function(){var q=h(this);clearTimeout(k);k=setTimeout(function(){if(n){n=false;return;}if(!q.find(":focus").is(".vLang,button._btnLang")){p.trigger("hide");}},10);}}).delegate("a.tgAnchor.editUserLang",{"before-open.tc":function(){var v,t,r,w,x,y,u,s;v=h(this);t=h(v.attr("href")).insertBefore(v);r=v.closest(".multiLangEdit");w=r.find("input.vLang,textarea.vLang");x=w.eq(0).val();y=w.eq(1).val();g(t);t.trigger("multilang-reset").removeClass("showChild").find(".langList").empty().end();t.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val(y).prev("label").css("visibility","hidden");p.trigger("hide");if(/^\$user_lang->(.+)$/.test(x)){u="module.getModuleAdminLangListByName";s={lang_name:RegExp.$1};}else{u="module.getModuleAdminLangListByValue";s={value:y};}function q(C){var B=C.lang_list,D,A,F,z,E;if(C.error||!B){return;}B=d(B);t.data("multilang-list",B);E=t.find(".langList");h.each(B,function(H){var I=h("<li />").appendTo(E);var G=t.data("layer_index");h('<a href="#langInput_'+G+'" class="langItem" />').text(this[xe.current_lang]).data("multilang-name",H).appendTo(I);});if(j(B)>1){t.addClass("showChild");}t.find(".langList>li>a:first").click();}show_waiting_message=false;h.exec_json(u,s,q);show_waiting_message=true;}}).delegate("button._btnLang",{click:function(){var q=h(this);i=true;p.trigger("hide");q.closest(".multiLangEdit").find("input.vLang,textarea.vLang").eq(0).val(q.data("langkey")).end().eq(1).val(q.text()).end();return false;},mousedown:function(){n=true;},focus:function(){h(this).mouseover();},mouseover:function(){h(this).closest("ul").find("button.active").removeClass("active");}});p=h('<div class="suggestion"><ul></ul></div>').bind("show",function(){h(this).show();}).bind("hide",function(){h(this).hide();});var f=0;function g(w){var r,C,D="",y=0,x,B,z,u=[];var A=0,t=1,v=0,q=1;if(w.data("init-multilang-editor")){return;}w.data("init-multilang-editor",true).bind("multilang-reset",function(){w.data("multilang-current-name","").find(".langInput li").find(">input:text,>textarea").val("").prev("label").css("visibility","visible");x=v;E();}).find("h2 a").click(function(){x=!x;E();return false;}).end().delegate("a.langItem","click",function(){var K=h(this),F,J,G,H,L;J=w.data("multilang-list");G=K.data("multilang-name");if(!J||!J[G]){return;}J=J[G];F=w.find(".langInput");w.trigger("multilang-reset").find(".langList li.active").removeClass("active").end().data("multilang-current-name",G);K.parent("li").addClass("active");for(var I in J){if(!J.hasOwnProperty(I)){continue;}F.find("li."+I).find(">input:text,>textarea").data("multilang-value",J[I]).val(J[I]).prev("label").css("visibility","hidden");}D=s();y=0;r.val(u[y]);x=q;E();return false;}).data("layer_index",f).find(".langInput").attr("id","langInput_"+f++);z=w.find("h2 strong").text();B=w.find("h2 a").text();C=w.find("input:text,textarea").change(function(){var F=(s()==D)?A:t;if(F!=y){r.val(u[y=F]);}});function s(){var F=[];C.each(function(){F.push(this.value);});return F.join("\n");}function E(){if(!w.data("multilang-current-name")){w.find("h2").find("strong").text(B).end().find("a").hide();}else{w.find("h2").find("strong").text(x==v?B:z).end().find("a").text(x==v?z:B).show().end();}}r=w.find("input[type=submit]").click(function(){var G=w.data("multilang-current-name");function F(){w.hide().closest(".multiLangEdit").find(".vLang").eq(0).val("$user_lang->"+G).end().eq(1).val(w.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val()).end();}function H(){var J={};if(G&&x==q){J.lang_name=G;}C.each(function(L,K){var M=h(this);J[M.parent("li").attr("class")]=M.val();});h.exec_json("module.procModuleAdminInsertLang",J,I);}function I(J){if(!J||J.error||!J.name){return;}G=J.name;F();}(s()==D)?F():H();return false;});u=r.val().split("|");r.val(u[A]);}function d(s){var q,u,t={},r;for(q=0,u=s.length;q<u;q++){r=s[q];if(!t[r.name]){t[r.name]={};}t[r.name][r.lang_code]=r.value;}return t;}function j(s){var r=0;for(var q in s){if(s.hasOwnProperty(q)){r++;}}return r;}});jQuery(function(a){a(".filebox").bind("before-open.mw",function(){var e,c,d;var b;e=a(this);b=e.attr("href");c=a(b).find(".filebox_list");function f(g){c.html(g.html);c.find(".lined .select").bind("click",function(j){var h=a("input.select_checkbox:checked");if(h.length==0){var i=a(this).parent().find("img.filebox_item").attr("src");if(!i){alert("None selected!");}else{e.trigger("filebox.selected",[i]);e.trigger("close.mw");}}else{e.trigger("filebox.selected",[h]);e.trigger("close.mw");}return false;});c.find(".pagination").find("a").filter(function(){if(a(this).hasClass("tgAnchor")){return false;}return true;}).bind("click",function(){var h=a(this).attr("page");a.exec_json("module.getFileBoxListHtml",{page:h},f);a(window).scrollTop(a(b).find(".modalClose").offset().top);return false;});a("#FileBoxGoTo").find("button").bind("click",function(){var h=a(this).prev("input").val();a.exec_json("module.getFileBoxListHtml",{page:h},f);a(window).scrollTop(a(b).find(".modalClose").offset().top);return false;});}a.exec_json("module.getFileBoxListHtml",{page:"1"},f);});});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 b=new Array();b.module_name=a;exec_xml("install","procInstallAdminInstall",b,completeInstallModule);showWaitingFogLayer();}function doUpdateModule(a){var b=new Array();b.module_name=a;exec_xml("install","procInstallAdminUpdate",b,completeInstallModule);showWaitingFogLayer();}function completeInstallModule(a){alert(a.message);location.reload();}jQuery(document).ready(function(a){a("body").ajaxComplete(function(){hideWaitingFogLayer();});});jQuery(function(a){if(a(".x>.body>.lnb").length==0){a(".x>.body>.content").addClass("single");}});jQuery(function(d){var c=d(".x .dsTg span.side>button.text");var a=d(".x .dsTg td.title");a.each(function(){var e=d(this);if(e.find("p.update").length==0){e.addClass("tg").find(">p:not(:first-child)").hide();}else{e.addClass("up");}});var b=d(".x .dsTg td.tg>p:not(:first-child)");c.click(function(){c.toggleClass("details");b.slideToggle(200);});});
\ No newline at end of file
+jQuery(function(d){var a=27;d(".form li").find('>input:text:not(".notmulti"),>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 e=d(this).prev().stop().animate({opacity:0,left:"25px"},"fast",function(){e.css("visibility","hidden")})}).blur(function(){var f=d(this),e;if(d.trim(f.val())==""){e=f.prev().stop().css("visibility","visible").animate({opacity:1,left:"5px"},"fast")}}).end().parent().css("position","relative");var b=d("input:radio+label,input:checkbox+label"),c=b.prev("input");c.change(function(){var e=d(this).attr("name");c.filter(function(){return this.name==e}).next("label").css("font-weight","normal").end().filter(":checked").next("label").css("font-weight","bold").end()}).change();d(".form th>input:checkbox").change(function(){var f=d(this),e=f.data("name");f.closest("table").find("input:checkbox").filter(function(){var g=d(this);return !g.prop("disabled")&&((g.attr("name")==e)||(g.data("name")==e))}).prop("checked",f.prop("checked")).end().end().trigger("update.checkbox",[e,this.checked])});d.fn.xePagination=function(){this.not(".xe-pagination").addClass("xe-pagination").find("span.tgContent").css("whiteSpace","nowrap").end().find("a.tgAnchor").each(function(e){var f=d(this);f.after(d(f.attr("href")))}).end();return this};d(".pagination").xePagination();d(".portlet .action").css({display:"none",position:"absolute"}).parent().mouseleave(function(){d(this).find(">.action").fadeOut(100)}).mouseenter(function(){d(this).find(">.action").fadeIn(100)}).focusin(function(){d(this).mouseenter()}).focusout(function(){var e=d(this),f;clearTimeout(e.data("timer"));f=setTimeout(function(){if(!e.find(":focus").length){e.mouseleave()}},10);e.data("timer",f)});d(window).resize(function(){if(d(document).width()<1300){d(".dashboard>.section>br").remove();d(".dashboard>.section>.portlet:odd").after('<br style="clear:both" />')}else{d(".dashboard>.section>br").remove();d(".dashboard>.section>.portlet:eq(2),.dashboard>.section>.portlet:eq(5)").after('<br style="clear:both" />')}});d(window).resize();d(".header>.siteTool>a.i").bind("before-open.tc",function(){d(this).addClass("active").next("div.tgContent").find(">.section:gt(0)").hide().end().find(">.btnArea>button").show()}).bind("after-close.tc",function(){d(this).removeClass("active")}).next("#siteMapList").find(">.section:last").after('<p class="btnArea"><button type="button">&rsaquo; more</button></p>').find("+p>button").click(function(){d(this).hide().parent().prevAll(".section").show()});d.fn.xeMask=function(){this.each(function(){var e=d(this),g=e.text();var f=/^([\w\-\.]+?)@(([\w-]+\.)+[a-z]{2,})$/ig;if(f.test(g)){e.html(g.replace(/(@.+)$/,'<span class="ellipsis">...</span><span class="cover">$1</span>')).find(">.ellipsis").css({position:"absolute",zIndex:1}).hover(function(){d(this).next(".cover").mouseover()},function(){d(this).next(".cover").mouseout()}).end().find(">.cover").css({zIndex:2,opacity:0}).hover(function(){d(this).css("opacity",1).prev("span").css("visibility","hidden")},function(){d(this).css("opacity",0).prev("span").css("visibility","visible")}).end()}})};d(".masked").xeMask()});jQuery(function(a){a.fn.xeMenu=function(){this.attr("role","navigation").find(">.nav>li").attr("role","menuitem").find(">ul").css("height","0").end().filter(":has(>ul)").attr("aria-haspopup","true").end().end().find(">.nav").mouseover(function(){a(this).parent(".gnb").addClass("active").end().find(">li>ul").css("height","auto").end()}).mouseleave(function(){a(this).parent(".gnb").removeClass("active").end().find(">li>ul").css("height","0").end()}).focusout(function(){var b=a(this);setTimeout(function(){if(!b.find(":focus").length){b.mouseleave()}},1)}).delegate("a",{focus:function(){a(this).mouseover()}});this.find(">.bmk").removeClass("active").mouseover(function(){a(this).addClass("active")}).mouseleave(function(){a(this).removeClass("active")}).focusout(function(){var b=a(this);setTimeout(function(){if(!b.find(":focus").length){b.mouseleave()}},1)}).delegate("a",{focus:function(){a(this).mouseover()}})};a("div.gnb").xeMenu();a(".gnb>.mnv").change(function(){window.location.href=a(this).find("option:selected").val()})});jQuery(function(a){var b=27;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 f=a(this),c,e,d;c=a(f.attr("href"));if(!c.parent("body").length){e=a('<button type="button" class="modalClose" title="Close this layer">X</button>');e.click(function(){c.data("anchor").trigger("close.mw")});c.prepend('<span class="bg"></span>').append('<!--[if IE 6]><iframe class="ie6"></iframe><![endif]-->').find(">.fg").prepend(e).append(e.clone(true)).end().appendTo("body")}c.data("anchor",f);if(c.data("state")=="showing"){f.trigger("close.mw")}else{f.trigger("open.mw")}return false}).bind("open.mw",function(){var f=a(this),c,d,e;c=a.Event("before-open.mw");f.trigger(c);if(c.isDefaultPrevented()){return false}d=a(f.attr("href"));e=f.data("duration")||"fast";d.data("state","showing");a("html,body").addClass("modalContainer");function g(){f.trigger("after-open.mw")}a(document).bind("keydown.mw",function(h){if(h.which==b){f.trigger("close.mw");return false}});d.fadeIn(e,g).find(">.bg").height(a(document).height()).end().find("button.modalClose:first").focus()}).bind("close.mw",function(){var f=a(this),c,d,e;c=a.Event("before-close.mw");f.trigger(c);if(c.isDefaultPrevented()){return false}d=a(f.attr("href"));e=f.data("duration")||"fast";d.data("state","hiding");a("html,body").removeClass("modalContainer");function g(){f.trigger("after-close.mw")}d.fadeOut(e,g);f.focus()})};a("a.modalAnchor").xeModalWindow();a("div.modal").addClass("x").hide()});jQuery(function(b){var a=false;var c=27;b.fn.xeContentToggler=function(){this.not(".xe-content-toggler").addClass("xe-content-toggler").each(function(){var d=b(this);$layer=b(d.attr("href"));$layer.hide().not(".xe-toggling-content").addClass("xe-toggling-content").mousedown(function(e){a=true}).focusout(function(e){setTimeout(function(){if(!a&&!$layer.find(":focus").length&&$layer.data("state")=="showing"){d.trigger("close.tc")}a=false},1)})}).click(function(){var e=b(this),d;d=b(e.attr("href"));d.data("anchor",e);if(d.data("state")=="showing"){e.trigger("close.tc")}else{e.trigger("open.tc")}return false}).bind("open.tc",function(){var h=b(this),e,f,g;e=b(h.attr("href"));f=h.data("effect");g=h.data("duration")||"fast";e.data("state","showing");h.trigger("before-open.tc");a=false;b(document).unbind("mousedown.tc keydown.tc").bind("mousedown.tc keydown.tc",function(j){if(j){if(j.type=="keydown"&&j.which!=c){return true}if(j.type=="mousedown"){var k=b(j.target);if(k.is("html,.tgAnchor,.tgContent")||e.has(k).length){return true}}}h.trigger("close.tc");return false});function i(){h.trigger("after-open.tc")}switch(f){case"slide":e.slideDown(g,i);break;case"slide-h":var d=e.css({"overflow-x":"",width:""}).width();e.show().css({"overflow-x":"hidden",width:"0px"}).animate({width:d},g,function(){e.css({"overflow-x":"",width:""});i()});break;case"fade":e.fadeIn(g,i);break;default:e.show();h.trigger("after-open.tc")}}).bind("close.tc",function(){var g=b(this),d,e,f;b(document).unbind("mousedown.tc keydown.tc");d=b(g.attr("href"));e=g.data("effect");f=g.data("duration")||"fast";d.data("state","hiding");g.trigger("before-close.tc");function h(){g.trigger("after-close.tc")}switch(e){case"slide":d.slideUp(f,h);break;case"slide-h":d.animate({width:0},f,function(){d.hide();h()});break;case"fade":d.fadeOut(f,h);break;default:d.hide();g.trigger("after-close.tc")}});return this};b("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();function e(h){var k,g=h.site_list,f,j;b.empty();c.closest(".modulefinder").find(".moduleList,.moduleIdList").attr("disabled","disabled");if(h.error||!a.isArray(g)){c.trigger("close.tc");return}for(f=0,j=g.length;f<j;f++){k=a("<li />").appendTo(b);a('<button type="button" />').text(g[f].domain).data("site_srl",g[f].site_srl).appendTo(k)}}a.exec_json("admin.getSiteAllList",{domain:d},e)}).end().find(".tgContent.suggestion").delegate("button","click",function(){var c,b;c=a(this);b=c.closest(".modulefinder");function d(h){var f,g=h.module_list,e;if(h.error||!g){return}f=b.find(".moduleList").data("module_list",g).removeAttr("disabled").empty();for(e in g){if(!g.hasOwnProperty(e)){continue}a("<option />").attr("value",e).text(g[e].title).appendTo(f)}f.prop("selectedIndex",0).change().focus();if(!f.is(":visible")){f.slideDown(100,function(){b.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show")}).trigger("show")}}b.find("a.tgAnchor.findsite").trigger("close.tc");a.exec_json("module.procModuleAdminGetList",{site_srl:c.data("site_srl")},d)}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var e,c,f,d;e=a(this);f=e.val();d=e.data("module_list");if(!d[f]){return}d=d[f].list;c=e.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var b in d){if(!d.hasOwnProperty(b)){continue}a("<option />").attr("value",d[b].module_srl).text(d[b].browser_title).appendTo(c)}c.prop("selectedIndex",0).change()});return this};a(".modulefinder").xeModuleFinder()});jQuery(function(d){var c=false,b=d('<tr class="placeholder"><td>&nbsp;</td></tr>');d.fn.xeSortableTable=function(){this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(e){var m,l,q,s,r,f,h,k,g,j,o,n,p;if(e.which!=1){return}m=d(this);l=m.closest("tr");q=m.closest("table");p=q.get(0).offsetParent;r=l.height();f=l.width();before_event=d.Event("before-drag.st");q.trigger(before_event);if(before_event.isDefaultPrevented()){return false}k={x:e.pageX,y:e.pageY};h=a(l.get(0),p);$clone=l.attr("target",true).clone(true).appendTo(q);n=(s=q.find("thead th")).length;s.filter("[colspan]").attr("colspan",function(t,i){n+=i-1});b.find("td").attr("colspan",n);g=[];q.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var i=d(this),t;t=a(this,p);g.push({top:t.top,bottom:t.top+i.height(),$item:i})});$clone.addClass("draggable").css({position:"absolute",opacity:0.6,width:f,height:r,left:h.left,top:h.top,zIndex:100});b.css({position:"absolute",opacity:0.6,width:f,height:"10px",left:h.left,top:h.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(q);l.css("opacity",0.6);d(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(w){var x,u,v,t,z,y;o=null;x={x:k.x-w.pageX,y:k.y-w.pageY};u=h.top-x.y;for(t=0,z=g.length;t<z;t++){y=g[t];if((t&&y.top>u)||((t<z-1)&&y.bottom<u)){continue}o={element:y.$item};if(y.top>u-12){o.state="before";b.css("top",y.top-5)}else{o.state="after";b.css("top",y.bottom-5)}}$clone.css({top:u})}).bind("mouseup.st",function(i){var t;c=false;d(document).unbind("mousemove.st mouseup.st");l.removeAttr("target").css("opacity","");$clone.remove();b.remove();if(!o){return}t=d(o.element);t[o.state](l);q.trigger("after-drag.st")})});return this};d("table.sortable").xeSortableTable();function a(f,e){var h=0,g=0;while(f&&f!=e){h+=f.offsetTop;g+=f.offsetLeft;f=f.offsetParent}return{top:h,left:g}}});jQuery(function(h){var m=null,a=null,b=0,k=null,i=false,n=false,p;var c=27,o=38,l=40,e=13;h(".multiLangEdit").delegate("input.vLang:text,textarea.vLang",{textchange:function(){var s=h(this),u=h.trim(s.val()),q,t;if(a){clearTimeout(a);a=null}t=s.data("mle-container");q=p.find(">ul");if(!u||i){i=false;q.parent().hide();s.prev("input.vLang").val("");return}s.data("mle-langkey").val("");s.prev("input.vLang").val(u);function r(){s.addClass("loading");if(q.parent().is(":visible")){q.parent().hide()}show_waiting_message=false;h.exec_json("module.getLangListByLangcodeForAutoComplete",{search_keyword:u},(function(w){return function(x){v(x,w)}})(b++));show_waiting_message=true}function v(A,w){var y=A.results,z,x,B;if(A.error||!y||(b!=w+1)){return}s.removeClass("loading");q.empty();for(x=0,B=y.length;x<B;x++){z=h('<button type="button" class="_btnLang" />').data("langkey",y[x].name).text(y[x].value);h("<li />").append(z).appendTo(q)}p.trigger("show")}a=setTimeout(r,100)},keydown:function(u){var v,r,q,t,s=u.which;v=h(this);r=p.find(">ul");if(!p.is(":visible")||h.inArray(s,[o,l,e,c])<0){return true}if(s==c){p.trigger("hide");return false}q=r.find("button.active");if(s==e){q.click();return false}if(!q.length){r.find("li>button:first").addClass("active");return false}if(s==o){t=q.parent().prev("li").find(">button");if(!t.length){t=r.find(">li:last>button")}}else{if(s==l){t=q.parent().next("li").find(">button");if(!t.length){t=r.find(">li:first>button")}}}q.removeClass("active");t.addClass("active");return false},focus:function(){var r=h(this),q=h.trim(r.val()),s=r.closest(".multiLangEdit");r.after(p);if(!r.data("mle-container")){r.data("mle-container",s)}if(!r.data("mle-langkey")){r.data("mle-langkey",s.find("input.vLang:first"))}(function(){var t=h.trim(r.val());if(t!=q){q=t;r.trigger("textchange")}m=setTimeout(arguments.callee,50)})()},blur:function(){clearTimeout(m);m=null;h(this).closest(".multiLangEdit").focusout()},focusout:function(){var q=h(this);clearTimeout(k);k=setTimeout(function(){if(n){n=false;return}if(!q.find(":focus").is(".vLang,button._btnLang")){p.trigger("hide")}},10)}}).delegate("a.tgAnchor.editUserLang",{"before-open.tc":function(){var v,t,r,w,x,y,u,s;v=h(this);t=h(v.attr("href")).insertBefore(v);r=v.closest(".multiLangEdit");w=r.find("input.vLang,textarea.vLang");x=w.eq(0).val();y=w.eq(1).val();g(t);t.trigger("multilang-reset").removeClass("showChild").find(".langList").empty().end();t.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val(y).prev("label").css("visibility","hidden");p.trigger("hide");if(/^\$user_lang->(.+)$/.test(x)){u="module.getModuleAdminLangListByName";s={lang_name:RegExp.$1}}else{u="module.getModuleAdminLangListByValue";s={value:y}}function q(C){var B=C.lang_list,D,A,F,z,E;if(C.error||!B){return}B=d(B);t.data("multilang-list",B);E=t.find(".langList");h.each(B,function(H){var I=h("<li />").appendTo(E);var G=t.data("layer_index");h('<a href="#langInput_'+G+'" class="langItem" />').text(this[xe.current_lang]).data("multilang-name",H).appendTo(I)});if(j(B)>1){t.addClass("showChild")}t.find(".langList>li>a:first").click()}show_waiting_message=false;h.exec_json(u,s,q);show_waiting_message=true}}).delegate("button._btnLang",{click:function(){var q=h(this);i=true;p.trigger("hide");q.closest(".multiLangEdit").find("input.vLang,textarea.vLang").eq(0).val(q.data("langkey")).end().eq(1).val(q.text()).end();return false},mousedown:function(){n=true},focus:function(){h(this).mouseover()},mouseover:function(){h(this).closest("ul").find("button.active").removeClass("active")}});p=h('<div class="suggestion"><ul></ul></div>').bind("show",function(){h(this).show()}).bind("hide",function(){h(this).hide()});var f=0;function g(w){var r,C,D="",y=0,x,B,z,u=[];var A=0,t=1,v=0,q=1;if(w.data("init-multilang-editor")){return}w.data("init-multilang-editor",true).bind("multilang-reset",function(){w.data("multilang-current-name","").find(".langInput li").find(">input:text,>textarea").val("").prev("label").css("visibility","visible");x=v;E()}).find("h2 a").click(function(){x=!x;E();return false}).end().delegate("a.langItem","click",function(){var K=h(this),F,J,G,H,L;J=w.data("multilang-list");G=K.data("multilang-name");if(!J||!J[G]){return}J=J[G];F=w.find(".langInput");w.trigger("multilang-reset").find(".langList li.active").removeClass("active").end().data("multilang-current-name",G);K.parent("li").addClass("active");for(var I in J){if(!J.hasOwnProperty(I)){continue}F.find("li."+I).find(">input:text,>textarea").data("multilang-value",J[I]).val(J[I]).prev("label").css("visibility","hidden")}D=s();y=0;r.val(u[y]);x=q;E();return false}).data("layer_index",f).find(".langInput").attr("id","langInput_"+f++);z=w.find("h2 strong").text();B=w.find("h2 a").text();C=w.find("input:text,textarea").change(function(){var F=(s()==D)?A:t;if(F!=y){r.val(u[y=F])}});function s(){var F=[];C.each(function(){F.push(this.value)});return F.join("\n")}function E(){if(!w.data("multilang-current-name")){w.find("h2").find("strong").text(B).end().find("a").hide()}else{w.find("h2").find("strong").text(x==v?B:z).end().find("a").text(x==v?z:B).show().end()}}r=w.find("input[type=submit]").click(function(){var G=w.data("multilang-current-name");function F(){w.hide().closest(".multiLangEdit").find(".vLang").eq(0).val("$user_lang->"+G).end().eq(1).val(w.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val()).end()}function H(){var J={};if(G&&x==q){J.lang_name=G}C.each(function(L,K){var M=h(this);J[M.parent("li").attr("class")]=M.val()});h.exec_json("module.procModuleAdminInsertLang",J,I)}function I(J){if(!J||J.error||!J.name){return}G=J.name;F()}(s()==D)?F():H();return false});u=r.val().split("|");r.val(u[A])}function d(s){var q,u,t={},r;for(q=0,u=s.length;q<u;q++){r=s[q];if(!t[r.name]){t[r.name]={}}t[r.name][r.lang_code]=r.value}return t}function j(s){var r=0;for(var q in s){if(s.hasOwnProperty(q)){r++}}return r}});jQuery(function(a){a(".filebox").bind("before-open.mw",function(){var e,c,d;var b;e=a(this);b=e.attr("href");c=a(b).find(".filebox_list");function f(g){c.html(g.html);c.find(".lined .select").bind("click",function(j){var h=a("input.select_checkbox:checked");if(h.length==0){var i=a(this).parent().find("img.filebox_item").attr("src");if(!i){alert("None selected!")}else{e.trigger("filebox.selected",[i]);e.trigger("close.mw")}}else{e.trigger("filebox.selected",[h]);e.trigger("close.mw")}return false});c.find(".pagination").find("a").filter(function(){if(a(this).hasClass("tgAnchor")){return false}return true}).bind("click",function(){var h=a(this).attr("page");a.exec_json("module.getFileBoxListHtml",{page:h},f);a(window).scrollTop(a(b).find(".modalClose").offset().top);return false});a("#FileBoxGoTo").find("button").bind("click",function(){var h=a(this).prev("input").val();a.exec_json("module.getFileBoxListHtml",{page:h},f);a(window).scrollTop(a(b).find(".modalClose").offset().top);return false})}a.exec_json("module.getFileBoxListHtml",{page:"1"},f)})});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 b=new Array();b.module_name=a;exec_xml("install","procInstallAdminInstall",b,completeInstallModule);showWaitingFogLayer()}function doUpdateModule(a){var b=new Array();b.module_name=a;exec_xml("install","procInstallAdminUpdate",b,completeInstallModule);showWaitingFogLayer()}function completeInstallModule(a){alert(a.message);location.reload()}jQuery(function(a){a("body").ajaxComplete(function(){hideWaitingFogLayer()})});jQuery(function(a){if(a(".x>.body>.lnb").length==0){a(".x>.body>.content").addClass("single")}});jQuery(function(d){var c=d(".x .dsTg span.side>button.text");var a=d(".x .dsTg td.title");a.each(function(){var e=d(this);if(e.find("p.update").length==0){e.addClass("tg").find(">p:not(:first-child)").hide()}else{e.addClass("up")}});var b=d(".x .dsTg td.tg>p:not(:first-child)");c.click(function(){c.toggleClass("details");b.slideToggle(200)})});jQuery(function(b){var a=b(".x .content .h2, .x .content .h3").not(".portlet .h2, .modal .h2");a.each(function(){var c=b('<button type="button" class="sTog" title="Open/Close"><i class="icon-chevron-up"></i></button>');b(this).append(c);c.click(function(){var e=b(this);var d=e.parent().nextUntil(".h2, .h3").not(".langEdit, .tgContent, .modal");if(e.parent().next().is(":hidden")){e.find("i").attr("class","icon-chevron-up");d.slideDown(200)}else{e.find("i").attr("class","icon-chevron-down");d.slideUp(200)}})})});
\ No newline at end of file
diff --git a/modules/adminlogging/adminlogging.class.php b/modules/adminlogging/adminlogging.class.php
index f4f149957..f11efce9a 100644
--- a/modules/adminlogging/adminlogging.class.php
+++ b/modules/adminlogging/adminlogging.class.php
@@ -1,38 +1,41 @@
 <?php
-    /**
-     * @class  admin
-     * @author NHN (developers@xpressengine.com)
-     * @brief  base class of admin module
-     **/
-
+	/**
+	 * adminlogging class
+	 * Base class of adminlogging module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/adminlogging
+	 * @version 0.1
+	 */
     class adminlogging extends ModuleObject {
-        /**
-         * @brief install admin module
-         * @return new Object
-         **/
+		/**
+		 * Install adminlogging module
+		 * @return Object
+		 */
         function moduleInstall() {
             return new Object();
         }
 
-        /**
-         * @brief if update is necessary it returns true
-         **/
+		/**
+		 * If update is necessary it returns true
+		 * @return bool
+		 */
         function checkUpdate() {
             return false;
         }
 
-        /**
-         * @brief update module
-         * @return new Object
-         **/
+		/**
+		 * Update module
+		 * @return Object
+		 */
         function moduleUpdate() {
             return new Object();
         }
 
-        /**
-         * @brief regenerate cache file
-         * @return none
-         **/
+		/**
+		 * Regenerate cache file
+		 * @return void
+		 */
         function recompileCache() {
         }
     }
diff --git a/modules/adminlogging/adminlogging.controller.php b/modules/adminlogging/adminlogging.controller.php
index 2d28f82b7..348bcf106 100644
--- a/modules/adminlogging/adminlogging.controller.php
+++ b/modules/adminlogging/adminlogging.controller.php
@@ -1,15 +1,17 @@
 <?php
-    /**
-     * @class  adminAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin controller class of admin module
-     **/
-
+	/**
+	 * adminloggingController class
+	 * controller class of adminlogging module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/adminlogging
+	 * @version 0.1
+	 */
     class adminloggingController extends adminlogging {
-        /**
-         * @brief initialization
-         * @return none
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
             // forbit access if the user is not an administrator
             $oMemberModel = &getModel('member');
@@ -17,6 +19,10 @@
             if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
         }
 
+		/**
+		 * Insert log
+		 * @return void
+		 */
 		function insertLog($module, $act)
 		{
 			if(!$module || !$act) return;
diff --git a/modules/adminlogging/adminlogging.model.php b/modules/adminlogging/adminlogging.model.php
index 248f40266..b2d9d871e 100644
--- a/modules/adminlogging/adminlogging.model.php
+++ b/modules/adminlogging/adminlogging.model.php
@@ -1,5 +1,12 @@
 <?php
-
+	/**
+	 * adminloggingModel class
+	 * model class of adminlogging module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/adminlogging
+	 * @version 0.1
+	 */
     class adminloggingModel extends adminlogging
     {
 	}
diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php
index a1d3d34bb..672deb1ba 100644
--- a/modules/autoinstall/autoinstall.admin.controller.php
+++ b/modules/autoinstall/autoinstall.admin.controller.php
@@ -1,29 +1,47 @@
 <?php
-    /**
-     * @class  autoinstallAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief autoinstall module admin controller class
-     **/
 
     require_once(_XE_PATH_.'modules/autoinstall/autoinstall.lib.php');
 
+    /**
+     * autoinstall module admin controller class
+	 *
+     * @author NHN (developers@xpressengine.com)
+     **/
     class autoinstallAdminController extends autoinstall {
 
         /**
-         * @brief Initialization
+         * Initialization
          **/
         function init() {
         }
 
+		/**
+		 * Check file checksum is equal
+		 *
+		 * @param string $file local file path
+		 * @param string $checksum Recieved checksum from server
+		 * @return bool Returns true on equal local checksum and recieved checksum, otherwise false.
+		 */
         function checkFileCheckSum($file, $checksum){
             $local_checksum = md5_file(FileHandler::getRealPath($file));
             return ($local_checksum === $checksum);
         }
 
+		/**
+		 * Clean download file
+		 *
+		 * @param object $obj
+		 * @return void
+		 */
         function _cleanDownloaded($obj){
             FileHandler::removeDir($obj->download_path);
         }
 
+		/**
+		 * Update easy install information
+		 *
+		 * @return Object
+		 */
         function procAutoinstallAdminUpdateinfo()
         {
 			$this->_updateinfo();
@@ -31,6 +49,11 @@
 			$this->setRedirectUrl(Context::get('error_return_url'));
         }
 
+		/**
+		 * Update easy install information
+		 *
+		 * @return void
+		 */
 		function _updateinfo(){
             $oModel = &getModel('autoinstall');
             $item = $oModel->getLatestPackage();
@@ -49,6 +72,11 @@
             $this->checkInstalled();
 		}
 
+		/**
+		 * Update installed package information
+		 *
+		 * @return void
+		 */
         function checkInstalled()
         {
             executeQuery("autoinstall.deleteInstalledPackage");
@@ -122,6 +150,11 @@
             }
         }
 
+		/**
+		 * Install package
+		 *
+		 * @return Object
+		 */
         function procAutoinstallAdminPackageinstall()
         {
             @set_time_limit(0);
@@ -175,6 +208,12 @@
 			}
         }
 
+		/**
+		 * Update package informations using recieved data from server
+		 *
+		 * @param object $xmlDoc Recieved data
+		 * @return void
+		 */
         function updatePackages(&$xmlDoc)
         {
             $oModel =& getModel('autoinstall');
@@ -207,6 +246,12 @@
             }
         }
 
+		/**
+		 * Update category using recived data from server.
+		 *
+		 * @param object $xmlDoc Recived data
+		 * @return void
+		 */
         function updateCategory(&$xmlDoc)
         {
             executeQuery("autoinstall.deleteCategory");
@@ -227,6 +272,11 @@
             }
         }
 
+		/**
+		 * Uninstall package
+		 *
+		 * @return Object
+		 */
 		function procAutoinstallAdminUninstallPackage()
 		{
 			$package_srl = Context::get('package_srl');
diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php
index fa79de62f..b5ac7e5f3 100644
--- a/modules/autoinstall/autoinstall.admin.view.php
+++ b/modules/autoinstall/autoinstall.admin.view.php
@@ -1,16 +1,27 @@
 <?php
     /**
-     * @class  autoinstallAdminView
+     * Admin view class in the autoinstall module
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view class in the autoinstall module
      **/
-
-
     class autoinstallAdminView extends autoinstall {
 
+		/**
+		 * Category list
+		 * @var array
+		 */
         var $categories;
+
+		/**
+		 * Is set a ftp information
+		 * @var bool
+		 */
 		var $ftp_set = false;
 
+		/**
+		 * initialize
+		 *
+		 * @return void
+		 */
 	    function init() {
 		    $template_path = sprintf("%stpl/",$this->module_path);
             Context::set('original_site', _XE_LOCATION_SITE_);
@@ -28,6 +39,45 @@
             Context::set('iCount', $oModel->getInstalledPackageCount());
 	    }
 
+		/**
+		 * Rearrange one item
+		 *
+		 * <pre>
+		 * $item:
+		 * stdClass Object
+		 * (
+		 *	[category_srl] => stdClass Object
+		 *		(
+		 *			[body] => xxx
+		 *		)
+		 *	[package_srl] => stdClass Object
+		 *		(
+		 *			[body] => xxx
+		 *		)
+		 *	...
+		 *	[depfrom] => stdClass Object
+		 *		(
+		 *			[body] => xxx
+		 *		)
+		 * )
+		 *
+		 * $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');
+		 *
+		 * returns:
+		 * stdClass Object
+		 * (
+		 *	[category_srl] => xxx
+		 *	[package_srl] => xxx
+		 *	...
+		 *	[depfrom] => xxx
+		 * )
+		 * </pre>
+		 *
+		 * @param object $item
+		 * @param object $targets
+		 * @return object
+		 */
         function rearrange(&$item, &$targets)
         {
             $ret = null;
@@ -38,6 +88,76 @@
             return $ret;
         }
 
+		/**
+		 * Rearrage all item
+		 *
+		 * <pre>
+		 * $items:
+		 * Array
+		 * (
+		 *	[0] => stdClass Object
+		 *		(
+		 *			[category_srl] => stdClass Object
+		 *				(
+		 *					[body] => xxx
+		 *				)
+		 *			[package_srl] => stdClass Object
+		 *				(
+		 *					[body] => xxx
+		 *				)
+		 *			...
+		 *			[depfrom] => stdClass Object
+		 *				(
+		 *					[body] => xxx
+		 *				)
+		 *		)
+		 *	[1] => stdClass Object
+		 *		(
+		 *			...
+		 *		)
+		 *	...
+		 * )
+		 *
+		 * $packages:
+		 * Array
+		 * (
+		 *	[<i>package_srl</i>] => stdClass Object
+		 *		(
+		 *			[current_version] => xxx
+		 *			[need_update] => xxx
+		 *			[path] => xxx
+		 *			...
+		 *		)
+		 *	...
+		 * )
+		 *
+		 * return:
+		 * Array
+		 * (
+		 *	[<i>package_srl</i>] => stdClass Object
+		 *		(
+		 *			[category_srl] => xxx
+		 *			[package_srl] => xxx
+		 *			...
+		 *			[category] => xxx
+		 *			[current_version] => xxx
+		 *			[type] => xxx
+		 *			[need_update] => xxx
+		 *			[avail_remove] => xxx
+		 *			[deps] => Array
+		 *				(
+		 *					[0] => xxx
+		 *					...
+		 *				)
+		 *		)
+		 *	...
+		 * )
+		 * </pre>
+		 *
+		 * @param object $items Recived data from server
+		 * @param object $packages Local data
+		 * @return object
+		 */
         function rearranges($items, $packages = null)
         {
             if(!is_array($items)) $items = array($items);
@@ -113,6 +233,11 @@
             return $item_list;
         }
 
+		/**
+		 * Display installed packages
+		 *
+		 * @return Object
+		 */
         function dispAutoinstallAdminInstalledPackages()
         {
             $page = Context::get('page');
@@ -146,6 +271,11 @@
 			$security->encodeHTML('item_list..');
         }
 
+		/**
+		 * Display install package
+		 *
+		 * @return Object
+		 */
         function dispAutoinstallAdminInstall() {
             $package_srl = Context::get('package_srl');
             if(!$package_srl) return $this->dispAutoinstallAdminIndex();
@@ -219,6 +349,11 @@
 			$security->encodeHTML('package.' , 'package.depends..');
         }
 
+		/**
+		 * Display package list
+		 *
+		 * @return Object
+		 */
         function dispAutoinstallAdminIndex() {
             $oModuleModel = &getModel('module');
 			$config = $oModuleModel->getModuleConfig('autoinstall');
@@ -254,7 +389,7 @@
 					return;
 				}
             }
-			unset($_SESSION['__XE_EASYiNSTALL_REDIRECT__']);
+			unset($_SESSION['__XE_EASYINSTALL_REDIRECT__']);
 
             $page = Context::get('page');
             if(!$page) $page = 1;
@@ -299,6 +434,11 @@
 
         }
 
+		/**
+		 * Display category
+		 *
+		 * @return void
+		 */
         function dispCategory()
         {
             $oModel = &getModel('autoinstall');
@@ -306,6 +446,11 @@
             Context::set('categories', $this->categories);
         }
 
+		/**
+		 * Display uninstall package
+		 *
+		 * @return Object
+		 */
 		function dispAutoinstallAdminUninstall()
 		{
             $package_srl = Context::get('package_srl');
diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php
index 648ff56f6..c99bd2302 100644
--- a/modules/autoinstall/autoinstall.class.php
+++ b/modules/autoinstall/autoinstall.class.php
@@ -1,11 +1,15 @@
 <?php
-    /**
-     * @class  autoinstall
-     * @author NHN (developers@xpressengine.com)
-     * @brief high class of the autoinstall module
-     **/
-
+	/**
+	 * XML Generater
+	 * @author NHN (developers@xpressengine.com)
+	 */
     class XmlGenerater {
+		/**
+		 * Generate XML using given data
+		 *
+		 * @param array $params The data
+		 * @return string Returns xml string
+		 */
         function generate(&$params)
         {
             $xmlDoc = '<?xml version="1.0" encoding="utf-8" ?><methodCall><params>';
@@ -19,6 +23,12 @@
             return $xmlDoc;
         }
 
+		/**
+		 * Request data to server and returns result
+		 *
+		 * @param array $params Request data
+		 * @return object
+		 */
         function getXmlDoc(&$params)
         {
             $body = XmlGenerater::generate($params);
@@ -30,9 +40,21 @@
         }
     }
 
+    /**
+     * High class of the autoinstall module
+     * @author NHN (developers@xpressengine.com)
+     **/
     class autoinstall extends ModuleObject {
+		/**
+		 * Temporary directory path
+		 */
 		var $tmp_dir = './files/cache/autoinstall/';
 
+		/**
+		 * Constructor
+		 *
+		 * @return void
+		 */
 		function autoinstall()
 		{
 			$oModuleModel = &getModel('module');
@@ -44,7 +66,9 @@
 		}
 
         /**
-         * @brief for additional tasks required when installing
+         * For additional tasks required when installing
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
 			$oModuleController = &getController('module');
@@ -54,7 +78,9 @@
         }
 
         /**
-         * @brief method to check if installation is succeeded
+         * Method to check if installation is succeeded
+		 *
+		 * @return bool
          **/
         function checkUpdate() {
             $oDB =& DB::getInstance();
@@ -82,7 +108,9 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             $oDB =& DB::getInstance();
@@ -118,7 +146,8 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 * @return Object
          **/
         function recompileCache() {
         }
diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php
index 42ffe36a5..e143ad602 100644
--- a/modules/autoinstall/autoinstall.lib.php
+++ b/modules/autoinstall/autoinstall.lib.php
@@ -1,21 +1,75 @@
 <?php
 	require_once(_XE_PATH_.'libs/ftp.class.php');
 
+	/**
+	 * Module installer
+	 * @author NHN (developers@xpressengine.com)
+	 */
     class ModuleInstaller {
+		/**
+		 * Package information
+		 * @var object
+		 */
         var $package = null;
+
+		/**
+		 * Server's base url
+		 * @var string
+		 */
 		var $base_url;
+
+		/**
+		 * Temporary directory
+		 * @var string
+		 */
 		var $temp_dir = './files/cache/autoinstall/';
+
+		/**
+		 * Install path
+		 * @var string
+		 */
         var $target_path;
+
+		/**
+		 * Downloaded file path
+		 * @var string
+		 */
         var $download_file;
+
+		/**
+		 * ???
+		 * @var string
+		 */
         var $url;
+
+		/**
+		 * Download path
+		 * @var string
+		 */
         var $download_path;
+
+		/**
+		 * FTP password
+		 * @var string
+		 */
         var $ftp_password;
 
+		/**
+		 * Set server's base url
+		 *
+		 * @param string $url The url to set
+		 * @return void
+		 */
 		function setServerUrl($url)
 		{
 			$this->base_url = $url;
 		}
 
+		/**
+		 * Uninstall
+		 *
+		 * @return Object
+		 */
 		function uninstall()
 		{
 			$oModel =& getModel('autoinstall');
@@ -33,11 +87,22 @@
 			return $output;
 		}
 
+		/**
+		 * Set a FTP password
+		 *
+		 * @param string $ftp_password The password to set.
+		 * @return void
+		 */
         function setPassword($ftp_password)
         {
             $this->ftp_password = $ftp_password;
         }
 
+		/**
+		 * Download file from server
+		 *
+		 * @return void
+		 */
         function _download()
         {
             if($this->package->path == ".")
@@ -64,6 +129,13 @@
             FileHandler::writeFile($this->download_file, $buff);
         }
 
+		/**
+		 * Uninstall module.
+		 *
+		 * Call module's moduleUninstall() and drop all tables related module
+		 *
+		 * @return Object
+		 */
 		function uninstallModule()
 		{
             $path_array = explode("/", $this->package->path);
@@ -87,6 +159,13 @@
 			return new Object();
 		}
 
+		/**
+		 * Install module
+		 *
+		 * Call module's moduleInstall(), moduleUpdate() and create tables.
+		 *
+		 * @return void
+		 */
         function installModule()
         {
 			$path = $this->package->path;
@@ -116,6 +195,13 @@
             }
         }
 
+		/**
+		 * Install module.
+		 *
+		 * Download file and install module
+		 *
+		 * @return Object
+		 */
         function install()
         {
             $this->_download();
@@ -132,6 +218,11 @@
             return new Object();
         }
 
+		/**
+		 * Untar a downloaded tar ball
+		 *
+		 * @return array Returns file list
+		 */
 		function _unPack(){
             require_once(_XE_PATH_.'libs/tar.class.php');
 
@@ -150,6 +241,12 @@
             return $file_list;
 		}
 
+		/**
+		 * Remove directory
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeDir($path) {
 			$real_path = FileHandler::getRealPath($path);
 			$oDir = dir($path);
@@ -179,17 +276,46 @@
 
     }
 
+	/**
+	 * Module installer for SFTP
+	 * @author NHN (developers@xpressengine.com)
+	 */
     class SFTPModuleInstaller extends ModuleInstaller {
+		/**
+		 * FTP information
+		 * @var object
+		 */
 		var $ftp_info = null;
+
+		/**
+		 * SFTP connection
+		 * @var resource
+		 */
 		var $connection = null;
+
+		/**
+		 * SFTP resource
+		 * @var resource
+		 */
 		var $sftp = null;
 
+		/**
+		 * Constructor
+		 *
+		 * @param object $package Package information
+		 * @return void
+		 */
         function SFTPModuleInstaller(&$package)
         {
             $this->package =& $package;
 			$this->ftp_info = Context::getFTPInfo();
         }
 
+		/**
+		 * Connect to SFTP
+		 *
+		 * @return Object
+		 */
 		function _connect() {
 			if(!function_exists('ssh2_connect'))
 			{
@@ -216,9 +342,20 @@
 			return new Object();
 		}
 
+		/**
+		 * Close
+		 *
+		 * @return void
+		 */
 		function _close() {
 		}
 
+		/**
+		 * Remove file
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeFile($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -231,6 +368,12 @@
 			return new Object();
 		}
 
+		/**
+		 * Remove Directory
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeDir_real($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -243,6 +386,12 @@
 			return new Object();
 		}
 
+		/**
+		 * Copy directory
+		 *
+		 * @param array $file_list File list to copy
+		 * @return Object
+		 */
         function _copyDir(&$file_list){
             if(!$this->ftp_password) return new Object(-1,'msg_ftp_password_input');
 
@@ -270,17 +419,40 @@
         }
     }
 
-
+	/**
+	 * Module installer for PHP FTP
+	 * @author NHN (developers@xpressengine.com)
+	 */
     class PHPFTPModuleInstaller extends ModuleInstaller {
+		/**
+		 * FTP information
+		 * @var object
+		 */
 		var $ftp_info = null;
+
+		/**
+		 * FTP connection
+		 * @var resource
+		 */
 		var $connection = null;
 
+		/**
+		 * Constructor
+		 *
+		 * @param object $package Package information
+		 * @var void
+		 */
         function PHPFTPModuleInstaller(&$package)
         {
             $this->package =& $package;
 			$this->ftp_info = Context::getFTPInfo();
         }
 
+		/**
+		 * Connect to FTP
+		 *
+		 * @return Object
+		 */
 		function _connect()
 		{
             if($this->ftp_info->ftp_host)
@@ -313,6 +485,12 @@
 			return new Object();
 		}
 
+		/**
+		 * Remove file
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeFile($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -325,6 +503,12 @@
 			return new Object();
 		}
 
+		/**
+		 * Remove directory
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeDir_real($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -338,18 +522,36 @@
 		}
 
 
+		/**
+		 * Close
+		 *
+		 * @return void
+		 */
 		function _close() {
             ftp_close($this->connection);
 		}
 
+		/**
+		 * Copy directory
+		 *
+		 * @param array $file_list File list to copy
+		 * @return Object
+		 */
         function _copyDir(&$file_list) {
             if(!$this->ftp_password) return new Object(-1,'msg_ftp_password_input');
 
             $output = $this->_connect();
 			if(!$output->toBool()) return $output;
+
+			if(!$this->target_path) $this->target_path = '.';
+			if(substr($this->download_path, -1) == '/')
+			{
+				$this->download_path = substr($this->download_path, 0, -1);
+			}
             $target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 
             foreach($file_list as $k => $file){
+				if(!$file) continue;
                 $org_file = $file;
                 if($this->package->path == ".")
                 {
@@ -391,27 +593,49 @@
                         }
                     }
                 }
-                if(!ftp_put($this->connection, $target_dir .'/'. $file, FileHandler::getRealPath($this->download_path."/".$org_file), FTP_BINARY))
-                {
-                    return new Object(-1, "msg_ftp_upload_failed");
-                }
+				if(!ftp_put($this->connection, $target_dir .'/'. $file, FileHandler::getRealPath($this->download_path."/".$org_file), FTP_BINARY))
+				{
+					return new Object(-1, "msg_ftp_upload_failed");
+				}
             }
-
 			$this->_close();
             return new Object();
         }
     }
 
+	/**
+	 * Module installer for FTP
+	 * @author NHN (developers@xpressengine.com)
+	 */
     class FTPModuleInstaller extends ModuleInstaller {
+		/**
+		 * FTP instance
+		 * @var FTP
+		 */
 		var $oFtp = null;
+
+		/**
+		 * FTP information
+		 * @var object
+		 */
 		var $ftp_info = null;
 
+		/**
+		 * Constructor
+		 *
+		 * @param object $package Package information
+		 */
         function FTPModuleInstaller(&$package)
         {
             $this->package =& $package;
             $this->ftp_info =  Context::getFTPInfo();
         }
 
+		/**
+		 * Connect to FTP
+		 *
+		 * @return Object
+		 */
 		function _connect() {
             if($this->ftp_info->ftp_host)
             {
@@ -435,6 +659,12 @@
 			return new Object();
 		}
 
+		/**
+		 * Remove file
+		 *
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeFile($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -447,6 +677,11 @@
 			return new Object();
 		}
 
+		/**
+		 * Remove directory
+		 * @param string $path Path to remove
+		 * @return Object
+		 */
 		function _removeDir_real($path)
 		{
 			if(substr($path, 0, 2) == "./") $path = substr($path, 2);
@@ -459,10 +694,21 @@
 			return new Object();
 		}
 
+		/**
+		 * Close
+		 *
+		 * @return void
+		 */
 		function _close() {
             $this->oFtp->ftp_quit();
 		}
 
+		/**
+		 * Copy directory
+		 *
+		 * @param array $file_list File list to copy
+		 * @return Object
+		 */
 		function _copyDir(&$file_list){
             if(!$this->ftp_password) return new Object(-1,'msg_ftp_password_input');
 
diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php
index 38dabeaf0..9f512e78d 100644
--- a/modules/autoinstall/autoinstall.model.php
+++ b/modules/autoinstall/autoinstall.model.php
@@ -1,12 +1,16 @@
 <?php
     /**
-     * @class  autoinstallModel
+     * Model class of the autoinstall module
      * @author NHN (developers@xpressengine.com)
-     * @brief Model class of the autoinstall module
      **/
-
     class autoinstallModel extends autoinstall {
 
+		/**
+		 * Get category information
+		 *
+		 * @param int $category_srl The sequence of category to get information
+		 * @return object
+		 */
         function getCategory($category_srl)
         {
             $args->category_srl = $category_srl;
@@ -15,6 +19,11 @@
             return array_shift($output->data);
         }
 
+		/**
+		 * Get packages information
+		 *
+		 * @return array
+		 */
         function getPackages()
         {
             $output = executeQueryArray("autoinstall.getPackages");
@@ -22,6 +31,12 @@
             return $output->data;
         }
 
+		/**
+		 * Get installed packages information
+		 *
+		 * @param int $package_srl The sequence of package to get information
+		 * @return object
+		 */
         function getInstalledPackage($package_srl)
         {
             $args->package_srl = $package_srl;
@@ -30,6 +45,12 @@
             return array_shift($output->data);
         }
 
+		/**
+		 * Get one package information
+		 *
+		 * @param int $package_srl The sequence of package to get information
+		 * @return object
+		 */
         function getPackage($package_srl)
         {
             $args->package_srl = $package_srl;
@@ -38,6 +59,11 @@
             return array_shift($output->data);
         }
 
+		/**
+		 * Get category list
+		 *
+		 * @return array
+		 */
         function getCategoryList()
         {
             $output = executeQueryArray("autoinstall.getCategories");
@@ -70,6 +96,12 @@
             return $resultList;
         }
 
+		/**
+		 * Get pcakge count in category
+		 *
+		 * @param int $category_srl The sequence of category to get count
+		 * @return int
+		 */
         function getPackageCount($category_srl)
         {
             $args->category_srl = $category_srl;
@@ -78,6 +110,11 @@
             return $output->data->count;
         }
 
+		/**
+		 * Get installed package count
+		 *
+		 * @return int
+		 */
         function getInstalledPackageCount()
         {
             $output = executeQuery("autoinstall.getInstalledPackageCount", $args);
@@ -85,6 +122,15 @@
             return $output->data->count;
         }
 
+		/**
+		 * Set depth, children list and package count of category
+		 *
+		 * @param object $item Category information
+		 * @param int $depth Depth of category
+		 * @param array $list Category list
+		 * @param array $resultList Final result list
+		 * @return string $siblingList Comma seperated list
+		 */
         function setDepth(&$item, $depth, &$list, &$resultList)
         {
             $resultList[$item->category_srl] =& $item;
@@ -102,12 +148,23 @@
             return $siblingList;
         }
 
+		/**
+		 * Get lastest package information
+		 *
+		 * @return object Returns lastest package information. If no result returns null.
+		 */
         function getLatestPackage() {
             $output = executeQueryArray("autoinstall.getLatestPackage");
             if(!$output->data) return null;
             return array_shift($output->data);
         }
 
+		/**
+		 * Get installed package informations
+		 *
+		 * @param array $package_list Package sequence list to get information
+		 * @return array Returns array contains pacakge information. If no result returns empty array.
+		 */
         function getInstalledPackages($package_list) {
             $args->package_list = $package_list;
             $output = executeQueryArray("autoinstall.getInstalledPackages", $args);
@@ -120,6 +177,12 @@
             return $result;
         }
 
+		/**
+		 * Get installed package list
+		 *
+		 * @param int $page
+		 * @return Object
+		 */
         function getInstalledPackageList($page)
         {
             $args->page = $page;
@@ -138,6 +201,12 @@
             return $output;
         }
 
+		/**
+		 * Get type using path
+		 *
+		 * @param string $path Path to get type
+		 * @return string
+		 */
 		function getTypeFromPath($path)
 		{
 			if(!$path) return null;
@@ -148,6 +217,12 @@
 			return $type;
 		}
 
+		/**
+		 * Get config file path by type
+		 *
+		 * @param string $type Type to get config file path
+		 * @return string
+		 */
 		function getConfigFilePath($type)
 		{
 			$config_file = null;
@@ -176,6 +251,12 @@
 			return $config_file;
 		}
 
+		/**
+		 * Returns target is removable
+		 *
+		 * @param string $path Path
+		 * @return bool
+		 */
 		function checkRemovable($path)
 		{
 			$path_array = explode("/", $path);
@@ -186,6 +267,12 @@
 			else return false;
 		}
 
+		/**
+		 * Get sequence of package by path
+		 *
+		 * @param string $path Path to get sequence
+		 * @return int
+		 */
 		function getPackageSrlByPath($path)
 		{
 			if (!$path) return;
@@ -203,6 +290,12 @@
 			return $GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path];
 		}
 
+		/**
+		 * Get remove url by package srl
+		 *
+		 * @param int $packageSrl Sequence of pakcage to get url
+		 * @return string
+		 */
 		function getRemoveUrlByPackageSrl($packageSrl)
 		{
             $ftp_info =  Context::getFTPInfo();
@@ -213,6 +306,12 @@
 			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl);
 		}
 
+		/**
+		 * Get remove url by path
+		 *
+		 * @param string $path Path to get url
+		 * @return string
+		 */
 		function getRemoveUrlByPath($path)
 		{
 			if (!$path) return;
@@ -226,6 +325,12 @@
 			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl);
 		}
 
+		/**
+		 * Get update url by package srl
+		 *
+		 * @param int $packageSrl Sequence to get url
+		 * @return string
+		 */
 		function getUpdateUrlByPackageSrl($packageSrl)
 		{
 			if (!$packageSrl) return;
@@ -233,6 +338,12 @@
 			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl);
 		}
 
+		/**
+		 * Get update url by path
+		 *
+		 * @param string $path Path to get url
+		 * @return string
+		 */
 		function getUpdateUrlByPath($path)
 		{
 			if (!$path) return;
diff --git a/modules/autoinstall/autoinstall.view.php b/modules/autoinstall/autoinstall.view.php
index dc8b10307..97b788bcc 100644
--- a/modules/autoinstall/autoinstall.view.php
+++ b/modules/autoinstall/autoinstall.view.php
@@ -1,19 +1,24 @@
 <?php
 
     /**
-     * @class  autoinstallView
+     * View class of the autoinstall module
      * @author NHN (developers@xpressengine.com)
-     * @brief View class of the autoinstall module
      **/
-
     class autoinstallView extends autoinstall {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
 		}
 
+		/**
+		 * Test
+		 *
+		 * @return Object
+		 */
 		function dispAutoinstallTest(){
 			$file = "modules.test.tar";
             $checksum = '549989037bd8401d39b83ca2393d8131';
diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index 067a00c7d..31372da78 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  commentAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin controller class of the comment module
-     **/
-
+	/**
+	 * commentAdminController class
+	 * admin controller class of the comment module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentAdminController extends comment {
 
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 		
 	/**
-	* @brief Modify comment(s) status to publish/unpublish if calling module is using Comment Approval System
-	* @return Object 
+	* Modify comment(s) status to publish/unpublish if calling module is using Comment Approval System
+	* @return void
 	*/
 	function procCommentAdminChangePublishedStatusChecked()
 	{	// Error display if none is selected
@@ -31,13 +34,14 @@
 		
 		$this->procCommentAdminChangeStatus();
 		
-		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', '');
-			header('location:'.$returnUrl);
-			return;
-		}
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', '');
+		$this->setRedirectUrl($returnUrl);
 	}
 	
+	/**
+	* Change comment status
+	* @return void|object
+	*/
 	function procCommentAdminChangeStatus()
 	{
 		$will_publish = Context::get('will_publish');
@@ -149,9 +153,10 @@
 		
 	}
 	
-        /**
-         * @brief Delete the selected comment from the administrator page
-         **/
+		/**
+		 * Delete the selected comment from the administrator page
+		 * @return void
+		 */
         function procCommentAdminDeleteChecked() {
 			$isTrash = Context::get('is_trash');
 
@@ -221,13 +226,19 @@
             //$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;
-			}
+			//set url params
+			$search_keyword = Context::get('search_keyword');
+			$search_target = Context::get('search_target');
+			$page = Context::get('page');
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', $search_keyword, 'search_target', $search_target,'page',$page);
+			$this->setRedirectUrl($returnUrl);
         }
 
+		/**
+		 * comment move to trash
+		 * @return void|object
+		 */
 		function _moveCommentToTrash($commentSrlList, &$oCommentController, &$oDB)
 		{
 			require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
@@ -256,9 +267,10 @@
 			}
 		}
 
-        /**
-         * @brief cancel the blacklist of abused comments reported by other users
-         **/
+		/**
+		 * Cancel the blacklist of abused comments reported by other users
+		 * @return void|object
+		 */
         function procCommentAdminCancelDeclare() {
             $comment_srl = trim(Context::get('comment_srl'));
 
@@ -269,6 +281,10 @@
             }
         }
 
+		/**
+		 * Comment add to _SESSION
+		 * @return void
+		 */
 		function procCommentAdminAddCart()
 		{
 			$comment_srl = (int)Context::get('comment_srl');
@@ -289,9 +305,10 @@
 			}
 		}
 
-        /**
-         * @brief delete all comments of the specific module
-         **/
+		/**
+		 * Delete all comments of the specific module
+		 * @return object
+		 */
         function deleteModuleComments($module_srl) {
             $args->module_srl = $module_srl;
             $output = executeQuery('comment.deleteModuleComments', $args);
@@ -310,9 +327,10 @@
         }
 
         /**
-         * @brief restore comment from trash module, called by trash module
+         * Restore comment from trash module, called by trash module
 		 * this method is passived
-         **/
+		 * @return object
+         */
 		function restoreTrash($originObject)
 		{
 			if(is_array($originObject)) $originObject = (object)$originObject;
@@ -336,10 +354,11 @@
 			return $output;
 		}
 
-        /**
-         * @brief empty comment in trash, called by trash module
+		/**
+		 * Empty comment in trash, called by trash module
 		 * this method is passived
-         **/
+		 * @return object
+		 */
 		function emptyTrash($originObject)
 		{
 			$originObject = unserialize($originObject);
diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
index 16d64b6bd..16c266f62 100644
--- a/modules/comment/comment.admin.view.php
+++ b/modules/comment/comment.admin.view.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  commentAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the comment module
-     **/
-
+	/**
+	 * commentAdminView class
+	 * admin view class of the comment module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentAdminView extends comment {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Display the list(for administrators)
-         **/
+		/**
+		 * Display the list(for administrators)
+		 * @return void
+		 */
         function dispCommentAdminList() {
             // option to get a list
             $args->page = Context::get('page'); // /< Page
@@ -61,9 +64,10 @@
             $this->setTemplateFile('comment_list');
         }
 
-        /**
-         * @brief show the blacklist of comments in the admin page
-         **/
+		/**
+		 * Show the blacklist of comments in the admin page
+		 * @return void
+		 */
         function dispCommentAdminDeclared() {
             // option to get a blacklist
             $args->page = Context::get('page'); // /< Page
diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php
index 6fa2ab9e7..7ad0a0737 100644
--- a/modules/comment/comment.class.php
+++ b/modules/comment/comment.class.php
@@ -1,17 +1,19 @@
 <?php
-    /**
-     * @class  comment
-     * @author NHN (developers@xpressengine.com)
-     * @brief comment module's high class
-     **/
-
     require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
+	/**
+	 * comment
+	 * comment module's high class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class comment extends ModuleObject {
-
-        /**
-         * @brief implemented if additional tasks are required when installing
-         **/
+		/**
+		 * Implemented if additional tasks are required when installing
+		 * @return Object
+		 */
         function moduleInstall() {
             $oDB = &DB::getInstance();
 
@@ -36,9 +38,10 @@
             return new Object();
         }
 
-        /**
-         * @brief method to check if installation is succeeded
-         **/
+		/**
+		 * Method to check if installation is succeeded
+		 * @return bool
+		 */
         function checkUpdate() {
             $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
@@ -70,9 +73,10 @@
             return false;
         }
 
-        /**
-         * @brief Execute update
-         **/
+		/**
+		 * Execute update
+		 * @return Object
+		 */
         function moduleUpdate() {
             $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
@@ -128,9 +132,10 @@
             return new Object(0, 'success_updated');
         }
 
-        /**
-         * @brief Regenerate cache file
-         **/
+		/**
+		 * Regenerate cache file
+		 * @return void
+		 */
         function recompileCache() {
         }
     }
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 6aa8f7c8f..b39000b77 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  commentController
-     * @author NHN (developers@xpressengine.com)
-     * @brief controller class of the comment module
-     **/
-
+	/**
+	 * commentController class
+	 * controller class of the comment module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentController extends comment {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief action to handle recommendation votes on comments (Up)
-         **/
+		/**
+		 * Action to handle recommendation votes on comments (Up)
+		 * @return Object
+		 */
         function procCommentVoteUp() {
             if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -35,9 +38,10 @@
             return $this->updateVotedCount($comment_srl, $point);
         }
 
-        /**
-         * @brief action to handle recommendation votes on comments (Down)
-         **/
+		/**
+		 * Action to handle recommendation votes on comments (Down)
+		 * @return Object
+		 */
         function procCommentVoteDown() {
             if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -57,9 +61,10 @@
             return $this->updateVotedCount($comment_srl, $point);
         }
 
-        /**
-         * @brief action to be called when a comment posting is reported
-         **/
+		/**
+		 * Action to be called when a comment posting is reported
+		 * @return void|Object
+		 */
         function procCommentDeclare() {
             if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -69,9 +74,10 @@
             return $this->declaredComment($comment_srl);
         }
 
-        /**
-         * @brief trigger to delete its comments together with document deleted
-         **/
+		/**
+		 * Trigger to delete its comments together with document deleted
+		 * @return Object
+		 */
         function triggerDeleteDocumentComments(&$obj) {
             $document_srl = $obj->document_srl;
             if(!$document_srl) return new Object();
@@ -79,9 +85,10 @@
             return $this->deleteComments($document_srl, true);
         }
 
-        /**
-         * @brief trigger to delete corresponding comments when deleting a module
-         **/
+		/**
+		 * Trigger to delete corresponding comments when deleting a module
+		 * @return object
+		 */
         function triggerDeleteModuleComments(&$obj) {
             $module_srl = $obj->module_srl;
             if(!$module_srl) return new Object();
@@ -90,18 +97,20 @@
             return $oCommentController->deleteModuleComments($module_srl);
         }
 
-        /**
-         * @brief Authorization of the comments
-         * available only in the current connection of the session value
-         **/
+		/**
+		 * Authorization of the comments
+		 * available only in the current connection of the session value
+		 * @return void
+		 */
         function addGrant($comment_srl) {
             $_SESSION['own_comment'][$comment_srl] = true;
         }
 
 	/**
-	*@brief Check if module is using comment validation system
-	* @param number $document_srl
-	* @return boolean
+	* Check if module is using comment validation system
+	* @param int $document_srl
+	* @param int $module_srl
+	* @return bool
 	*/
 	function isModuleUsingPublishValidation($document_srl=null, $module_srl=null)
 	{
@@ -116,9 +125,12 @@
 		return $use_validation;
 	}
 		
-        /**
-         * @brief Enter comments
-         **/
+		/**
+		 * Enter comments
+		 * @param object $obj
+		 * @param bool $manual_inserted
+		 * @return object
+		 */
         function insertComment($obj, $manual_inserted = false) {
 
 		// check if comment's module is using comment validation and set the publish status to 0 (false)
@@ -314,9 +326,10 @@
         }
 		
 	/**
-	* @brief	Send email to module's admins after a new comment was interted successfully
-	*		if Comments Approval System is used 
-	* @param type $obj 
+	* Send email to module's admins after a new comment was interted successfully
+	* if Comments Approval System is used 
+	* @param object $obj 
+	* @return void
 	*/
 	function sendEmailToAdminAfterInsertComment($obj)
 	{
@@ -434,9 +447,12 @@
 	}
 		
 		
-        /**
-         * @brief fix the comment
-         **/
+		/**
+		 * Fix the comment
+		 * @param object $obj
+		 * @param bool $is_admin
+		 * @return object
+		 */
         function updateComment($obj, $is_admin = false) {
             $obj->__isupdate = true;
             // call a trigger (before)
@@ -517,9 +533,13 @@
             return $output;
         }
 
-        /**
-         * @brief Delete comment
-         **/
+		/**
+		 * Delete comment
+		 * @param int $comment_srl
+		 * @param bool $is_admin
+		 * @param bool $isMoveToTrash
+		 * @return object
+		 */
         function deleteComment($comment_srl, $is_admin = false, $isMoveToTrash = false) {
             // create the comment model object
             $oCommentModel = &getModel('comment');
@@ -588,8 +608,9 @@
         }
 
 	/**
-	* @brief remove all comment relation log
-	**/
+	* Remove all comment relation log
+	* @return Object
+	*/
 	function deleteCommentLog()
 	{
 		$this->_deleteDeclaredComments($args);
@@ -597,9 +618,11 @@
 		return new Object(0, 'success');
 	}
 
-        /**
-         * @brief remove all comments of the article
-         **/
+		/**
+		 * Remove all comments of the article
+		 * @param int $document_srl
+		 * @return object
+		 */
         function deleteComments($document_srl) {
             // create the document model object
             $oDocumentModel = &getModel('document');
@@ -649,10 +672,10 @@
         }
 
 		/**
-		 * @brief delete declared comment, log
-		 * @param $commentSrls : srls string (ex: 1, 2,56, 88)
+		 * delete declared comment, log
+		 * @param array|string $commentSrls : srls string (ex: 1, 2,56, 88)
 		 * @return void
-		 **/
+		 */
 		function _deleteDeclaredComments($commentSrls)
 		{
 			executeQuery('comment.deleteDeclaredComments', $commentSrls);
@@ -660,18 +683,21 @@
 		}
 
 		/**
-		 * @brief delete voted comment log
-		 * @param $commentSrls : srls string (ex: 1, 2,56, 88)
+		 * delete voted comment log
+		 * @param array|string $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
-         **/
+		/**
+		 * Increase vote-up counts of the comment
+		 * @param int $comment_srl
+		 * @param int $point
+		 * @return Object
+		 */
         function updateVotedCount($comment_srl, $point = 1) {
             if($point > 0) {
                 $failed_voted = 'failed_voted';
@@ -734,9 +760,11 @@
             return new Object(0, $success_message);
         }
 
-        /**
-         * @brief report a blamed comment
-         **/
+		/**
+		 * Report a blamed comment
+		 * @param $comment_srl
+		 * @return void
+		 */
         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');
@@ -788,9 +816,14 @@
             $this->setMessage('success_declared');
         }
 
-        /**
-         * @brief method to add a pop-up menu when clicking for displaying child comments
-         **/
+		/**
+		 * Method to add a pop-up menu when clicking for displaying child comments
+		 * @param string $url
+		 * @param string $str
+		 * @param strgin $icon
+		 * @param strgin $target
+		 * @return void
+		 */
         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();
@@ -804,9 +837,10 @@
             Context::set('comment_popup_menu_list', $comment_popup_menu_list);
         }
 
-        /**
-         * @brief save the comment extension form for each module
-         **/
+		/**
+		 * Save the comment extension form for each module
+		 * @return void
+		 */
         function procCommentInsertModuleConfig() {
             $module_srl = Context::get('target_module_srl');
             if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
@@ -832,13 +866,17 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
+		/**
+		* Comment module config setting
+		* @param int $srl
+		* @param object $comment_config
+		* @return Object
+		*/
 		function setCommentModuleConfig($srl, $comment_config){
             $oModuleController = &getController('module');
 			$oModuleController->insertModulePartConfig('comment',$srl,$comment_config);
@@ -846,8 +884,9 @@
 		}
 
 	/**
-	* @brief get comment all list
-	**/
+	* Get comment all list
+	* @return void
+	*/
 	function procCommentGetList()
 	{
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index a599d473a..d93dfcb25 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -1,15 +1,30 @@
 <?php
-    /**
-     * @class  commentItem
-     * @author NHN (developers@xpressengine.com)
-     * @brief comment Object
-     **/
-
+	/**
+	 * commentItem class
+	 * comment Object
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentItem extends Object {
-
+		/**
+		 * comment number
+		 * @var int
+		 */
         var $comment_srl = 0;
+		/**
+		 * Get the column list int the table
+		 * @var array
+		 */
 		var $columnList = array();
 
+		/**
+		 * Constructor
+		 * @param int $comment_srl
+		 * @param array $columnList
+		 * @return void
+		 */
         function commentItem($comment_srl = 0, $columnList = array()) {
             $this->comment_srl = $comment_srl;
 			$this->columnList = $columnList;
@@ -21,6 +36,10 @@
             $this->_loadFromDB();
         }
 
+		/**
+		 * Load comment data from DB and set to commentItem object
+		 * @return void
+		 */
         function _loadFromDB() {
             if(!$this->comment_srl) return;
 
@@ -30,6 +49,10 @@
             $this->setAttribute($output->data);
         }
 
+		/**
+		 * Comment attribute set to Object object
+		 * @return void
+		 */
         function setAttribute($attribute) {
             if(!$attribute->comment_srl) {
                 $this->comment_srl = null;
@@ -101,6 +124,10 @@
             return $this->get('notify_message')=='Y' ? true : false;
         }
 
+		/**
+		 * Notify to comment owner
+		 * @return void
+		 */
         function notify($type, $content) {
             // return if not useNotify
             if(!$this->useNotify()) return;
@@ -158,6 +185,10 @@
             return htmlspecialchars($this->get('nick_name'));
         }
 
+		/**
+		 * Return content with htmlspecialchars
+		 * @return string
+		 */
         function getContentText($strlen = 0) {
             if($this->isSecret() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
@@ -168,6 +199,10 @@
             return htmlspecialchars($content);
         }
 
+		/**
+		 * Return content after filter
+		 * @return string
+		 */
         function getContent($add_popup_menu = true, $add_content_info = true, $add_xe_content_class = true) {
             if($this->isSecret() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
@@ -203,6 +238,10 @@
             return $content;
         }
 
+		/**
+		 * Return summary content
+		 * @return string
+		 */
         function getSummary($str_size = 50, $tail = '...') {
             $content = $this->getContent(false, false);
             // for newline, insert a blank.
@@ -279,9 +318,10 @@
             return $file_list;
         }
 
-        /**
-         * @brief return the editor html
-         **/
+		/**
+		 * Return the editor html
+		 * @return string
+		 */
         function getEditor() {
             $module_srl = $this->get('module_srl');
             if(!$module_srl) $module_srl = Context::get('module_srl');
@@ -289,9 +329,10 @@
             return $oEditorModel->getModuleEditor('comment', $module_srl, $this->comment_srl, 'comment_srl', 'content');
         }
 
-        /**
-         * @brief return author's profile image
-         **/
+		/**
+		 * Return author's profile image
+		 * @return object
+		 */
         function getProfileImage() {
             if(!$this->isExists() || !$this->get('member_srl')) return;
             $oMemberModel = &getModel('member');
@@ -301,9 +342,10 @@
             return $profile_info->src;
         }
 
-        /**
-         * @brief return author's signiture
-         **/
+		/**
+		 * Return author's signiture
+		 * @return string
+		 */
         function getSignature() {
             // pass if the posting not exists.
             if(!$this->isExists() || !$this->get('member_srl')) return;
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 579a7bd9d..6ad9e36b6 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -1,23 +1,25 @@
 <?php
-    /**
-     * @class  commentModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief model class of the comment module
-     **/
-
+	/**
+	 * commentModel class
+	 * model class of the comment module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentModel extends comment {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief display the pop-up menu of the post
-         *
-         * Print, scrap, vote-up(recommen), vote-down(non-recommend), report features added
-         **/
+		/**
+		 * display the pop-up menu of the post
+		 * Print, scrap, vote-up(recommen), vote-down(non-recommend), report features added
+		 * @return void
+		 */
         function getCommentMenu() {
             // get the post's id number and the current login information
             $comment_srl = Context::get('target_srl');
@@ -84,27 +86,34 @@
         }
 
 
-        /**
-         * @brief check if you have a permission to comment_srl
-         *
-         * use only session information
-         **/
+		/**
+		 * Check if you have a permission to comment_srl
+		 * use only session information
+		 * @param int $comment_srl
+		 * @return bool
+		 */
         function isGranted($comment_srl) {
             return $_SESSION['own_comment'][$comment_srl];
         }
 
-        /**
-         * @brief Returns the number of child comments
-         **/
+		/**
+		 * Returns the number of child comments
+		 * @param int $comment_srl
+		 * @return int
+		 */
         function getChildCommentCount($comment_srl) {
             $args->comment_srl = $comment_srl;
             $output = executeQuery('comment.getChildCommentCount', $args);
             return (int)$output->data->count;
         }
 
-        /**
-         * @brief get the comment
-         **/
+		/**
+		 * Get the comment
+		 * @param int $comment_srl
+		 * @param bool $is_admin
+		 * @param array $columnList
+		 * @return commentItem
+		 */
         function getComment($comment_srl=0, $is_admin = false, $columnList = array()) {
             $oComment = new commentItem($comment_srl, $columnList);
             if($is_admin) $oComment->setGrant();
@@ -112,9 +121,12 @@
             return $oComment;
         }
 
-        /**
-         * @brief get the multiple comments(not paginating)
-         **/
+		/**
+		 * Get the comment list(not paginating)
+		 * @param string|array $comment_srl_list
+		 * @param array $columnList
+		 * @return array
+		 */
         function getComments($comment_srl_list, $columnList = array()) {
             if(is_array($comment_srl_list)) $comment_srls = implode(',',$comment_srl_list);
             // fetch from a database
@@ -138,9 +150,11 @@
             return $result;
         }
 
-        /**
-         * @brief get the total number of comments in corresponding with document_srl.
-         **/
+		/**
+		 * Get the total number of comments in corresponding with document_srl.
+		 * @param int $document_srl
+		 * @return int
+		 */
         function getCommentCount($document_srl) {
             $args->document_srl = $document_srl;
 		
@@ -165,9 +179,12 @@
             return (int)$total_count;
         }
 
-        /**
-         * @brief get the total number of comments in corresponding with document_srl.
-         **/
+		/**
+		 * Get the total number of comments in corresponding with document_srl.
+		 * @param string $date
+		 * @param array $moduleSrlList
+		 * @return int
+		 */
         function getCommentCountByDate($date = '', $moduleSrlList = array()) {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
 			if(count($moduleSrlList)>0) $args->module_srl = $moduleSrlList;
@@ -178,9 +195,12 @@
 			return $output->data->count;
         }
 
-        /**
-         * @brief get the total number of comments in corresponding with module_srl.
-         **/
+		/**
+		 * Get the total number of comments in corresponding with module_srl.
+		 * @param int $module_srl
+		 * @param bool $published
+		 * @return int
+		 */
         function getCommentAllCount($module_srl,$published=null) {
             $args->module_srl = $module_srl;
 			
@@ -211,6 +231,10 @@
             return (int)$total_count;
         }
 
+		/**
+		 * Get the module info without duplication
+		 * @return array
+		 */
 		function getDistinctModules()
 		{
 			$output = executeQuery('comment.getDistinctModules');
@@ -228,10 +252,13 @@
 			return $result;
 		}
 
-        /**
-         * @brief get the comment in corresponding with mid.
-         * TODO add commentItems to cache too
-         **/
+		/**
+		 * Get the comment in corresponding with mid.
+		 * @todo add commentItems to cache too
+		 * @param object $obj
+		 * @param array $columnList
+		 * @return array
+		 */
         function getNewestCommentList($obj, $columnList = array()) {
             if($obj->mid) {
                 $oModuleModel = &getModel('module');
@@ -283,9 +310,14 @@
             return $result;
         }
 
-        /**
-         * @brief get a comment list of the doc in corresponding woth document_srl.
-         **/
+		/**
+		 * Get a comment list of the doc in corresponding woth document_srl.
+		 * @param int $document_srl
+		 * @param int $page
+		 * @param bool $is_admin
+		 * @param int $count
+		 * @return object
+		 */
         function getCommentList($document_srl, $page = 0, $is_admin = false, $count = 0) {
                 if(!isset($document_srl)) return;
         	// cache controll
@@ -348,10 +380,13 @@
             return $output;
         }
 
-        /**
-         * @brief update a list of comments in corresponding with document_srl
-         * take care of previously used data than GA version
-         **/
+		/**
+		 * Update a list of comments in corresponding with document_srl
+		 * Take care of previously used data than GA version
+		 * @param int $module_srl
+		 * @param int $document_srl
+		 * @return void
+		 */
         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;
@@ -407,9 +442,14 @@
             FileHandler::removeFile($lock_file);
         }
 
-        /**
-         * @brief relocate comments in the hierarchical structure
-         **/
+		/**
+		 * Relocate comments in the hierarchical structure
+		 * @param array $comment_list
+		 * @param array $list
+		 * @param int $depth
+		 * @param object $parent
+		 * @return void
+		 */
         function _arrangeComment(&$comment_list, $list, $depth, $parent = null) {
             if(!count($list)) return;
             foreach($list as $key => $val) {
@@ -430,9 +470,12 @@
             }
         }
 
-        /**
-         * @brief get all the comments in time decending order(for administrators)
-         **/
+		/**
+		 * Get all the comments in time decending order(for administrators)
+		 * @param object $obj
+		 * @param array $columnList
+		 * @return object
+		 */
         function getTotalCommentList($obj, $columnList = array()) {
             $query_id = 'comment.getTotalCommentList';
             // Variables
@@ -526,9 +569,11 @@
             return $output;
         }
 
-        /**
-         * @brief get all the comment count in time decending order(for administrators)
-         **/
+		/**
+		 * Get all the comment count in time decending order(for administrators)
+		 * @param object $obj
+		 * @return int
+		 */
         function getTotalCommentCount($obj) {
             $query_id = 'comment.getTotalCommentCountByGroupStatus';
             // Variables
@@ -588,9 +633,11 @@
             return $output->data;
         }
 
-        /**
-         * @brief return a configuration of comments for each module
-         **/
+		/**
+		 * Return a configuration of comments for each module
+		 * @param int $module_srl
+		 * @return object
+		 */
         function getCommentConfig($module_srl) {
             $oModuleModel = &getModel('module');
             $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
@@ -598,6 +645,10 @@
             return $comment_config;
         }
 
+		/**
+		 * Return a list of voting member
+		 * @return void
+		 */
 		function getCommentVotedMemberList()
 		{
 			$comment_srl = Context::get('comment_srl');
@@ -636,6 +687,10 @@
 			$this->add('voted_member_list',$output->data);
 		}
 
+		/**
+		 * Return a secret status by secret field
+		 * @return array
+		 */
 		function getSecretNameList()
 		{
 			global $lang;
diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php
index 93f3fef20..14209d7a9 100644
--- a/modules/comment/comment.view.php
+++ b/modules/comment/comment.view.php
@@ -1,21 +1,25 @@
 <?php
-    /**
-     * @class  commentView
-     * @author NHN (developers@xpressengine.com)
-     * @brief comment module's view class
-     **/
-
+	/**
+	 * commentView class
+	 * comment module's view class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/comment
+	 * @version 0.1
+	 */
     class commentView extends comment {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief add a form fot comment setting on the additional setting of module
-         **/
+		/**
+		 * Add a form fot comment setting on the additional setting of module
+		 * @param string $obj
+		 * @return string
+		 */
         function triggerDispCommentAdditionSetup(&$obj) {
             $current_module_srl = Context::get('module_srl');
             $current_module_srls = Context::get('module_srls');
diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php
index 1066b38cb..2c38d2683 100644
--- a/modules/communication/communication.admin.controller.php
+++ b/modules/communication/communication.admin.controller.php
@@ -8,13 +8,14 @@
     class communicationAdminController extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief save configurations of the communication module
+         * save configurations of the communication module
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationAdminInsertConfig() {
             // get the default information
@@ -27,12 +28,8 @@
             $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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
     }
diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php
index 87967fca5..073b9b917 100644
--- a/modules/communication/communication.admin.model.php
+++ b/modules/communication/communication.admin.model.php
@@ -8,13 +8,14 @@
     class communicationAdminModel extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief return the html to select colorset of the skin
+         * the html to select colorset of the skin
+		 * @return void
          **/
         function getCommunicationAdminColorset() {
             $skin = Context::get('skin');
diff --git a/modules/communication/communication.admin.view.php b/modules/communication/communication.admin.view.php
index c45f37ccc..4129fc9d7 100644
--- a/modules/communication/communication.admin.view.php
+++ b/modules/communication/communication.admin.view.php
@@ -2,19 +2,20 @@
     /**
      * @class  communicationAdminView
      * @author NHN (developers@xpressengine.com)
-     * @brief communication module of the admin view class
+     * communication module of the admin view class
      **/
 
     class communicationAdminView extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief configuration to manage messages and friends
+         * configuration to manage messages and friends
+		 * @return void
          **/
         function dispCommunicationAdminConfig() {
             // Creating an object
diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php
index 075dc57a6..67d4144a1 100644
--- a/modules/communication/communication.class.php
+++ b/modules/communication/communication.class.php
@@ -2,13 +2,14 @@
     /**
      * @class  communication 
      * @author NHN (developers@xpressengine.com)
-     * @brief communication module of the high class
+     * communication module of the high class
      **/
 
     class communication extends ModuleObject {
 
         /**
-         * @brief Implement if additional tasks are necessary when installing
+         * Implement if additional tasks are necessary when installing
+		 * @return Object
          **/
         function moduleInstall() {
             // Create a temporary file storage for one new private message notification
@@ -17,7 +18,8 @@
         }
 
         /**
-         * @brief method to check if successfully installed.
+         * method to check if successfully installed.
+		 * @return boolean true : need to update false : don't need to update
          **/
         function checkUpdate() {
             if(!is_dir("./files/member_extra_info/new_message_flags")) return true;
@@ -25,7 +27,8 @@
         }
 
         /**
-         * @brief Update
+         * Update
+		 * @return Object
          **/
         function moduleUpdate() {
             if(!is_dir("./files/member_extra_info/new_message_flags")) 
@@ -34,7 +37,8 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 * @return void
          **/
         function recompileCache() {
         }
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 5fac8f36d..d9352b386 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -2,19 +2,20 @@
     /**
      * @class  communicationController
      * @author NHN (developers@xpressengine.com)
-     * @brief communication module of the Controller class
+     * communication module of the Controller class
      **/
 
     class communicationController extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief change the settings of message box
+         * change the settings of message box
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationUpdateAllowMessage() {
             if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
@@ -27,16 +28,13 @@
 
             $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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type'));
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
-         * @brief Send a message
+         * Send a message
+		 * @return Object
          **/
         function procCommunicationSendMessage() {
             // Check login information
@@ -93,6 +91,15 @@
             return $output;
         }
 
+        /**
+         * Send a message (DB controll)
+		 * @param int $sender_srl member_srl of sender
+		 * @param int $receiver_srl member_srl of receiver_srl
+		 * @param string $title
+		 * @param string $content
+		 * @param boolean $sender_log (default true)
+		 * @return Object
+         **/
         function sendMessage($sender_srl, $receiver_srl, $title, $content, $sender_log = true) {
             $content = removeHackTag($content); 
 			$title = htmlspecialchars($title);
@@ -149,7 +156,8 @@
         }
 
         /**
-         * @brief store a specific message into the archive
+         * store a specific message into the archive
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationStoreMessage() {
             // Check login information
@@ -172,7 +180,8 @@
         }
 
         /**
-         * @brief Delete a message
+         * Delete a message
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationDeleteMessage() {
             // Check login information
@@ -201,7 +210,8 @@
         }
 
         /**
-         * @brief Delete the multiple messages
+         * Delete the multiple messages
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationDeleteMessages() {
             // Check login information
@@ -238,15 +248,13 @@
 
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type'));
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Add a friend
+         * Add a friend
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationAddFriend() {
             // Check login information
@@ -279,7 +287,8 @@
         }
 
         /**
-         * @brief Move a group of the friend
+         * Move a group of the friend
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationMoveFriend() {
             // Check login information
@@ -309,15 +318,14 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Delete a friend 
+         * Delete a friend 
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationDeleteFriend() {
             // Check login information
@@ -325,10 +333,12 @@
             $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 = Context::get('friend_srl_list');
 
-            $friend_srl_list = explode('|@|', $friend_srl_list);
+			if(!is_array($friend_srl_list))
+			{
+				$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);
@@ -346,15 +356,14 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Add a group of friends
+         * Add a group of friends
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationAddFriendGroup() {
             // Check login information
@@ -406,7 +415,8 @@
         }
 
         /**
-         * @brief change a name of friend group
+         * change a name of friend group
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationRenameFriendGroup() {
             // Check login information
@@ -426,7 +436,8 @@
         }
 
         /**
-         * @brief Delete a group of friends
+         * Delete a group of friends
+		 * @return void|Object (success : void, fail : Object)
          **/
         function procCommunicationDeleteFriendGroup() {
             // Check login information
@@ -442,7 +453,9 @@
         }
 
         /**
-         * @brief set a message status to be 'already read'
+         * set a message status to be 'already read'
+		 * @param int $message_srl 
+		 * @return Object
          **/
         function setMessageReaded($message_srl) {
             $args->message_srl = $message_srl;
diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php
index f52487114..e603044ec 100644
--- a/modules/communication/communication.model.php
+++ b/modules/communication/communication.model.php
@@ -2,19 +2,21 @@
     /**
      * @class  communicationModel
      * @author NHN (developers@xpressengine.com)
-     * @brief communication module of the Model class
+     * communication module of the Model class
      **/
 
     class communicationModel extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief get the configuration
+         * get the configuration
+		 * @return object config of communication module
          **/
         function getConfig() {
             $oModuleModel = &getModel('module');
@@ -28,7 +30,10 @@
         }
 
         /**
-         * @brief get the message contents
+         * get the message contents
+		 * @param int $message_srl
+		 * @param array $columnList
+		 * @return object message information
          **/
         function getSelectedMessage($message_srl, $columnList = array()) {
             $logged_info = Context::get('logged_info');
@@ -54,12 +59,13 @@
                 $oCommunicationController->setMessageReaded($message_srl);
             }
 
-
             return $message;
         }
 
         /**
-         * @brief get a new message
+         * get a new message
+		 * @param array $columnList
+		 * @return object message information
          **/
         function getNewMessage($columnList = array()) {
             $logged_info = Context::get('logged_info');
@@ -77,10 +83,10 @@
         }
 
         /**
-         * @brief get a message list
-         * type = R: Received Message 
-         * type = S: Sent Message
-         * type = T: Archive
+         * get a message list
+         * @param string $message_type (R: Received Message, S: Sent Message, T: Archive)
+		 * @param array $columnList
+		 * @return Object
          **/
         function getMessages($message_type = "R", $columnList = array()) {
             $logged_info = Context::get('logged_info');
@@ -112,7 +118,10 @@
         }
 
         /**
-         * @brief Get a list of friends
+         * Get a list of friends
+		 * @param int $friend_group_srl (default 0)
+		 * @param array $columnList
+		 * @return Object
          **/
         function getFriends($friend_group_srl = 0, $columnList = array()) {
             $logged_info = Context::get('logged_info');
@@ -129,7 +138,9 @@
         }
 
         /**
-         * @brief check if a friend is already added
+         * check if a friend is already added
+		 * @param int $member_srl
+		 * @return int
          **/
         function isAddedFriend($member_srl) {
             $logged_info = Context::get('logged_info');
@@ -141,7 +152,9 @@
         }
 
         /**
-         * @brief Get a group of friends
+         * Get a group of friends
+		 * @param int $friend_group_srl
+		 * @return object
          **/
         function getFriendGroupInfo($friend_group_srl) {
             $logged_info = Context::get('logged_info');
@@ -154,22 +167,23 @@
         }
 
         /**
-         * @brief Get a list of groups
+         * Get a list of groups
+		 * @return array
          **/
         function getFriendGroups() {
             $logged_info = Context::get('logged_info');
             $args->member_srl = $logged_info->member_srl;
 
-            $output = executeQuery('communication.getFriendGroups', $args);
+            $output = executeQueryArray('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
+         * check whether to be added in the friend list
+		 * @param int $target_srl 
+		 * @return boolean (true : friend, false : not friend) 
          **/
         function isFriend($target_srl) {
             $logged_info = Context::get('logged_info');
diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php
index b6cb654a1..e93673bf5 100644
--- a/modules/communication/communication.view.php
+++ b/modules/communication/communication.view.php
@@ -2,13 +2,14 @@
     /**
      * @class  communicationView
      * @author NHN (developers@xpressengine.com)
-     * @brief View class of communication module
+     * View class of communication module
      **/
 
     class communicationView extends communication {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
             $oCommunicationModel = &getModel('communication');
@@ -28,7 +29,8 @@
         }
 
         /**
-         * @brief Display message box
+         * Display message box
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationMessages() {
             // Error appears if not logged-in
@@ -75,7 +77,8 @@
         }
 
         /**
-         * @brief display a new message
+         * display a new message
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationNewMessage() {
             $this->setLayoutFile('popup_layout');
@@ -101,7 +104,8 @@
         }
 
         /**
-         * @brief Display message sending
+         * Display message sending
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationSendMessage() {
             $this->setLayoutFile("popup_layout");
@@ -156,7 +160,8 @@
         }
 
         /**
-         * @brief display a list of friends
+         * display a list of friends
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationFriend() {
             // Error appears if not logged-in
@@ -192,7 +197,8 @@
         }
 
         /**
-         * @brief Add a friend
+         * display Add a friend
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationAddFriend() {
             $this->setLayoutFile("popup_layout");
@@ -216,7 +222,8 @@
         }
 
         /**
-         * @brief Add a group of friends
+         * display add a group of friends
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispCommunicationAddFriendGroup() {
             $this->setLayoutFile("popup_layout");
@@ -230,9 +237,7 @@
                 $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/skins/default/friends.html b/modules/communication/skins/default/friends.html
index 91b835e94..42019b88c 100644
--- a/modules/communication/skins/default/friends.html
+++ b/modules/communication/skins/default/friends.html
@@ -37,7 +37,7 @@
 					<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>
+					<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list[]', { wrap:'fo_friend_list' });" /></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -45,7 +45,7 @@
 					<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>
+					<td><input type="checkbox" name="friend_srl_list[]" value="{$val->friend_srl}" /></td>
 				</tr>
 			</tbody>
 		</table>
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index ca3c22911..130e49108 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -60,7 +60,7 @@
 					</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' }); return false;" /></th>
+					<th scope="col"><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list[]', { wrap:'fo_message_list' });" /></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/modules/counter/counter.admin.view.php b/modules/counter/counter.admin.view.php
index 5e3565892..11cbaf0cc 100644
--- a/modules/counter/counter.admin.view.php
+++ b/modules/counter/counter.admin.view.php
@@ -1,14 +1,16 @@
 <?php
     /**
-     * @class  counterAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief Admin view class of counter module
+     * Admin view class of counter module
+	 *
+	 * @author NHN (developers@xpressengine.com)
      **/
 
     class counterAdminView extends counter {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
             // set the template path
@@ -16,7 +18,9 @@
         }
 
         /**
-         * @brief Admin page 
+         * Admin page 
+		 *
+		 * @return Object
          **/
         function dispCounterAdminIndex() {
             // set today's if no date is given
diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php
index 80dcfe842..074815bdb 100644
--- a/modules/counter/counter.class.php
+++ b/modules/counter/counter.class.php
@@ -1,14 +1,15 @@
 <?php
     /**
-     * @class  counter
+     * High class of counter module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief high class of counter module
      **/
 
     class counter extends ModuleObject {
 
         /**
-         * @brief Implement if additional tasks are necessary when installing
+         * Implement if additional tasks are necessary when installing
+		 * @return Object
          **/
         function moduleInstall() {
             $oCounterController = &getController('counter');
@@ -21,7 +22,9 @@
         }
 
         /**
-         * @brief method if successfully installed
+         * method if successfully installed
+		 *
+		 * @return bool
          **/
         function checkUpdate() {
             // Add site_srl to the counter
@@ -33,7 +36,9 @@
         }
 
         /**
-         * @brief Update
+         * Module update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             // Add site_srl to the counter
@@ -45,7 +50,9 @@
         }
 
         /**
-         * @brief re-generate the cache file
+         * re-generate the cache file
+		 *
+		 * @return Object
          **/
         function recompileCache() {
         }
diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php
index c4b6b3c21..f0f5042f8 100644
--- a/modules/counter/counter.controller.php
+++ b/modules/counter/counter.controller.php
@@ -1,27 +1,33 @@
 <?php
     /**
-     * @class  counterController
-     * @author NHN (developers@xpressengine.com)
-     * @brief counter module's controller class
+     * Counter module's controller class
+	 *
+	 * @author NHN (developers@xpressengine.com)
      **/
 
     class counterController extends counter {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Counter logs
-		 * @deprecated, if want use below function, you can use 'counterExecute' function instead this function
+         * Counter logs.
+		 * If want use below function, you can use 'counterExecute' function instead this function
+		 *
+		 * @return void
          **/
         function procCounterExecute() {
         }
 
         /**
-         * @brief Counter logs
+         * Counter logs
+		 *
+		 * @return void
          **/
         function counterExecute() {
             $oDB = &DB::getInstance();
@@ -52,7 +58,10 @@
         }
 
         /**
-         * @brief Leave logs
+         * Leave logs
+		 *
+		 * @param integer $site_srl
+		 * @return Object result of count query
          **/
         function insertLog($site_srl=0) {
             $args->regdate = date("YmdHis");
@@ -62,7 +71,10 @@
         }
 
         /**
-         * @brief Register the unique visitor
+         * Register the unique visitor
+		 *
+		 * @param integer $site_srl
+		 * @return void
          **/
         function insertUniqueVisitor($site_srl=0) {
             if($site_srl) {
@@ -80,7 +92,10 @@
         }
 
         /**
-         * @brief Register pageview
+         * Register pageview
+		 *
+		 * @param integer $site_srl
+		 * @return void
          **/
         function insertPageView($site_srl=0) {
             if($site_srl) { 
@@ -98,7 +113,10 @@
         }
 
         /**
-         * @brief Add the total counter status
+         * Add the total counter status
+		 *
+		 * @param integer $site_srl
+		 * @return void
          **/
         function insertTotalStatus($site_srl=0) {
             $args->regdate = 0;
@@ -111,7 +129,11 @@
         }
 
         /**
-         * @brief Add today's counter status
+         * Add today's counter status
+		 *
+		 * @param integer $regdate date(YYYYMMDD) type
+		 * @param integer $site_srl
+		 * @return void
          **/
         function insertTodayStatus($regdate = 0, $site_srl=0) {
             if($regdate) $args->regdate = $regdate;
@@ -134,7 +156,10 @@
         }
 
         /**
-         * @brief Delete counter logs of the specific virtual site
+         * Delete counter logs of the specific virtual site
+		 *
+		 * @param integer $site_srl
+		 * @return void
          **/
         function deleteSiteCounterLogs($site_srl) {
             $args->site_srl = $site_srl;
diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php
index 9b26f33fe..5cd8d5c6e 100644
--- a/modules/counter/counter.model.php
+++ b/modules/counter/counter.model.php
@@ -1,20 +1,25 @@
 <?php
     /**
-     * @class  counterModel
+     * Model class of counter module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief Model class of counter module
      **/
 
     class counterModel extends counter {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Verify logs
+         * Verify logs
+		 *
+		 * @param integer $site_srl Site_srl
+		 * @return bool
          **/
         function isLogged($site_srl=0) {
             $args->regdate = date("Ymd");
@@ -25,7 +30,10 @@
         }
 
         /**
-         * @brief Check if a row of today's counter status exists 
+         * Check if a row of today's counter status exists 
+		 *
+		 * @param integer $site_srl Site_srl
+		 * @return bool
          **/
         function isInsertedTodayStatus($site_srl=0) {
             $args->regdate = date("Ymd");
@@ -39,16 +47,20 @@
         }
 
         /**
-         * @brief Get access statistics for a given date
+         * Get access statistics for a given date
+		 *
+		 * @param mixed $selected_date Date(YYYYMMDD) list 
+		 * @param integer $site_srl Site_srl
+		 * @return Object
          **/
-        function getStatus($selected_date, $site_srl=0) {
+        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;
+                if(strlen($selected_date) == 8) $selected_date = $selected_date;
                 $args->regdate = $selected_date;
             }
 
@@ -72,7 +84,12 @@
         }
 
         /**
-         * @brief Select hourly logs of a given date
+         * Select hourly logs of a given date
+		 *
+		 * @param string $type Choice time interval (year, week, month, hour or DEFAULT)
+		 * @param integer $selected_date Date(YYYYMMDD)
+		 * @param integer $site_srl Site_srl
+		 * @return Object
          **/
         function getHourlyStatus($type='hour', $selected_date, $site_srl=0) {
             $max = 0;
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index d69d38724..3d1ea54e4 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  documentAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief document the module's admin controller class
-     **/
-
+	/**
+	 * documentAdminController class
+	 * Document the module's admin controller class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentAdminController extends document {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Remove the selected docs from admin page
-         **/
+		/**
+		 * Remove the selected docs from admin page
+		 * @return void
+		 */
         function procDocumentAdminDeleteChecked() {
             // error appears if no doc is selected
             $cart = Context::get('cart');
@@ -35,9 +38,13 @@
             $this->setMessage( sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
         }
 
-        /**
-         * @brief change the module to move a specific article
-         **/
+		/**
+		 * Change the module to move a specific article
+		 * @param array $document_srl_list
+		 * @param int $module_srl
+		 * @param int $category_srl
+		 * @return Object
+		 */
         function moveDocumentModule($document_srl_list, $module_srl, $category_srl) {
             if(!count($document_srl_list)) return;
 
@@ -169,9 +176,13 @@
             return new Object();
         }
 
-        /**
-         * @brief Copy the post
-         **/
+		/**
+		 * Copy the post
+		 * @param array $document_srl_list
+		 * @param int $module_srl
+		 * @param int $category_srl
+		 * @return object
+		 */
         function copyDocumentModule($document_srl_list, $module_srl, $category_srl) {
             if(!count($document_srl_list)) return;
 
@@ -363,9 +374,11 @@
             return $output;
         }
 
-        /**
-         * @brief Delete all documents of the module
-         **/
+		/**
+		 * Delete all documents of the module
+		 * @param int $module_srl
+		 * @return object
+		 */
         function deleteModuleDocument($module_srl) {
             $args->module_srl = $module_srl;
 			$oDocumentModel = &getModel('document');
@@ -395,9 +408,10 @@
             return $output;
         }
 
-        /**
-         * @brief Save the default settings of the document module
-         **/
+		/**
+		 * Save the default settings of the document module
+		 * @return object
+		 */
         function procDocumentAdminInsertConfig() {
             // Get the basic information
             $config = Context::gets('thumbnail_type');
@@ -405,17 +419,14 @@
             $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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
-        /**
-         * @brief Revoke declaration of the blacklisted posts
-         **/
+		/**
+		 * Revoke declaration of the blacklisted posts
+		 * @return object
+		 */
         function procDocumentAdminCancelDeclare() {
             $document_srl = trim(Context::get('document_srl'));
 
@@ -426,9 +437,10 @@
             }
         }
 
-        /**
-         * @brief Delete all thumbnails
-         **/
+		/**
+		 * Delete all thumbnails
+		 * @return void
+		 */
         function procDocumentAdminDeleteAllThumbnail() {
             // delete all of thumbnail_ *. jpg files from files/attaches/images/ directory (prior versions to 1.0.4)
             $this->deleteThumbnailFile('./files/attach/images');
@@ -438,6 +450,10 @@
             $this->setMessage('success_deleted');
         }
 
+		/**
+		 * Delete thumbnails with subdirectory
+		 * @return void
+		 */
         function deleteThumbnailFile($path) {
             $directory = dir($path);
             while($entry = $directory->read()) {
@@ -453,9 +469,10 @@
             $directory->close();
         }
 
-        /**
-         * @brief Add or modify extra variables of the module
-         **/
+		/**
+		 * Add or modify extra variables of the module
+		 * @return void|object
+		 */
         function procDocumentAdminInsertExtraVar() {
             $module_srl = Context::get('module_srl');
             $var_idx = Context::get('var_idx');
@@ -490,16 +507,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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief delete extra variables of the module
-         **/
+		/**
+		 * Delete extra variables of the module
+		 * @return void|object
+		 */
         function procDocumentAdminDeleteExtraVar() {
             $module_srl = Context::get('module_srl');
             $var_idx = Context::get('var_idx');
@@ -512,9 +528,10 @@
             $this->setMessage('success_deleted');
         }
 
-        /**
-         * @brief control the order of extra variables
-         **/
+		/**
+		 * Control the order of extra variables
+		 * @return void|object
+		 */
         function procDocumentAdminMoveExtraVar() {
             $type = Context::get('type');
             $module_srl = Context::get('module_srl');
@@ -576,6 +593,10 @@
             }
         }
 
+		/**
+		 * Insert alias for document
+		 * @return void|object
+		 */
         function procDocumentAdminInsertAlias() {
             $args = Context::gets('module_srl','document_srl', 'alias_title');
             $alias_srl = Context::get('alias_srl');
@@ -591,28 +612,28 @@
             }
             $output = executeQuery($query, $args);
 
-			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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
+		/**
+		 * Delete alias for document
+		 * @return void|object
+		 */
         function procDocumentAdminDeleteAlias() {
 			$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() && !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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $document_srl);
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
+		/**
+		 * Restor document from trash
+		 * @return void|object
+		 */
         function procDocumentAdminRestoreTrash() {
             $trash_srl = Context::get('trash_srl');
 			$this->restoreTrash($trash_srl);
@@ -671,10 +692,12 @@
 			return $output;
 		}*/
 
-        /**
-         * @brief restore document from trash module, called by trash module
-		 * this method is passived
-         **/
+		/**
+		 * Restore document from trash module, called by trash module
+		 * This method is passived
+		 * @param object|array $originObject
+		 * @return object
+		 */
 		function restoreTrash($originObject)
 		{
 			if(is_array($originObject)) $originObject = (object)$originObject;
@@ -712,10 +735,12 @@
 			return new Object(0, 'success');
 		}
 
-        /**
-         * @brief empty document in trash, called by trash module
-		 * this method is passived
-         **/
+		/**
+		 * Empty document in trash, called by trash module
+		 * This method is passived
+		 * @param string $originObject string is serialized object
+		 * @return object
+		 */
 		function emptyTrash($originObject)
 		{
 			$originObject = unserialize($originObject);
diff --git a/modules/document/document.admin.model.php b/modules/document/document.admin.model.php
index 819f9cb00..68b4aef60 100644
--- a/modules/document/document.admin.model.php
+++ b/modules/document/document.admin.model.php
@@ -1,22 +1,25 @@
 <?php
-    /**
-     * @class  documentAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief document the module's admin model class
-     **/
-
+	/**
+	 * documentAdminModel class
+	 * Document the module's admin model class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentAdminModel extends document {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-          * @brief get a document list from the trash
-          **/
+		/**
+		 * Get a document list from the trash
+		 * @param object $obj
+		 * @return object
+		 */
         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';
@@ -64,9 +67,11 @@
             return $output;
         }
 
-        /**
-          * @brief get the doc which has trash_srl from the trash can
-          **/
+		/**
+		 * Get the doc which has trash_srl from the trash can
+		 * @param int $trash_srl
+		 * @return object
+		 */
         function getDocumentTrash($trash_srl) {
             $args->trash_srl = $trash_srl;
             $output = executeQuery('document.getTrash', $args);
@@ -77,9 +82,13 @@
             return $node;
         }
 
-        /**
-         * @brief Return document count with date
-         **/
+		/**
+		 * Return document count with date
+		 * @param string $date
+		 * @parpam array $moduleSrlList
+		 * @param array $statusList
+		 * @return int
+		 */
         function getDocumentCountByDate($date = '', $moduleSrlList = array(), $statusList = array()) {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
 			if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 21ad01a60..0022fb365 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -1,14 +1,17 @@
 <?php
-    /**
-     * @class  documentAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief document admin view of the module class
-     **/
-
+	/**
+	 * documentAdminView class
+	 * Document admin view of the module class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentAdminView extends document {
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
 			// check current location in admin menu
 			$oModuleModel = &getModel('module');
@@ -23,9 +26,10 @@
 			}
         }
 
-        /**
-         * @brief Display a list(administrative)
-         **/
+		/**
+		 * Display a list(administrative)
+		 * @return void
+		 */
         function dispDocumentAdminList() {
             // option to get a list
             $args->page = Context::get('page'); // /< Page
@@ -67,9 +71,10 @@
             $this->setTemplateFile('document_list');
         }
 
-        /**
-         * @brief Set a document module
-         **/
+		/**
+		 * Set a document module
+		 * @return void
+		 */
         function dispDocumentAdminConfig() {
             $oDocumentModel = &getModel('document');
             $config = $oDocumentModel->getDocumentConfig();
@@ -80,9 +85,10 @@
             $this->setTemplateFile('document_config');
         }
 
-        /**
-         * @brief display a report list on the admin page
-         **/
+		/**
+		 * Display a report list on the admin page
+		 * @return void
+		 */
         function dispDocumentAdminDeclared() {
 			// option for a list
 			$args->page = Context::get('page'); // /< Page
@@ -120,6 +126,10 @@
 			$this->setTemplateFile('declared_list');
         }
 
+		/**
+		 * Display a alias list on the admin page
+		 * @return void
+		 */
         function dispDocumentAdminAlias() {
             $args->document_srl = Context::get('document_srl');
             if(!$args->document_srl) return $this->dispDocumentAdminList();
@@ -145,6 +155,10 @@
             $this->setTemplateFile('document_alias');
         }
 
+		/**
+		 * Display a trash list on the admin page
+		 * @return void
+		 */
         function dispDocumentAdminTrashList() {
             // options for a list
             $args->page = Context::get('page'); // /< Page
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index f8a18ede9..cfdfb0f5b 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -1,333 +1,337 @@
 <?php
-    /**
-     * @class  document
-     * @author NHN (developers@xpressengine.com)
-     * @brief document the module's high class
-     **/
+require_once(_XE_PATH_.'modules/document/document.item.php');
 
-    require_once(_XE_PATH_.'modules/document/document.item.php');
+/**
+ * document class
+ * @brief document the module's high class
+ * {@internal Silently adds one extra Foo to compensate for lack of Foo }
+ *
+ * @author NHN (developers@xpressengine.com)
+ * @package /modules/document
+ * @version 0.1
+ */
+class document extends ModuleObject
+{
+	/**
+	 * Search option to use in admin page
+	 * @var array
+	 */
+	var $search_option = array('title','content','title_content','user_name',); // /< Search options
+	/**
+	 * Status list
+	 * @var array
+	 */
+	var $statusList = array('private'=>'PRIVATE', 'public'=>'PUBLIC', 'secret'=>'SECRET', 'temp'=>'TEMP');
 
-    class document extends ModuleObject {
+	/**
+	 * Implement if additional tasks are necessary when installing
+	 * @return Object
+	 */
+	function moduleInstall()
+	{
+		// Register action forward (to use in administrator mode)
+		$oModuleController = &getController('module');
 
-        // 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');
+		$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');
 
-        /**
-         * @brief Implement if additional tasks are necessary when installing
-         **/
-        function moduleInstall() {
-            // Register action forward (to use in administrator mode)
-            $oModuleController = &getController('module');
+		// 2009. 01. 29 Added a trigger for additional setup
+		$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 
-            $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');
+		return new Object();
+	}
 
-            // 2009. 01. 29 Added a trigger for additional setup
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+	/**
+	 * A method to check if successfully installed
+	 * @return bool
+	 */
+	function checkUpdate() {
+		$oDB = &DB::getInstance();
+		$oModuleModel = &getModel('module');
 
-            return new Object();
-        }
+		// 2007. 7. 25: Add a column(notify_message) for notification
+		if(!$oDB->isColumnExists("documents","notify_message")) return true;
 
-        /**
-         * @brief a method to check if successfully installed
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
+		// 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. 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;
-
-			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) 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"));
-
-			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
-			{
-				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
-			}
-
-            return new Object(0,'success_updated');
-        }
-
-        /**
-         * @brief Re-generate the cache file
-         **/
-        function recompileCache() {
-        }
+		// 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;
 
 		/**
-		 * @brief Document Status List
-		 **/
-		function getStatusList()
-		{
-			return $this->statusList;
+		 * 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;
+
+		// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
+		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+
+		return false;
+	}
+
+	/**
+	 * Execute update
+	 * @return Object
+	 */
+	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);
 		}
 
-		function getDefaultStatus()
-		{
-			return $this->statusList['public'];
+		// 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"));
 		}
 
-		function getConfigStatus($key)
-		{
-			if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
-			else $this->getDefaultStatus();
+		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"));
+
+		// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
+		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
+		{
+			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
+		}
+
+		return new Object(0,'success_updated');
+	}
+
+	/**
+	 * Re-generate the cache file
+	 * @return void
+	 */
+	function recompileCache() {
+	}
+
+	/**
+	 * Document Status List
+	 * @return array
+	 */
+	function getStatusList()
+	{
+		return $this->statusList;
+	}
+
+	/**
+	 * Return default status
+	 * @return string
+	 */
+	function getDefaultStatus()
+	{
+		return $this->statusList['public'];
+	}
+
+	/**
+	 * Return status by key
+	 * @return string
+	 */
+	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 a805a4cb1..6d702968b 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1,20 +1,24 @@
 <?php
 /**
- * @class  documentController
+ * documentController class
+ * document the module's controller class
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief document the module's controller class
- **/
+ * @package /modules/document
+ * @version 0.1
+ */
 class documentController extends document {
-
 	/**
-	 * @brief Initialization
-	 **/
+	 * Initialization
+	 * @return void
+	 */
 	function init() {
 	}
 
 	/**
-	 * @breif action to handle vote-up of the post (Up)
-	 **/
+	 * Action to handle vote-up of the post (Up)
+	 * @return Object
+	 */
 	function procDocumentVoteUp() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -34,6 +38,13 @@ class documentController extends document {
 		return $this->updateVotedCount($document_srl, $point);
 	}
 
+	/**
+	 * insert alias
+	 * @param int $module_srl
+	 * @param int $document_srl
+	 * @param string $alias_title
+	 * @return object
+	 */
 	function insertAlias($module_srl, $document_srl, $alias_title) {
 		$args->alias_srl = getNextSequence();
 		$args->module_srl = $module_srl;
@@ -45,8 +56,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @breif action to handle vote-up of the post (Down)
-	 **/
+	 * Action to handle vote-up of the post (Down)
+	 * @return Object
+	 */
 	function procDocumentVoteDown() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -67,8 +79,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Action called when the post is reported by other member
-	 **/
+	 * Action called when the post is reported by other member
+	 * @return void|Object
+	 */
 	function procDocumentDeclare() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
@@ -78,18 +91,35 @@ class documentController extends document {
 		return $this->declaredDocument($document_srl);
 	}
 
+	/**
+	 * Delete alias when module deleted
+	 * @param int $module_srl
+	 * @return void
+	 */
 	function deleteDocumentAliasByModule($module_srl)
 	{
 		$args->module_srl = $module_srl;
 		executeQuery("document.deleteAlias", $args);
 	}
 
+	/**
+	 * Delete alias when document deleted
+	 * @param int $document_srl
+	 * @return void
+	 */
 	function deleteDocumentAliasByDocument($document_srl)
 	{
 		$args->document_srl = $document_srl;
 		executeQuery("document.deleteAlias", $args);
 	}
 
+	/**
+	 * Delete document history
+	 * @param int $history_srl
+	 * @param int $document_srl
+	 * @param int $module_srl
+	 * @return void
+	 */
 	function deleteDocumentHistory($history_srl, $document_srl, $module_srl)
 	{
 		$args->history_srl = $history_srl;
@@ -100,8 +130,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief A trigger to delete all posts together when the module is deleted
-	 **/
+	 * A trigger to delete all posts together when the module is deleted
+	 * @param object $obj
+	 * @return Object
+	 */
 	function triggerDeleteModuleDocuments(&$obj) {
 		$module_srl = $obj->module_srl;
 		if(!$module_srl) return new Object();
@@ -126,16 +158,22 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Grant a permisstion of the document
+	 * Grant a permisstion of the document
 	 * Available in the current connection with session value
-	 **/
+	 * @param int $document_srl
+	 * @return void
+	 */
 	function addGrant($document_srl) {
 		$_SESSION['own_document'][$document_srl] = true;
 	}
 
 	/**
-	 * @brief Insert the document
-	 **/
+	 * Insert the document
+	 * @param object $obj
+	 * @param bool $manual_inserted
+	 * @param bool $isRestore
+	 * @return object
+	 */
 	function insertDocument($obj, $manual_inserted = false, $isRestore = false) {
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -261,8 +299,11 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Update the document
-	 **/
+	 * Update the document
+	 * @param object $source_obj
+	 * @param object $obj
+	 * @return object
+	 */
 	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';
@@ -435,8 +476,13 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Deleting Documents
-	 **/
+	 * Deleting Documents
+	 * @param int $document_srl
+	 * @param bool $is_admin
+	 * @param bool $isEmptyTrash
+	 * @param documentItem $oDocument
+	 * @return object
+	 */
 	function deleteDocument($document_srl, $is_admin = false, $isEmptyTrash = false, $oDocument = null) {
 		// Call a trigger (before)
 		$trigger_obj->document_srl = $document_srl;
@@ -518,10 +564,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief delete declared document, log
-	 * @param $documentSrls : srls string (ex: 1, 2,56, 88)
+	 * Delete declared document, log
+	 * @param string $documentSrls (ex: 1, 2,56, 88)
 	 * @return void
-	 **/
+	 */
 	function _deleteDeclaredDocuments($documentSrls)
 	{
 		executeQuery('document.deleteDeclaredDocuments', $documentSrls);
@@ -529,28 +575,30 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief delete readed log
-	 * @param $documentSrls : srls string (ex: 1, 2,56, 88)
+	 * Delete readed log
+	 * @param string $documentSrls (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)
+	 * Delete voted log
+	 * @param string $documentSrls (ex: 1, 2,56, 88)
 	 * @return void
-	 **/
+	 */
 	function _deleteDocumentVotedLog($documentSrls)
 	{
 		executeQuery('document.deleteDocumentVotedLog', $documentSrls);
 	}
 
 	/**
-	 * @brief Move the doc into the trash
-	 **/
+	 * Move the doc into the trash
+	 * @param object $obj
+	 * @return object
+	 */
 	function moveDocumentToTrash($obj) {
 		// Get trash_srl if a given trash_srl doesn't exist
 		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
@@ -650,8 +698,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Update read counts of the document
-	 **/
+	 * Update read counts of the document
+	 * @param documentItem $oDocument
+	 * @return bool|void
+	 */
 	function updateReadedCount(&$oDocument) {
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -677,11 +727,32 @@ class documentController extends document {
 		$output = executeQuery('document.updateReadedCount', $args);
 		// Register session
 		$_SESSION['readed_document'][$document_srl] = true;
+		//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);
+        }
 	}
 
 	/**
-	 * @breif Insert extra variables into the document table
-	 **/
+	 * Insert extra variables into the document table
+	 * @param int $module_srl
+	 * @param int $var_idx
+	 * @param string $var_name
+	 * @param string $var_type
+	 * @param string $var_is_required
+	 * @param string $var_search
+	 * @param string $var_default
+	 * @param string $var_desc
+	 * @param int $eid
+	 * @return object
+	 */
 	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');
 
@@ -705,8 +776,11 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Remove the extra variables of the documents
-	 **/
+	 * Remove the extra variables of the documents
+	 * @param int $module_srl
+	 * @param int $var_idx
+	 * @return Object
+	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null) {
 		if(!$module_srl) return new Object(-1,'msg_invalid_request');
 		$obj->module_srl = $module_srl;
@@ -755,8 +829,15 @@ class documentController extends document {
 	}
 
 	/**
-	 * @breif Insert extra vaiable to the documents table
-	 **/
+	 * Insert extra vaiable to the documents table
+	 * @param int $module_srl
+	 * @param int $document_srl
+	 * @param int $var_idx
+	 * @param mixed $value
+	 * @param int $eid
+	 * @param string $lang_code
+	 * @return Object|void
+	 */
 	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');
 		if(!$lang_code) $lang_code = Context::getLangType();
@@ -772,8 +853,14 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Remove values of extra variable from the document
-	 **/
+	 * Remove values of extra variable from the document
+	 * @param int $module_srl
+	 * @param int $document_srl
+	 * @param int $var_idx
+	 * @param string $lang_code
+	 * @param int $eid
+	 * @return $output
+	 */
 	function deleteDocumentExtraVars($module_srl, $document_srl = null, $var_idx = null, $lang_code = null, $eid = null) {
 		$obj->module_srl = $module_srl;
 		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
@@ -786,8 +873,11 @@ class documentController extends document {
 
 
 	/**
-	 * @brief Increase the number of vote-up of the document
-	 **/
+	 * Increase the number of vote-up of the document
+	 * @param int $document_srl
+	 * @param int $point
+	 * @return Object
+	 */
 	function updateVotedCount($document_srl, $point = 1) {
 		if($point > 0) $failed_voted = 'failed_voted';
 		else $failed_voted = 'failed_blamed';
@@ -865,8 +955,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Report posts
-	 **/
+	 * Report posts
+	 * @param int $document_srl
+	 * @return void|Object
+	 */
 	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');
@@ -920,9 +1012,14 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Increase the number of comments in the document
+	 * Increase the number of comments in the document
 	 * Update modified date, modifier, and order with increasing comment count
-	 **/
+	 * @param int $document_srl
+	 * @param int $comment_count
+	 * @param string $last_updater
+	 * @param bool $comment_inserted
+	 * @return object
+	 */
 	function updateCommentCount($document_srl, $comment_count, $last_updater, $comment_inserted = false) {
 		$args->document_srl = $document_srl;
 		$args->comment_count = $comment_count;
@@ -948,8 +1045,11 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Increase trackback count of the document
-	 **/
+	 * Increase trackback count of the document
+	 * @param int $document_srl
+	 * @param int $trackback_count
+	 * @return object
+	 */
 	function updateTrackbackCount($document_srl, $trackback_count) {
 		$args->document_srl = $document_srl;
 		$args->trackback_count = $trackback_count;
@@ -958,8 +1058,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Add a category
-	 **/
+	 * Add a category
+	 * @param object $obj
+	 * @return object
+	 */
 	function insertCategory($obj) {
 		// Sort the order to display if a child category is added
 		if($obj->parent_srl) {
@@ -983,8 +1085,11 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Increase list_count from a specific category
-	 **/
+	 * Increase list_count from a specific category
+	 * @param int $module_srl
+	 * @param int $list_order
+	 * @return object
+	 */
 	function updateCategoryListOrder($module_srl, $list_order) {
 		$args->module_srl = $module_srl;
 		$args->list_order = $list_order;
@@ -992,8 +1097,12 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Update document_count in the category.
-	 **/
+	 * Update document_count in the category.
+	 * @param int $module_srl
+	 * @param int $category_srl
+	 * @param int $document_count
+	 * @return object
+	 */
 	function updateCategoryCount($module_srl, $category_srl, $document_count = 0) {
 		// Create a document model object
 		$oDocumentModel = &getModel('document');
@@ -1008,8 +1117,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Update category information
-	 **/
+	 * Update category information
+	 * @param object $obj
+	 * @return object
+	 */
 	function updateCategory($obj) {
 		$output = executeQuery('document.updateCategory', $obj);
 		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
@@ -1017,9 +1128,10 @@ class documentController extends document {
 	}
 
 	/**
-	/**
-	 * @brief Delete a category
-	 **/
+	 * Delete a category
+	 * @param int $category_srl
+	 * @return object
+	 */
 	function deleteCategory($category_srl) {
 		$args->category_srl = $category_srl;
 		$oDocumentModel = &getModel('document');
@@ -1044,8 +1156,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Delete all categories in a module
-	 **/
+	 * Delete all categories in a module
+	 * @param int $module_srl
+	 * @return object
+	 */
 	function deleteModuleCategory($module_srl) {
 		$args->module_srl = $module_srl;
 		$output = executeQuery('document.deleteModuleCategory', $args);
@@ -1053,8 +1167,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Move the category level to higher
-	 **/
+	 * Move the category level to higher
+	 * @param int $category_srl
+	 * @return Object
+	 */
 	function moveCategoryUp($category_srl) {
 		$oDocumentModel = &getModel('document');
 		// Get information of the selected category
@@ -1093,8 +1209,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Move the category down
-	 **/
+	 * Move the category down
+	 * @param int $category_srl
+	 * @return Object
+	 */
 	function moveCategoryDown($category_srl) {
 		$oDocumentModel = &getModel('document');
 		// Get information of the selected category
@@ -1131,8 +1249,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Add javascript codes into the header by checking values of document_extra_keys type, required and others
-	 **/
+	 * Add javascript codes into the header by checking values of document_extra_keys type, required and others
+	 * @param int $module_srl
+	 * @return void
+	 */
 	function addXmlJsFilter($module_srl) {
 		$oDocumentModel = &getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
@@ -1159,8 +1279,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Add a category
-	 **/
+	 * Add a category
+	 * @param object $args
+	 * @return void
+	 */
 	function procDocumentInsertCategory($args = null) {
 		// List variables
 		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
@@ -1219,14 +1341,14 @@ class documentController extends document {
 		$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;
-		}
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : Context::get('error_return_url');
+		$this->setRedirectUrl($returnUrl);
 	}
 
-
+	/**
+	 * Move a category
+	 * @return void
+	 */
 	function procDocumentMoveCategory() {
 		$source_category_srl = Context::get('source_srl');
 		// If parent_srl exists, be the first child
@@ -1284,8 +1406,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Delete a category
-	 **/
+	 * Delete a category
+	 * @return void
+	 */
 	function procDocumentDeleteCategory() {
 		// List variables
 		$args = Context::gets('module_srl','category_srl');
@@ -1322,11 +1445,12 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief xml files updated
+	 * 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.
-	 **/
+	 * @return void
+	 */
 	function procDocumentMakeXmlFile() {
 		// Check input values
 		$module_srl = Context::get('module_srl');
@@ -1343,8 +1467,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Save the category in a cache file
-	 **/
+	 * Save the category in a cache file
+	 * @param int $module_srl
+	 * @return string
+	 */
 	function makeCategoryFile($module_srl) {
 		// Return if there is no information you need for creating a cache file
 		if(!$module_srl) return false;
@@ -1451,10 +1577,15 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Create the xml data recursively referring to parent_srl
+	 * 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)
-	 **/
+	 * @param array $source_node
+	 * @param array $tree
+	 * @param int $site_srl
+	 * @param string $xml_header_buff
+	 * @return string
+	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff) {
 		if(!$source_node) return;
 
@@ -1506,11 +1637,16 @@ class documentController extends document {
 	}
 
 	/**
-	 * @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.
+	 * 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()
-	 **/
+	 * @param array $source_node
+	 * @param array $tree
+	 * @param int $site_srl
+	 * @param string $php_header_buff
+	 * @return array
+	 */
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff) {
 		$output = array("buff"=>"", "category_srl_list"=>array());
 		if(!$source_node) return $output;
@@ -1562,8 +1698,13 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief A method to add a pop-up menu which appears when clicking
-	 **/
+	 * A method to add a pop-up menu which appears when clicking
+	 * @param string $url
+	 * @param string $str
+	 * @param string $icon
+	 * @param string $target
+	 * @return void
+	 */
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self') {
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
 		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
@@ -1578,8 +1719,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Saved in the session when an administrator selects a post
-	 **/
+	 * Saved in the session when an administrator selects a post
+	 * @return void|Object
+	 */
 	function procDocumentAddCart() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		// Get document_srl
@@ -1636,8 +1778,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief Move/ Delete the document in the seession
-	 **/
+	 * Move/ Delete the document in the seession
+	 * @return void|Object
+	 */
 	function procDocumentManageCheckedDocument() {
 		set_time_limit(0);
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
@@ -1739,13 +1882,15 @@ class documentController extends document {
 		$_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;
-		}
+
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList');
+		$this->setRedirectUrl($returnUrl);
 	}
 
+	/**
+	 * Insert document module config
+	 * @return void
+	 */
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
@@ -1772,16 +1917,15 @@ class documentController extends document {
 		}
 		$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;
-		}
+
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+		$this->setRedirectUrl($returnUrl);
 	}
 
 	/**
-	 * @brief
-	 **/
+	 * Document temporary save
+	 * @return void|Object
+	 */
 	function procDocumentTempSave()
 	{
 		// Check login information
@@ -1839,8 +1983,9 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief return Document List for exec_xml
-	 **/
+	 * Return Document List for exec_xml
+	 * @return void|Object
+	 */
 	function procDocumentGetList()
 	{
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
@@ -1862,8 +2007,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief for old version, comment allow status check.
-	 **/
+	 * For old version, comment allow status check.
+	 * @param object $obj
+	 * @return void
+	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
 		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
@@ -1874,8 +2021,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief for old version, document status check.
-	 **/
+	 * For old version, document status check.
+	 * @param object $obj
+	 * @return void
+	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
 		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
@@ -1883,8 +2032,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief copy extra keys when module copied
-	 **/
+	 * Copy extra keys when module copied
+	 * @param object $obj
+	 * @return void
+	 */
 	function triggerCopyModuleExtraKeys(&$obj)
 	{
 		$oDocumentModel = &getModel('document');
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index c62ac8819..6ac06ead8 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -1,21 +1,56 @@
 <?php
-    /**
-     * @class  documentItem
-     * @author NHN (developers@xpressengine.com)
-     * @brief document object
-     **/
-
+	/**
+	 * documentItem class
+	 * document object
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentItem extends Object {
-
+		/**
+		 * Document number
+		 * @var int
+		 */
         var $document_srl = 0;
+		/**
+		 * Language code
+		 * @var string
+		 */
         var $lang_code = null;
-
+		/**
+		 * Status of allow trackback
+		 * @var bool
+		 */
         var $allow_trackback_status = null;
+		/**
+		 * column list
+		 * @var array
+		 */
 		var $columnList = array();
+		/**
+		 * allow script access list
+		 * @var array
+		 */
 		var $allowscriptaccessList = array();
+		/**
+		 * allow script access key
+		 * @var int
+		 */
 		var $allowscriptaccessKey = 0;
+		/**
+		 * upload file list
+		 * @var array
+		 */
 		var $uploadedFiles = array();
 
+		/**
+		 * Constructor
+		 * @param int $document_srl
+		 * @param bool $load_extra_vars
+		 * @param array columnList
+		 * @return void
+		 */
         function documentItem($document_srl = 0, $load_extra_vars = true, $columnList = array()) {
             $this->document_srl = $document_srl;
 			$this->columnList = $columnList;
@@ -28,12 +63,17 @@
             $this->_loadFromDB($load_extra_vars);
         }
 
+		/**
+		 * Get data from database, and set the value to documentItem object
+		 * @param bool $load_extra_vars
+		 * @return void
+		 */
         function _loadFromDB($load_extra_vars = true) {
             if(!$this->document_srl) return;
 
             // cache controll
             $oCacheHandler = &CacheHandler::getInstance('object');
-            if($oCacheHandler->isSupport()){
+            if($oCacheHandler->isSupport() && !count($this->columnList)){
                     $cache_key = 'object_document_item:'.$this->document_srl;
                     $output = $oCacheHandler->get($cache_key);
             }
@@ -170,6 +210,12 @@
             return $_SESSION['document_management'][$this->document_srl];
         }
 
+		/**
+		 * Send notify message to document owner
+		 * @param string $type
+		 * @param string $content
+		 * @return void
+		 */
         function notify($type, $content) {
             if(!$this->document_srl) return;
             // return if it is not useNotify
@@ -364,9 +410,14 @@
             return $content;
         }
 
-        /**
-         * Return transformed content by Editor codes
-         **/
+		/**
+		 * Return transformed content by Editor codes
+		 * @param bool $add_popup_menu
+		 * @param bool $add_content_info
+		 * @param bool $resource_realpath
+		 * @param bool $add_xe_content_class
+		 * @return string
+		 */
         function getTransContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
             $oEditorController = &getController('editor');
 
@@ -451,6 +502,10 @@
             return $oTrackbackModel->getTrackbackUrl($this->document_srl);
         }
 
+		/**
+		 * Update readed count
+		 * @return void
+		 */
         function updateReadedCount() {
             $oDocumentController = &getController('document');
             if($oDocumentController->updateReadedCount($this)) {
@@ -662,10 +717,12 @@
             return;
         }
 
-        /**
-         * @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
-         **/
+		/**
+		 * Functions to display icons for new post, latest update, secret(private) post, image/video/attachment
+		 * Determine new post and latest update by $time_interval
+		 * @param int $time_interval
+		 * @return array
+		 */
         function getExtraImages($time_interval = 43200) {
             if(!$this->document_srl) return;
             // variables for icon list
@@ -715,9 +772,11 @@
 			return $this->get('status');
 		}
 
-        /**
-         * @brief Return the value obtained from getExtraImages with image tag
-         **/
+		/**
+		 * Return the value obtained from getExtraImages with image tag
+		 * @param int $time_check
+		 * @return string
+		 */
         function printExtraImages($time_check = 43200) {
             if(!$this->document_srl) return;
             // Get the icon directory
@@ -756,9 +815,10 @@
 			return $this->uploadedFiles[$sortIndex];
 		}
 
-        /**
-         * @brief Return Editor html
-         **/
+		/**
+		 * Return Editor html
+		 * @return string
+		 */
         function getEditor() {
             $module_srl = $this->get('module_srl');
             if(!$module_srl) $module_srl = Context::get('module_srl');
@@ -767,10 +827,11 @@
             return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
         }
 
-        /**
-         * @brief Check whether to have a permission to write comment
-         * Authority to write a comment and to write a document is separated
-         **/
+		/**
+		 * Check whether to have a permission to write comment
+		 * Authority to write a comment and to write a document is separated
+		 * @return bool
+		 */
         function isEnableComment() {
             // Return false if not authorized, if a secret document, if the document is set not to allow any comment
 			if (!$this->allowComment()) return false;
@@ -779,9 +840,10 @@
 			return true;
         }
 
-        /**
-         * @brief Return comment editor's html
-         **/
+		/**
+		 * Return comment editor's html
+		 * @return string
+		 */
         function getCommentEditor() {
             if(!$this->isEnableComment()) return;
 
@@ -789,9 +851,10 @@
             return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
         }
 
-        /**
-         * @brief Return author's profile image
-         **/
+		/**
+		 * Return author's profile image
+		 * @return string
+		 */
         function getProfileImage() {
             if(!$this->isExists() || !$this->get('member_srl')) return;
             $oMemberModel = &getModel('member');
@@ -801,9 +864,10 @@
             return $profile_info->src;
         }
 
-        /**
-         * @brief Return author's signiture
-         **/
+		/**
+		 * Return author's signiture
+		 * @return string
+		 */
         function getSignature() {
             // Pass if a document doesn't exist
             if(!$this->isExists() || !$this->get('member_srl')) return;
@@ -824,13 +888,20 @@
             return $signature;
         }
 
-        /**
-         * @brief Change an image path in the content to absolute path
-         **/
+		/**
+		 * Change an image path in the content to absolute path
+		 * @param array $matches
+		 * @return mixed
+		 */
         function replaceResourceRealPath($matches) {
             return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
         }
 
+		/**
+		 * Check accessible by document status
+		 * @param array $matches
+		 * @return mixed
+		 */
 		function _checkAccessibleFromStatus()
 		{
             $logged_info = Context::get('logged_info');
@@ -869,5 +940,51 @@
 
             return $output->data;
         }
+
+
+		/**
+		 * Returns the document's mid in order to construct SEO friendly URLs
+		 * @return string
+		 */
+		function getDocumentMid() {
+			$model = &getModel('module');
+			$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
+			return $module->mid;
+		}
+
+		/**
+		 * Returns the document's type (document/page/wiki/board/etc)
+		 * @return string
+		 */
+		function getDocumentType() {
+			$model = &getModel('module');
+			$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
+			return $module->module;
+		}
+
+		/**
+		 * Returns the document's alias
+		 * @return string
+		 */
+		function getDocumentAlias() {
+			$oDocumentModel = &getModel('document');
+			return $oDocumentModel->getAlias($this->document_srl);
+		}
+
+		/**
+		 * Returns the document's actual title (browser_title)
+		 * @return string
+		 */
+		function getModuleName() {
+			$model = &getModel('module');
+			$module = $model->getModuleInfoByModuleSrl($this->get('module_srl'));
+			return $module->browser_title;
+		}
+
+		function getBrowserTitle()
+		{
+			$this->getModuleName();
+		}
+
     }
 ?>
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index cd98e0612..0c073d9d2 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -1,24 +1,34 @@
 <?php
-    /**
-     * @class  documentModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief model class of the module document
-     **/
-
+	/**
+	 * documentModel class
+	 * model class of the module document
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentModel extends document {
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief document checked the permissions on the session values
-         **/
+		/**
+		 * document checked the permissions on the session values
+		 * @param int $document_srl
+		 * @return void
+		 */
         function isGranted($document_srl) {
             return $_SESSION['own_document'][$document_srl];
         }
 
+		/**
+		 * Return document extra information from database
+		 * @param array $documentSrls
+		 * @return object
+		 */
 		function getDocumentExtraVarsFromDB($documentSrls)
 		{
 			if(!is_array($documentSrls) || count($documentSrls) == 0)
@@ -31,9 +41,10 @@
 			return $output;
 		}
 
-        /**
-         * @brief extra variables for each article will not be processed bulk select and apply the macro city
-         **/
+		/**
+		 * Extra variables for each article will not be processed bulk select and apply the macro city
+		 * @return void
+		 */
         function setToAllDocumentExtraVars() {
             static $checked_documents = array();
             // XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
@@ -98,25 +109,36 @@
             }
         }
 
-        /**
-         * @brief Import Document
-         **/
+		/**
+		 * Import Document
+		 * @param int $document_srl
+		 * @param bool $is_admin
+		 * @param bool $load_extra_vars
+		 * @param array $columnList
+		 * @return documentItem
+		 */
         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])) {
+            if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->columnListKey != serialize($columnList)) {
                 $oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
                 $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
                 if($load_extra_vars) $this->setToAllDocumentExtraVars();
+                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->columnListKey = serialize($columnList);
             }
             if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
             return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
         }
 
-        /**
-         * @brief Bringing multiple documents (or paging)
-         **/
+		/**
+		 * Bringing multiple documents (or paging)
+		 * @param array|string $document_srls
+		 * @param bool $is_admin
+		 * @param bool $load_extra_vars
+		 * @param array $columnList
+		 * @return array value type is documentItem
+		 */
         function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array()) {
             if(is_array($document_srls)) {
                 $list_count = count($document_srls);
@@ -161,9 +183,14 @@
             return $output;
         }
 
-        /**
-         * @brief module_srl value, bringing the list of documents
-         **/
+		/**
+		 * Module_srl value, bringing the list of documents
+		 * @param object $obj
+		 * @param bool $except_notice
+		 * @param bool $load_extra_vars
+		 * @param array $columnList
+		 * @return Object
+		 */
         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; 
@@ -241,12 +268,12 @@
 				{
 					/**
 					 * 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');
@@ -388,9 +415,12 @@
             return $output;
         }
 
-        /**
-         * @brief module_srl value, bringing the document's gongjisa Port
-         **/
+		/**
+		 * Module_srl value, bringing the document's gongjisa Port
+		 * @param object $obj
+		 * @param array $columnList
+		 * @return object|void
+		 */
         function getNoticeList($obj, $columnList = array()) {
             $args->module_srl = $obj->module_srl;
             $args->category_srl= $obj->category_srl;
@@ -418,10 +448,12 @@
             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 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
+		 * @param int $module_srl
+		 * @return array
+		 */
         function getExtraKeys($module_srl) {
             if(is_null($GLOBALS['XE_EXTRA_KEYS'][$module_srl])) {
                 $oExtraVar = &ExtraVar::getInstance($module_srl);
@@ -483,9 +515,12 @@
             return $GLOBALS['XE_EXTRA_KEYS'][$module_srl];
         }
 
-        /**
-         * @brief A particular document to get the value of the extra variable function
-         **/
+		/**
+		 * A particular document to get the value of the extra variable function
+		 * @param int $module_srl
+		 * @param int $document_srl
+		 * @return array
+		 */
         function getExtraVars($module_srl, $document_srl) {
             if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
                 // Extended to extract the values of variables set
@@ -497,11 +532,11 @@
             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
-         **/
+		/**
+		 * Show pop-up menu of the selected posts
+		 * Printing, scrap, recommendations and negative, reported the Add Features
+		 * @return void
+		 */
         function getDocumentMenu() {
             // Post number and the current login information requested Wanted
             $document_srl = Context::get('target_srl');
@@ -575,9 +610,12 @@
             $this->add('menus', $menus);
         }
 
-        /**
-         * @brief module_srl the total number of documents that are bringing
-         **/
+		/**
+		 * The total number of documents that are bringing
+		 * @param int $module_srl
+		 * @param object $search_obj
+		 * @return int
+		 */
         function getDocumentCount($module_srl, $search_obj = NULL) {
             // Additional search options
             $args->module_srl = $module_srl;
@@ -595,9 +633,11 @@
             return (int)$total_count;
         }
 
-        /**
-         * @brief module_srl the total number of documents that are bringing
-         **/
+		/**
+		 * the total number of documents that are bringing
+		 * @param object $search_obj
+		 * @return array
+		 */
         function getDocumentCountByGroupStatus($search_obj = NULL) {
             // Additional search options
             $args->module_srl = $search_obj->module_srl;
@@ -614,9 +654,12 @@
 
 			return $output->data;
         }
-        /**
-         * @brief Import page of the document, module_srl Without throughout ..
-         **/
+		/**
+		 * Import page of the document, module_srl Without throughout ..
+		 * @param documentItem $oDocument
+		 * @param object $opt
+		 * @return int
+		 */
         function getDocumentPage($oDocument, $opt) {
             // Sort type changes depending on the query args
             switch($opt->sort_index) {
@@ -679,9 +722,12 @@
             return $page;
         }
 
-        /**
-         * @brief Imported Category of information
-         **/
+		/**
+		 * Imported Category of information
+		 * @param int $category_srl
+		 * @param array $columnList
+		 * @return object
+		 */
         function getCategory($category_srl, $columnList = array()) {
             $args->category_srl = $category_srl;
             $output = executeQuery('document.getCategory', $args, $columnList);
@@ -700,9 +746,11 @@
             return $node;
         }
 
-        /**
-         * @brief Check whether the child has a specific category
-         **/
+		/**
+		 * Check whether the child has a specific category
+		 * @param int $category_srl
+		 * @return bool
+		 */
         function getCategoryChlidCount($category_srl) {
             $args->category_srl = $category_srl;
             $output = executeQuery('document.getChildCategoryCount',$args);
@@ -710,10 +758,13 @@
             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
-         **/
+		/**
+		 * 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
+		 * @param int $module_srl
+		 * @param array $columnList
+		 * @return array
+		 */
         function getCategoryList($module_srl, $columnList = array()) {
             // Category of the target module file swollen
             $filename = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -730,9 +781,13 @@
             return $document_category;
         }
 
-        /**
-         * @brief Category within a primary method to change the array type
-         **/
+		/**
+		 * Category within a primary method to change the array type
+		 * @param array $document_category
+		 * @param array $list
+		 * @param int $depth
+		 * @return void
+		 */
         function _arrangeCategory(&$document_category, $list, $depth) {
             if(!count($list)) return;
             $idx = 0;
@@ -785,9 +840,12 @@
             $document_category[$list_order[count($list_order)-1]]->last = true;
         }
 
-        /**
-         * @brief Wanted number of documents belonging to category
-         **/
+		/**
+		 * Wanted number of documents belonging to category
+		 * @param int $module_srl
+		 * @param int $category_srl
+		 * @return int
+		 */
         function getCategoryDocumentCount($module_srl, $category_srl) {
             $args->module_srl = $module_srl;
             $args->category_srl = $category_srl;
@@ -795,9 +853,11 @@
             return (int)$output->data->count;
         }
 
-        /**
-         * @brief Xml cache file of the document category return information
-         **/
+		/**
+		 * Xml cache file of the document category return information
+		 * @param int $module_srl
+		 * @return string
+		 */
         function getCategoryXmlFile($module_srl) {
             $xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
             if(!file_exists($xml_file)) {
@@ -807,9 +867,11 @@
             return $xml_file;
         }
 
-        /**
-         * @brief Php cache files in the document category return information
-         **/
+		/**
+		 * Php cache files in the document category return information
+		 * @param int $module_srl
+		 * @return string
+		 */
         function getCategoryPhpFile($module_srl) {
             $php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
             if(!file_exists($php_file)) {
@@ -819,9 +881,11 @@
             return $php_file;
         }
 
-        /**
-         * @brief Imported post monthly archive status
-         **/
+		/**
+		 * Imported post monthly archive status
+		 * @param object $obj
+		 * @return object
+		 */
         function getMonthlyArchivedList($obj) {
             if($obj->mid) {
                 $oModuleModel = &getModel('module');
@@ -840,9 +904,11 @@
             return $output;
         }
 
-        /**
-         * @brief Bringing a month on the status of the daily posts
-         **/
+		/**
+		 * Bringing a month on the status of the daily posts
+		 * @param object $obj
+		 * @return object
+		 */
         function getDailyArchivedList($obj) {
             if($obj->mid) {
                 $oModuleModel = &getModel('module');
@@ -862,9 +928,10 @@
             return $output;
         }
 
-        /**
-         * @brief Get a list for a particular module
-         **/
+		/**
+		 * Get a list for a particular module
+		 * @return void|Object
+		 */
         function getDocumentCategories() {
             if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
             $module_srl = Context::get('module_srl');
@@ -880,9 +947,10 @@
             $this->add('categories', $output);
         }
 
-        /**
-         * @brief Wanted to set document information
-         **/
+		/**
+		 * Wanted to set document information
+		 * @return object
+		 */
         function getDocumentConfig() {
             if(!$GLOBALS['__document_config__']) {
                 $oModuleModel = &getModel('module');
@@ -893,10 +961,12 @@
             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
-         **/
+		/**
+		 * Common:: Module extensions of variable management
+		 * Expansion parameter management module in the document module instance, when using all the modules available
+		 * @param int $module_srl
+		 * @return string
+		 */
         function getExtraVarsHTML($module_srl) {
             // Bringing existing extra_keys
             $extra_keys = $this->getExtraKeys($module_srl);
@@ -909,9 +979,11 @@
             return $oTemplate->compile($this->module_path.'tpl', 'extra_keys');
         }
 
-        /**
-         * @brief Common:: Category parameter management module
-         **/
+		/**
+		 * Common:: Category parameter management module
+		 * @param int $module_srl
+		 * @return string
+		 */
         function getCategoryHTML($module_srl) {
             $category_xml_file = $this->getCategoryXmlFile($module_srl);
 
@@ -923,10 +995,11 @@
             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
-         **/
+		/**
+		 * 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
+		 * @return void|Object
+		 */
         function getDocumentCategoryTplInfo() {
             $oModuleModel = &getModel('module');
             $oMemberModel = &getModel('member');
@@ -973,7 +1046,12 @@
             $this->add('tpl', $tpl);
         }
 
-
+		/**
+		 * Return docuent data by alias
+		 * @param string $mid
+		 * @param string $alias
+		 * @return int|void
+		 */
         function getDocumentSrlByAlias($mid, $alias)
         {
             if(!$mid || !$alias) return null;
@@ -986,6 +1064,12 @@
             else return $output->data->document_srl;
         }
 
+		/**
+		 * Return docuent number by document title
+		 * @param int $module_srl
+		 * @param string $title
+		 * @return int|void
+		 */
         function getDocumentSrlByTitle($module_srl, $title)
         {
             if(!$module_srl || !$title) return null;
@@ -993,9 +1077,17 @@
 			$args->title = $title;
             $output = executeQuery('document.getDocumentSrlByTitle', $args);
             if(!$output->data) return null;
-            else return $output->data->document_srl;
+            else {
+				if(is_array($output->data)) return $output->data[0]->document_srl;
+				return $output->data->document_srl;
+			}
         }		
 		
+		/**
+		 * Return docuent's alias
+		 * @param int $document_srl
+		 * @return string|void
+		 */
 		function getAlias($document_srl){
 			if(!$document_srl) return null;
 			$args->document_srl = $document_srl;
@@ -1005,6 +1097,13 @@
 			else return $output->data[0]->alias_title;
 		}
 
+		/**
+		 * Return document's history list
+		 * @param int $document_srl
+		 * @param int $list_count
+		 * @param int $page
+		 * @return object
+		 */
         function getHistories($document_srl, $list_count, $page)
         {
             $args->list_count = $list_count;
@@ -1014,6 +1113,11 @@
             return $output;
         }
 
+		/**
+		 * Return document's history
+		 * @param int $history_srl
+		 * @return object
+		 */
         function getHistory($history_srl)
         {
             $args->history_srl = $history_srl;
@@ -1021,9 +1125,11 @@
             return $output->data;
         }
 
-        /**
-         * @brief module_srl value, bringing the list of documents
-         **/
+		/**
+		 * Module_srl value, bringing the list of documents
+		 * @param object $obj
+		 * @return object
+		 */
         function getTrashList($obj) {
             // Variable check
             $args->category_srl = $obj->category_srl?$obj->category_srl:null;
@@ -1096,9 +1202,10 @@
             return $output;
         }
 
-        /**
-         * @brief vote up, vote down member list in Document View page
-         **/
+		/**
+		 * vote up, vote down member list in Document View page
+		 * @return void|Object
+		 */
 		function getDocumentVotedMemberList()
 		{
 			$document_srl = Context::get('document_srl');
@@ -1139,6 +1246,10 @@
 			$this->add('voted_member_list',$output->data);
 		}
 
+		/**
+		 * Return status name list
+		 * @return array
+		 */
 		function getStatusNameList()
 		{
 			global $lang;
@@ -1147,6 +1258,12 @@
 			else return $lang->status_name_list;
 		}
 
+		/**
+		 * Setting sort index
+		 * @param object $obj
+		 * @param bool $load_extra_vars
+		 * @return object
+		 */
 		function _setSortIndex($obj, $load_extra_vars)
 		{
 			$sortIndex = $obj->sort_index;
@@ -1182,10 +1299,15 @@
 		}
 
         /**
-         * @brief 게시물 목록의 검색 옵션을 Setting함(2011.03.08 - cherryfilter)
+         * 게시물 목록의 검색 옵션을 Setting함(2011.03.08 - cherryfilter)
 		 * page변수가 없는 상태에서 page 값을 알아오는 method(getDocumentPage)는 검색하지 않은 값을 return해서 검색한 값을 가져오도록 검색옵션이 추가 됨.
 		 * 검색옵션의 중복으로 인해 private method로 별도 분리
-         **/
+		 * @param object $searchOpt
+		 * @param object $args
+		 * @param string $query_id
+		 * @param bool $use_division
+		 * @return void
+         */
 		function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
 		{
 			$search_target = $searchOpt->search_target;
diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index f0f99eea6..28a8e41c4 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -1,22 +1,25 @@
 <?php
-    /**
-     * @class  documentView
-     * @author NHN (developers@xpressengine.com)
-     * @brief View class of the module document
-     **/
-
+	/**
+	 * documentView class
+	 * View class of the module document
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
     class documentView extends document {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Document printing
-         * I make it out to find the geulman;;
-         **/
+		/**
+		 * Document printing
+		 * I make it out to find the geulman;;
+		 * @return void|Object
+		 */
         function dispDocumentPrint() {
             // Bring a list of variables needed to implement
             $document_srl = Context::get('document_srl');
@@ -43,9 +46,10 @@
             $this->setTemplateFile('print_page');
         }
 
-        /**
-         * @brief Preview
-         **/
+		/**
+		 * Preview
+		 * @return void
+		 */
         function dispDocumentPreview() {
             Context::set('layout','none');
 
@@ -54,9 +58,10 @@
             $this->setTemplateFile('preview_page');
         }
 
-        /**
-         * @brief Selected by the administrator for the document management
-         **/
+		/**
+		 * Selected by the administrator for the document management
+		 * @return void|Object
+		 */
         function dispDocumentManageDocument() {
             if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
             // Taken from a list of selected sessions
@@ -93,6 +98,12 @@
             $this->setTemplateFile('checked_list');
         }
 
+		/**
+		 * Trigger method.
+		 * Additional information realte to document setting
+		 * @param string $obj
+		 * @return Object
+		 */
         function triggerDispDocumentAdditionSetup(&$obj) {
             $current_module_srl = Context::get('module_srl');
             $current_module_srls = Context::get('module_srls');
@@ -119,6 +130,10 @@
             return new Object();
         }
 
+		/**
+		 * Document temp saved list
+		 * @return void
+		 */
 		function dispTempSavedList()
 		{
             $this->setLayoutFile('popup_layout');
diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
index dd206b72c..7e0f5fdfc 100644
--- a/modules/document/queries/getDocumentListWithExtraVars.xml
+++ b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -15,6 +15,9 @@
         <condition operation="in" column="documents.status" var="statusList" pipe="and" />
         <condition operation="like" column="extra_vars.value" var="var_value" notnull="notnull" pipe="and" />
     </conditions>
+	<groups>
+		<group column="extra_vars.document_srl" />
+	</groups>
     <navigation>
         <index var="sort_index" default="documents.list_order" order="order_type" />
         <list_count var="list_count" default="20" />
diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml
index 5f585de6d..31c586aad 100644
--- a/modules/document/queries/insertDocument.xml
+++ b/modules/document/queries/insertDocument.xml
@@ -29,6 +29,7 @@
         <column name="extra_vars" var="extra_vars" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="last_update" var="last_update" default="curdate()" />
+		<column name="last_updater" var="last_updater" />
         <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" />
diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php
index bd5dec4a6..3e85b1700 100644
--- a/modules/editor/components/image_link/image_link.class.php
+++ b/modules/editor/components/image_link/image_link.class.php
@@ -51,15 +51,9 @@
             $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);
@@ -72,9 +66,8 @@
 
             $attr_output = array();
             $attr_output = array("src=\"".$src."\"");
-            if($alt) {
-                $attr_output[] = "alt=\"".$alt."\"";
-            }
+            $attr_output[] = "alt=\"".$alt."\"";
+
             if($title) {
                 $attr_output[] = "title=\"".$title."\"";
             }
diff --git a/modules/editor/conf/module.xml b/modules/editor/conf/module.xml
index a616467de..f49adfffb 100644
--- a/modules/editor/conf/module.xml
+++ b/modules/editor/conf/module.xml
@@ -7,7 +7,7 @@
         <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="dispEditorAdminSetupComponent" type="view" menu_name="editor" />
         <action name="dispEditorAdminSkinColorset" type="view" standalone="true" />
 		<action name="dispEditorConfigPreview" type="view" />
         <action name="dispEditorPreview" type="view" />
diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php
index c0e9d3f2a..074ef4873 100644
--- a/modules/editor/editor.admin.controller.php
+++ b/modules/editor/editor.admin.controller.php
@@ -119,9 +119,7 @@
             $oEditorController->removeCache($args->site_srl);
 
             $this->setMessage('success_updated');
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-				$this->setRedirectUrl(Context::get('error_return_url'));
-			}
+			$this->setRedirectUrl(Context::get('error_return_url'));
         }
 		
 		/**
diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php
index b9b5ac6b0..f0b04c100 100644
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@@ -124,7 +124,6 @@
 			
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('setup_component');
-            $this->setLayoutFile("popup_layout");
         }
     }
 ?>
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index a09082839..c16312512 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -96,37 +96,24 @@
             $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();
+			$grants = array('enable_html_grant','enable_comment_html_grant','upload_file_grant','comment_upload_file_grant','enable_default_component_grant','enable_comment_default_component_grant','enable_component_grant','enable_comment_component_grant');
 
-            $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();
+			foreach($grants as $key)
+			{
+				$grant = Context::get($key);
+				if(!$grant)
+				{
+					$editor_config->{$key} = array();
+				}
+				else if(is_array($grant)) 
+				{
+					$editor_config->{$key} = $grant;
+				}
+				else
+				{
+					$editor_config->{$key} = explode('|@|', $grant);
+				}
+			}
 
             $editor_config->editor_height = (int)Context::get('editor_height');
 
@@ -145,11 +132,9 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css
index 49c60badf..453d3508f 100644
--- a/modules/editor/skins/xpresseditor/css/default.css
+++ b/modules/editor/skins/xpresseditor/css/default.css
@@ -32,14 +32,14 @@
 .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;overflow:hidden}
+.xpress-editor .input_area{position:relative;margin:10px 10px 20px 10px;z-index:30;*zoom:1;height:400px;overflow:hidden}
 .xpress-editor .input_area iframe,
 .xpress-editor .input_area textarea{display:block;width:100% !important;position:relative;height:100%;border:0 !important;padding:0 !important;overflow:auto}
 .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;border-top:1px solid #ccc;background:#f8f8f8 url(../img/btn_expand.gif) no-repeat center center;cursor:n-resize}
-.xpress-editor .input_control span{display:block;height:21px;visibility:hidden;overflow:visible;font-size:0;line-height:200%;white-space:nowrap;color:#fff}
-.xpress-editor .input_auto{position:relative;z-index:2;display:inline-block;margin:-20px 0 0 0;padding:3px 0 0 8px;zoom:1}
+.xpress-editor .input_control span{display:block;height:21px;visibility:hidden;overflow:visible;font-size:0;line-height:0;white-space:nowrap;color:#fff}
+.xpress-editor .input_auto{position:absolute;z-index:2;left:5px;bottom:4px;zoom:1}
 .xpress-editor .input_auto.line{height:17px;margin:0;display:block;border-top:1px solid #ccc;padding:4px 0 0 8px;background:#f8f8f8}
 .xpress-editor .input_auto input{margin:0;padding:0;width:13px;height:13px;vertical-align:middle;margin:0 4px 0 0}
 .xpress-editor .input_auto label{font-size:11px;vertical-align:middle;line-height:13px;color:#666}
diff --git a/modules/editor/skins/xpresseditor/editor.html b/modules/editor/skins/xpresseditor/editor.html
index 1778c8b5c..317d2d806 100644
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@@ -27,7 +27,7 @@
     <!--// 기본 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__" />
+	<load target="js/xpresseditor.js" cond="!__DEBUG__" />
 
     <!-- 자동저장용 폼 -->
 
diff --git a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
index d4d9e33c5..0d39622b1 100644
--- a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
+++ b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
@@ -5215,21 +5215,21 @@ xe.XE_XHTMLFormatter = $.Class({
 			} else {
 				var tags = [], t = '';
 
-				// remove unnecessary closing tag
+				// if the tag does not require a closing tag, simply remove the closing tag
+				if ($.inArray(tag,lonely_tags) >= 0) {
+					return '';
+				}
+
+				// if the matching opening tag was not found, remove this closing tag
 				if (!stack.length){
 					return '';
 				}
 
 				do {
-					t = stack[stack.length-1];
-					if (t.tag != tag){
-						continue;
-					}
-					if (t.state != 'deleted'){
-						tags.push('</'+t.tag+'>');
-					}
-					stack.pop();
-				} while(stack.length && t.tag == tag);
+					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('');
 			}
diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js
index 6e9bf045e..fdb5b52a6 100644
--- a/modules/editor/skins/xpresseditor/js/xpresseditor.js
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js
@@ -5215,21 +5215,21 @@ xe.XE_XHTMLFormatter = $.Class({
 			} else {
 				var tags = [], t = '';
 
-				// remove unnecessary closing tag
+				// if the tag does not require a closing tag, simply remove the closing tag
+				if ($.inArray(tag,lonely_tags) >= 0) {
+					return '';
+				}
+
+				// if the matching opening tag was not found, remove this closing tag
 				if (!stack.length){
 					return '';
 				}
 
 				do {
-					t = stack[stack.length-1];
-					if (t.tag != tag){
-						continue;
-					}
-					if (t.state != 'deleted'){
-						tags.push('</'+t.tag+'>');
-					}
-					stack.pop();
-				} while(stack.length && t.tag == tag);
+					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('');
 			}
@@ -5813,21 +5813,18 @@ xe.XE_Table = $.Class({
 	}
 }).extend(xe.XE_Table);
 
-})(jQuery);
-
 // Auto Resize Checkbox Toggle Class
-jQuery(function($){
-	$('.input_auto>input').change(function(){
-		setTimeout(function(){
-			if($('.input_control').is(':hidden')){
-				$('.input_auto').addClass('line');
-			} else {
-				$('.input_auto').removeClass('line');
-			}
-		},1);
-	});
+$('.input_auto>input').change(function(){
+	setTimeout(function(){
+		if($('.input_control').is(':hidden')){
+			$('.input_auto').addClass('line');
+		} else {
+			$('.input_auto').removeClass('line');
+		}
+	},1);
 });
 
+})(jQuery);
 if (!window.xe) xe = {};
 
 xe.Editors = [];
diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
index a9558c405..d22a2d006 100644
--- a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
@@ -1,82 +1,82 @@
 (function(c){function o(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)&&("undefined"==typeof this.prototype[d]&&(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(){"undefined"!=typeof this.$super&&(this.$super.$this=this);c.isFunction(this.$init)&&this.$init.apply(this,arguments)}b.prototype=a;b.constructor=b;
-b.extend=o;return b},$:function(a){return"string"==typeof a?"<"==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 e=d.concat(c.makeArray(arguments));return a.apply(b,e)}}});c.browser.nVersion=parseFloat(c.browser.version);"undefined"==typeof window.xe&&(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){this.commandQueue[this.commandQueue.length]={msg:a,args:b,event:d};return true}this.exec=this._exec;this.exec(a,b,d)},delayedExec:function(a,b,d,e){a=c.fnBind(this.exec,this,a,b,e);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 e=false;if(!this.oDisabledCommand[a]){var c=[];if(b&&b.length)for(var e=b.length,g=0;g<e;g++)c[g]=b[g];d&&(c[c.length]=d);(e=this._execMsgStep("BEFORE",a,c))&&(e=this._execMsgStep("ON",a,c));e&&(e=this._execMsgStep("AFTER",
-a,c))}return e},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,e,f){if(a){e=e||[];d=f?c.fnBind(this.delayedExec,this,d,e,f):c.fnBind(this.exec,this,d,e);c(a).bind(b,d)}},run:function(){this._changeAppStatus(xe.APP_STATUS.WAITING_FOR_PLUGINS_READY);
+b.extend=o;return b},$:function(a){return"string"==typeof a?"<"==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);"undefined"==typeof window.xe&&(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){this.commandQueue[this.commandQueue.length]={msg:a,args:b,event:d};return 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){if(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 e=this._execMsgHandler("$"+a+"_"+b,d);this.oDebugger.log_MessageStepEnd(a,b,d);return e},_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],e=d.length;if(e==0)return true;var c,
-g=true;if(a.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/))for(var h=0;h<e;h++){c=this._execHandler(d[h],a,b);if(c===false){g=false;break}}else for(h=0;h<e;h++)if(typeof d[h].$PRECONDITION!="function"||this._execHandler(d[h],"$PRECONDITION",[a,b])){c=this._execHandler(d[h],a,b);if(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 e=a[b].apply(a,d);this.oDebugger.log_CallHandlerEnd(a,b,d);return e},_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.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++){c=this._execHandler(d[h],a,b);if(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])){c=this._execHandler(d[h],a,b);if(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,e;b;){e=b.nextSibling;a.appendChild(b);b=e}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,e=null,c=this.startContainer,g=this.endContainer;_recurConstructClonedTree=function(a,b,j,n){if(b<0)return b;var j=b-1,m=a[b].cloneNode(false);a[b]==c&&(d=m);for(a[b]==g&&(e=m);j>=0&&xe.DOMFix.parentNode(a[j])==a[b];)j=this._recurConstructClonedTree(a,j,a[b],m,d,e);n.insertBefore(m,n.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:e}},
+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,n){if(b<0)return b;var j=b-1,m=a[b].cloneNode(false);a[b]==c&&(d=m);for(a[b]==g&&(f=m);j>=0&&xe.DOMFix.parentNode(a[j])==a[b];)j=this._recurConstructClonedTree(a,j,a[b],m,d,f);n.insertBefore(m,n.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){if(a){this.endContainer=this.startContainer;this.endOffset=this.startOffset}else{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,e){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;e=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;e=this._getPosIdx(d)+0.5}e==-1&&(e=b+1);return b<e?-1:b==e?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,e;if(!b){d=xe.DOMFix.parentNode(a[0]);
-e=0}for(var c=0;c<a.length;c++){var g=a[c];if(!g.firstChild){if(d==g){e=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,e);this.collapse(true)}}},extractContents:function(){var a=this.cloneContents();this.deleteContents();return a},insertNode:function(a){var b=null,d;if(this.startContainer.nodeType=="3"){d=xe.DOMFix.parentNode(this.startContainer);b=this.startContainer.nodeValue.length<=
+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;if(!b){d=xe.DOMFix.parentNode(a[0]);
+f=0}for(var c=0;c<a.length;c++){var g=a[c];if(!g.firstChild){if(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;if(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)}else{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(){if(this.startContainer){this.collapsed=this._isCollapsed(this.startContainer,this.startOffset,this.endContainer,this.endOffset);this.commonAncestorContainer=
-this._getCommonAncestorContainer(this.startContainer,this.endContainer)}else this.init(this._document)},_isCollapsed:function(a,b,d,e){var c=false;if(a==d&&b==e)c=true;else{a=this._getActualStartNode(a,b);d=this._getActualEndNode(d,e);a=this._getNextNode(this._getPrevNode(a));d=this._getPrevNode(this._getNextNode(d));if(a&&d&&d.tagName!="BODY"&&(this._getNextNode(d)==a||d==a&&this._isBlankTextNode(d)))c=true}return c},_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,e=a.oEndContainer,c=a.iEndOffset;if(!b||b.nodeType!=3||d==0||b.nodeValue.length<=d)return a;a=b.splitText(d);
-if(b==e){c=c-d;e=a}return{oStartContainer:a,iStartOffset:0,oEndContainer:e,iEndOffset:c}},_splitEndTextNode:function(a){var b=a.oStartContainer,d=a.iStartOffset,e=a.oEndContainer,c=a.iEndOffset;if(!e||e.nodeType!=3||c>=e.nodeValue.length||c==0)return a;e.splitText(c);return{oStartContainer:b,iStartOffset:d,oEndContainer:e,iEndOffset:c}},_getNodesInRange:function(){if(this.collapsed)return[];var a=this._getActualStartNode(this.startContainer,this.startOffset),b=this._getActualEndNode(this.endContainer,
+this._getCommonAncestorContainer(this.startContainer,this.endContainer)}else this.init(this._document)},_isCollapsed:function(a,b,d,f){var c=false;if(a==d&&b==f)c=true;else{a=this._getActualStartNode(a,b);d=this._getActualEndNode(d,f);a=this._getNextNode(this._getPrevNode(a));d=this._getPrevNode(this._getNextNode(d));if(a&&d&&d.tagName!="BODY"&&(this._getNextNode(d)==a||d==a&&this._isBlankTextNode(d)))c=true}return c},_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,f=a.oEndContainer,c=a.iEndOffset;if(!b||b.nodeType!=3||d==0||b.nodeValue.length<=d)return a;a=b.splitText(d);
+if(b==f){c=c-d;f=a}return{oStartContainer:a,iStartOffset:0,oEndContainer:f,iEndOffset:c}},_splitEndTextNode:function(a){var b=a.oStartContainer,d=a.iStartOffset,f=a.oEndContainer,c=a.iEndOffset;if(!f||f.nodeType!=3||c>=f.nodeValue.length||c==0)return a;f.splitText(c);return{oStartContainer:b,iStartOffset:d,oEndContainer:f,iEndOffset:c}},_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;if(a.nodeType==3)if(b>=a.nodeValue.length){d=this._getNextNode(a);d.tagName=="BODY"&&(d=null)}else d=a;else if(b<xe.DOMFix.childNodes(a).length)d=xe.DOMFix.childNodes(a)[b];else{d=this._getNextNode(a);d.tagName=="BODY"&&(d=null)}return d},_getActualEndNode:function(a,b){var d=a;if(b==0){d=this._getPrevNode(a);d.tagName=="BODY"&&(d=null)}else 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||!this._recurGetChildNodesUntil(a,b,d))return false;for(var e=
-a.nextSibling;!e;){if(!(a=xe.DOMFix.parentNode(a)))return false;d[this._nNodesBetweenLen++]=a;if(a==b)return false;e=a.nextSibling}return this._recurGetNextNodesUntil(e,b,d)},_recurGetChildNodesUntil:function(a,b,d){if(!a)return false;var e=false,c=a;if(c.firstChild)for(c=c.firstChild;c;){if(!this._recurGetChildNodesUntil(c,b,d)){e=true;break}c=c.nextSibling}d[this._nNodesBetweenLen++]=a;return e||a==b?false:true}});xe.W3CDOMRange.START_TO_START=0;xe.W3CDOMRange.START_TO_END=1;xe.W3CDOMRange.END_TO_END=
+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||!this._recurGetChildNodesUntil(a,b,d))return false;for(var f=
+a.nextSibling;!f;){if(!(a=xe.DOMFix.parentNode(a)))return false;d[this._nNodesBetweenLen++]=a;if(a==b)return false;f=a.nextSibling}return this._recurGetNextNodesUntil(f,b,d)},_recurGetChildNodesUntil:function(a,b,d){if(!a)return false;var f=false,c=a;if(c.firstChild)for(c=c.firstChild;c;){if(!this._recurGetChildNodesUntil(c,b,d)){f=true;break}c=c.nextSibling}d[this._nNodesBetweenLen++]=a;return f||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||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,e,c;e=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];if(a){c=d;!c&&!b&&(c=e)}else{c=e;!c&&!b&&(c=d)}return c},_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,f=2;f<d.length&&c;f++){d[f].match(/([^\[]+)\[(\d+)/i);for(var g=RegExp.$1,h=RegExp.$2,c=xe.DOMFix.childNodes(c),k=[],j=c.length,n=0,m=0;m<j;m++)c[m].tagName==g&&(k[n++]=c[m]);c=k.length<h?null:k[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),f=null;(f=c[b])&&f.nodeType==3&&f.nodeValue.length<d;){d=d-f.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;if(d.nodeType==3){b=this._getFixedStartTextNode();a=this._getPosIdx(b.elContainer);d=xe.DOMFix.parentNode(d)}var a=
+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];if(a){e=d;!e&&!b&&(e=c)}else{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),k=[],j=c.length,n=0,m=0;m<j;m++)c[m].tagName==g&&(k[n++]=c[m]);c=k.length<h?null:k[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=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;if(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;if(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=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);if(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 f=0;f<d.length;f++)b(d[f])&&(c[c.length]=d[f]);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=
+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||c==-1?false:true:false},isNodeInRange:function(a,b,d){var c=new xe.XpressRange(this._window);if(d&&a.firstChild){c.setStartBefore(a.firstChild);c.setEndAfter(a.lastChild)}else 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(),f=c.placeStringBookmark();b.lastChild;)this.insertNode(b.lastChild);this.setEndNodes(a,d);c.moveToBookmark(f);c.deleteContents();c.removeStringBookmark(f)}},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 e,f,g=0;g<
-d.length;g++){for(var h in a){e=h;f=a[e];typeof f=="string"&&(d[g].style[e]=f)}if(b)for(h in b){e=h;f=b[e];typeof f=="string"&&(e=="class"?c(d[g]).addClass(f):d[g].setAttribute(e,f))}}this.setStartBefore(d[0]);this.setEndAfter(d[d.length-1])}},_getStyleParentNodes:function(a){this._splitTextEndNodesOfTheRange();var b=this.getStartNode(),d=this.getEndNode(),e=this._getNodesInRange(),f=[],g=0,h,k,j,n,m,q=e.length;c(e).filter(function(){return!!this.childNodes.length});for(var l=0;l<q;l++)if((h=e[l])&&
-!(h.nodeType!=3||h.nodeValue=="")){m=xe.DOMFix.parentNode(h);if(m.tagName=="SPAN"){var o=c(m).html();k=this._getVeryFirstRealChild(m);j=k==h?1:o.indexOf(k);if(j!=-1){k=this._getVeryLastRealChild(m);n=k==h?1:o.indexOf(k)}if(j!=-1&&n!=-1){f[g++]=m;continue}}k=this._document.createElement("SPAN");m.insertBefore(k,h);k.appendChild(h);f[g++]=k;a&&k.setAttribute(a,"true")}this.setStartBefore(b);this.setEndAfter(d);return f},_getVeryFirstChild:function(a){return a.firstChild?this._getVeryFirstChild(a.firstChild):
+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();var b=this.getStartNode(),d=this.getEndNode(),f=this._getNodesInRange(),e=[],g=0,h,k,j,n,m,q=f.length;c(f).filter(function(){return!!this.childNodes.length});for(var l=0;l<q;l++)if((h=f[l])&&
+!(h.nodeType!=3||h.nodeValue=="")){m=xe.DOMFix.parentNode(h);if(m.tagName=="SPAN"){var o=c(m).html();k=this._getVeryFirstRealChild(m);j=k==h?1:o.indexOf(k);if(j!=-1){k=this._getVeryLastRealChild(m);n=k==h?1:o.indexOf(k)}if(j!=-1&&n!=-1){e[g++]=m;continue}}k=this._document.createElement("SPAN");m.insertBefore(k,h);k.appendChild(h);e[g++]=k;a&&k.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){if(a&&!c)if(k.test(a.tagName)){g=a;c=f;h=true}else{f=a;d(a.previousSibling);c||b(xe.DOMFix.parentNode(a))}}function d(a){if(a&&!c)if(k.test(a.tagName)){g=a;c=f;h=false}else{if(a.firstChild&&a.tagName!="TABLE")for(var b=a.lastChild;b&&!c;){d(b);b=b.previousSibling}else f=a;c||d(a.previousSibling)}}var c=null,f=a,g=a,h=true,k=this.rxLineBreaker;b(a);return{oNode:c,oLineBreaker:g,bParentBreak:h}},_getLineEndInfo:function(a){function b(a){if(a&&
-!c)if(k.test(a.tagName)){g=a;c=f;h=true}else{f=a;d(a.nextSibling);c||b(xe.DOMFix.parentNode(a))}}function d(a){if(a&&!c)if(k.test(a.tagName)){g=a;c=f;h=false}else{if(a.firstChild&&a.tagName!="TABLE")for(var b=a.firstChild;b&&!c;){d(b);b=b.nextSibling}else f=a;c||d(a.nextSibling)}}var c=null,f=a,g=a,h=true,k=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,
+this._getVeryLastChild(b):a},_getLineStartInfo:function(a){function b(a){if(a&&!c)if(k.test(a.tagName)){g=a;c=e;h=true}else{e=a;d(a.previousSibling);c||b(xe.DOMFix.parentNode(a))}}function d(a){if(a&&!c)if(k.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,k=this.rxLineBreaker;b(a);return{oNode:c,oLineBreaker:g,bParentBreak:h}},_getLineEndInfo:function(a){function b(a){if(a&&
+!c)if(k.test(a.tagName)){g=a;c=e;h=true}else{e=a;d(a.nextSibling);c||b(xe.DOMFix.parentNode(a))}}function d(a){if(a&&!c)if(k.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,k=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);if(!(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}d=this._oSelection.createRangeCollection().item(a).parentElement();if(!d||d.ownerDocument!=this._document)return b=new xe.W3CDOMRange(this._document);return 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),f=c.iOffsetForIE;d.moveToElementText(c.oSelectableNodeForIE);d.collapse(c.bCollapseToStart);d.moveStart("character",f);return d};this._getSelectableNodeAndOffsetForIE=
-function(a,b){var d=this._document.body.createTextRange(),c=null,f=null,g=0;if(a.nodeType==3){c=xe.DOMFix.parentNode(a);f=xe.DOMFix.childNodes(c);g=f.length}else{c=a;f=xe.DOMFix.childNodes(c);g=b}for(var h=null,k=0,j=true,n=0;n<g;n++){h=f[n];if(h.nodeType==3){if(h==a)break;k=k+h.nodeValue.length}else{d.moveToElementText(h);c=h;k=0;j=false}}a.nodeType==3&&(k=k+b);return{oSelectableNodeForIE:c,iOffsetForIE:k,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);if(d.isEqual(a))b.collapse(true);else{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,f=this._document.body.createTextRange(),g=xe.DOMFix.childNodes(d),c=null,h=0,h=0;h<g.length;h++)if(g[h].nodeType!=3){f.moveToElementText(g[h]);
-if(f.compareEndPoints("StartToStart",a)>=0)break;c=g[h]}if(h!=0&&g[h-1].nodeType==3){g=this._document.body.createTextRange();f=null;if(c){g.moveToElementText(c);g.collapse(false);f=c.nextSibling}else{g.moveToElementText(d);g.collapse(true);f=d.firstChild}d=a.duplicate();d.setEndPoint("StartToStart",g);for(c=d.text.length;c>f.nodeValue.length&&f.nextSibling;){c=c-f.nodeValue.length;f=f.nextSibling}if(b&&f.nextSibling&&f.nextSibling.nodeType==3&&c==f.nodeValue.length){c=c-f.nodeValue.length;f=f.nextSibling}d=
-f}else{d=a.parentElement();c=h}return{oContainer:d,iOffset:c}}};xe.DOMFix=new (c.Class({$init:function(){if(c.browser.msie||c.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(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},
+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;if(a.nodeType==3){c=xe.DOMFix.parentNode(a);e=xe.DOMFix.childNodes(c);g=e.length}else{c=a;e=xe.DOMFix.childNodes(c);g=b}for(var h=null,k=0,j=true,n=0;n<g;n++){h=e[n];if(h.nodeType==3){if(h==a)break;k=k+h.nodeValue.length}else{d.moveToElementText(h);c=h;k=0;j=false}}a.nodeType==3&&(k=k+b);return{oSelectableNodeForIE:c,iOffsetForIE:k,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);if(d.isEqual(a))b.collapse(true);else{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;if(c){g.moveToElementText(c);g.collapse(false);e=c.nextSibling}else{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=c-e.nodeValue.length;e=e.nextSibling}if(b&&e.nextSibling&&e.nextSibling.nodeType==3&&c==e.nodeValue.length){c=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(){if(c.browser.msie||c.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(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"||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,f){this.oApp.registerBrowserEvent(a,b,d,c,f)},$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},$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");if(b.length){b.length==1&&a.metaKey&&(b=["ctrl","meta"]);b.push(a.keyCode);b=b.join("+");if(this.storage[b]){c.each(this.storage[b],function(){this()});return false}}}},normalize:function(a){var b,d,e,f,g,a=(a||"").toLowerCase().split("+");b=d=e=f=g=false;c.each(a,
-function(){var a=""+this;switch(a){case "shift":b=true;case "alt":e=true;case "ctrl":d=true;case "meta":f=true;default:g=a}});if(!g)return"";a=[];b&&a.push("shift");e&&a.push("alt");d&&a.push("ctrl");(f||d&&!b&&!e)&&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=
+[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");if(b.length){b.length==1&&a.metaKey&&(b=["ctrl","meta"]);b.push(a.keyCode);b=b.join("+");if(this.storage[b]){c.each(this.storage[b],function(){this()});return 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;if(c.inArray(a,this.aMadeDraggable)==-1){new xe.DraggableLayer(a,{bModal:b,iMinY:0});this.aMadeDraggable[this.aMadeDraggable.length]=a}else 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,f){if(a==this.oCurrentLayer)this.oApp.exec("HIDE_ACTIVE_LAYER",[]);else{this.oApp.exec("SHOW_ACTIVE_LAYER",
-[a,c,f]);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",
+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){if(a==this.oCurrentLayer)this.oApp.exec("HIDE_ACTIVE_LAYER",[]);else{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+"([^ ]+)"),e=0;e<b;e++)if(d.test(a[e].className)){var f=RegExp.$1;
-this.htUIList[f]==null&&(this.htUIList[f]=c(">*:first-child",a[e]).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,f,g){this.oApp.exec("TOGGLE_ACTIVE_LAYER",[a,"MSG_TOOLBAR_LAYER_SHOWN",[a,b,d,c],f,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",
+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="";if(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="";if(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=d+a.offsetWidth,e=this.welToolbarArea.offset().left,e=e+this.toolbarArea.offsetWidth;if(d>e)a.style.left=
-e-d-5+"px"}},getToolbarButtonByUIName:function(a){return this.htUIList[a]}});xe.XE_EditingAreaManager=c.Class({name:"XE_EditingAreaManager",oActivePlugin:null,oIRField:null,bIsDirty:!1,$init:function(a,b,d,e,f){this.sInitialMode=a;this.oIRField=c.$(b);this._assignHTMLObjects(f);this.fOnBeforeUnload=e;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=
+[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=d+a.offsetWidth,f=this.welToolbarArea.offset().left,f=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:!1,$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){if(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()},
@@ -87,13 +87,13 @@ this.oApp.registerBrowserEvent(a,"mousedown","EVENT_EDITING_AREA_MOUSEDOWN");thi
 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){if(this.oApp.getEditingMode()==
 this.sMode){(new l(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 l=function(a){this._o=a};l.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};l.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()}};l.prototype.copy=function(){var a=this.getSelection();return this._o.value.substring(a[0],a[1])};l.prototype.paste=function(a){var b=this._o,d=this.getSelection(),c=b.value,f=c.substr(0,d[0]),c=c.substr(d[1]);b.value=f+a+c;b=0;if(typeof document.body.style.maxHeight=="undefined"){f=f.match(/\n/gi);b=f!=null?f.length:0}this.setSelection(d[0]+a.length-b)};l.prototype.cut=function(){var a=
+d.createTextRange();c.collapse(true);c.moveStart("character",a);c.moveEnd("character",b-a);c.select();d.blur()}};l.prototype.copy=function(){var a=this.getSelection();return this._o.value.substring(a[0],a[1])};l.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;if(typeof document.body.style.maxHeight=="undefined"){e=e.match(/\n/gi);b=e!=null?e.length:0}this.setSelection(d[0]+a.length-b)};l.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(){if(c.browser.msie){c(this.doc).unbind("keydown.ea").bind("keydown.ea",c.fnBind(function(a){if(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).unbind("mousedown.ea").bind("mousedown.ea",c.fnBind(function(){this._oIERange=null;this._bIERangeReset=true},
 this)).unbind("beforedeactivate.ea").bind("beforedeactivate.ea",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)).unbind("mouseup.ea").bind("mouseup.ea",c.fnBind(function(){this._bIERangeReset=false},this))}},$ON_CHANGE_EDITING_MODE:function(a){if(a==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(){this._oIERange=null},$ON_REFRESH_WYSIWYG:function(){if(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 e=
-d.placeStringBookmark();this.oApp.getWYSIWYGDocument().body.innerHTML=this.oApp.getWYSIWYGDocument().body.innerHTML;d.moveToBookmark(e);d.collapseToEnd();d.select();d.removeStringBookmark(e)}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=
+["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(){if(c.browser.msie){this.doc.body.disabled=true;this.doc.body.contentEditable=true;this.doc.body.removeAttribute("disabled")}else 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);
@@ -104,23 +104,23 @@ this.oEditingArea.tagName=="IFRAME")this.oEditingArea=this.oEditingArea.contentW
 ["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(),f=c.oStart,c=c.oEnd;if(!f.bParentBreak||b.rxBlockContainer.test(f.oLineBreaker.tagName)){a.stopPropagation();a.preventDefault();a=this.oEditingArea.createElement("P");
-b.moveToBookmark(d);b.setStartBefore(f.oNode);b.surroundContents(a);b.collapseToEnd();f=this.oEditingArea.createElement("P");b.setEndAfter(c.oNode);b.surroundContents(f);b.removeStringBookmark(d);if(a.innerHTML=="")a.innerHTML="<br>";if(f.innerHTML=="")f.innerHTML="<br>";f.nextSibling&&f.nextSibling.tagName=="BR"&&f.parentNode.removeChild(f.nextSibling);b.selectNodeContents(f);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 e,f;for(f in a){e=a[f];typeof e=="string"&&(d.style[f]=e)}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=
+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,e;for(e in this.oStyle){d=this.oStyleMap[e];if(d.type&&
-d.type=="Value")if(d.css){d=a.css(d.css);e=="fontFamily"&&(d=d.split(/,/)[0]);b[e]=d}else{if(d.command)try{b[e]=this.oDocument.queryCommandState(d.command)}catch(f){}}else if(d.command)try{b[e]=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,
+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){d=this.oStyleMap[f];if(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;if(this.elFontSizeSelect.selectedIndex<0)this.elFontSizeSelect.selectedIndex=0}},$ON_SET_FONTSIZE_FROM_SELECT_UI:function(){var a=this.elFontSizeSelect.value;if(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();if(this.elFontNameSelect.selectedIndex<0)this.elFontNameSelect.selectedIndex=0}},$ON_SET_FONTNAME_FROM_SELECT_UI:function(){var a=this.elFontNameSelect.value;
-if(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,e;if(a.length==0)return-1;var f=a.length;if(f==0)e=-1;else{d=this._getLineWrapper(a[0]);e=this._getWrapperLineheight(d)}var g=this.oSelection.getStartNode();
-if(e>0)for(var h=1;h<f;h++)if(!this._isChildOf(a[h],b)&&a[h]){b=this._getLineWrapper(a[h]);if(b!=d){curHeight=this._getWrapperLineheight(b);if(curHeight!=e){e=-1;break}d=b}}b=this._getLineWrapper(a[f-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 e},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 e=this._getSelectedNodes(false);if(e.length!=0){var f,g,h=e.length;this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["LINEHEIGHT"]);g=this._getLineWrapper(e[0]);for(var k=g=b(g,a),j=1;j<h;j++){try{if(!d(xe.DOMFix.parentNode(e[j])))continue}catch(n){continue}if(!this._isChildOf(e[j],f)){f=this._getLineWrapper(e[j]);if(f!=g)g=f=b(f,a)}}setTimeout(c.fnBind(function(a,b){this.oSelection.setEndNodes(a,
-b);this.oSelection.select();this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["LINEHEIGHT"])},this,k,f||k),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,f,b=null,a=d.oNode;f=d.oLineBreaker;d=c.oNode;c=c.oLineBreaker;this.oSelection.setEndNodes(a,d);f==c&&(f.tagName=="P"||f.tagName==
-"DIV"?b=f:this.oSelection.setEndNodes(f.firstChild,f.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=
+if(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;if(e==0)f=-1;else{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]);if(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 k=g=b(g,a),j=1;j<h;j++){try{if(!d(xe.DOMFix.parentNode(f[j])))continue}catch(n){continue}if(!this._isChildOf(f[j],e)){e=this._getLineWrapper(f[j]);if(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,k,e||k),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;if(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=
@@ -129,9 +129,9 @@ xe.XE_BGColor=c.Class({name:"XE_BGColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb
 [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(),
-f=c.oStart,c=c.oEnd,g=/BODY|TD|LI/i,f=f.bParentBreak&&!g.test(f.oLineBreaker.tagName)?f.oNode.parentNode:f.oNode,c=c.bParentBreak&&!g.test(c.oLineBreaker.tagName)?c.oNode.parentNode:c.oNode;d.setStartBefore(f);d.setEndAfter(c);if(g=this._expandToTableStart(d,c)){c=g;d.setEndAfter(g)}if(g=this._expandToTableStart(d,f)){f=g;d.setStartBefore(g)}g=f;for(f=d.commonAncestorContainer;g&&g!=f&&g.parentNode!=f;)g=g.parentNode;oFormattingNode=d._document.createElement(a);if(b)oFormattingNode.className=b;g==
-f?f.insertBefore(oFormattingNode,f.firstChild):f.insertBefore(oFormattingNode,g);d.setStartAfter(oFormattingNode);d.setEndAfter(c);d.surroundContents(oFormattingNode);f=oFormattingNode.childNodes;for(g=f.length-1;g>=0;g--)if(f[g].nodeType==3||f[g].tagName=="BR"){for(var h=d._document.createElement("P"),c=f[g].nextSibling;g>=0&&f[g]&&(f[g].nodeType==3||f[g].tagName=="BR");)h.insertBefore(f[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,e=null,f=false;b&&!f;){b==c&&(f=true);if(/TBODY|TFOOT|THEAD|TR/i.test(b.tagName)){e=this._getTableRoot(b);break}b=b.parentNode}return e},_getTableRoot:function(a){for(;a&&a.tagName!="TABLE";)a=a.parentNode;return a}});xe.XE_SCharacter=c.Class({name:"XE_SCharacter",
+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,
@@ -140,22 +140,22 @@ function(a){return"%u"+a}).split(" ");this.charSet[4]=unescape("0391 0392 0393 0
 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.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=
+"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=
 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 e=0;e<b;e++){c[e]=document.createElement("LI");
-c[e].innerHTML='<button type="button"><span>'+unescape(this.charSet[a][e])+"</span></button>";this.aSCharList[a].appendChild(c[e])}}},_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;
+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--;if(a.nTotalSteps>1)this.oCurStateIdx.nStep=0;else{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)){if(this.oCurStateIdx.nStep<a.nTotalSteps-1)this.oCurStateIdx.nStep++;else{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],e=c.oBookmark[this.oCurStateIdx.nStep];this.oApp.setIR(c.sContent[this.oCurStateIdx.nStep],true);var f=this.oApp.getIR();this.bFF&&f==this.sBlankContentsForFF&&(f="");c.sContent[this.oCurStateIdx.nStep]=f;c=this.oApp.getEmptySelection();if(c.selectionLoaded){e?c.moveToXPathBookmark(e):c=this.oApp.getEmptySelection();c.select()}},$ON_DO_RECORD_UNDO_HISTORY:function(a,b,c,e){b=b||false;c=c||false;e=e||0;this.oCurStateIdx.nIdx!=this.aUndoHistory.length-
-1&&(e=1);var f=this.aUndoHistory[this.oCurStateIdx.nIdx],g=this.oApp.getIR(),h=f.sContent[this.oCurStateIdx.nStep];this.bFF&&g==this.sBlankContentsForFF&&(g="");if(!b)switch(e){case 0:if(Math.abs(h.length-g.length)<this.iMinimumSizeChange)return;break;case 1:if(h==g)return}h=this.oApp.getSelection();e=null;h.selectionLoaded&&(e=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==f.nTotalSteps-1)h.nIdx=this.oCurStateIdx.nIdx+
-1;this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT",[h,a,g,e])},$ON_DO_RECORD_UNDO_HISTORY_AT:function(a,b,c,e){if(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]=e}else{b={sAction:b,nTotalSteps:1,sContent:[]};b.sContent[0]=c;b.oBookmark=[];b.oBookmark[0]=e;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},
+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();if(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){if(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}else{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(e){}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)},
+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){if(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");
@@ -167,46 +167,46 @@ b){a=a||parseInt(this.oRowInput.value);a=a+(b||0);if(a<this.iMinRows)a=this.iMin
 []):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,e="",e=c.browser.msie?"<td><p></p></td>":c.browser.firefox?"<td><p><br/></p></td>":"<td><p>&nbsp;</p></td>",b='<tr style="background:'+b+'">',f=this.oColumnInput.value,g=0;g<f;g++)b=b+e;b=b+"</tr>\n";e=this.oRowInput.value;
-a='<table style="background:'+a+'" cellspacing="'+d+'"><tbody>';for(g=0;g<e;g++)a=a+b;return a+"</tbody></table>"}});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",
+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>",b='<tr style="background:'+b+'">',e=this.oColumnInput.value,g=0;g<e;g++)b=b+f;b=b+"</tr>\n";f=this.oRowInput.value;
+a='<table style="background:'+a+'" cellspacing="'+d+'"><tbody>';for(g=0;g<f;g++)a=a+b;return a+"</tbody></table>"}});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){if(a=="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",[])}}});xe.XE_Editorresize=c.Class({name:"XE_Editorresize",
 $init:function(a,b){this.inputArea=c(".xpress_xeditor_editing_area_container",a).get(0);this.oVerticalResizer=c(".xpress_xeditor_editingArea_verticalResizer",a).get(0);this.oCheckBox=c("#editorresize",a).get(0);this.oIframe=b;var d=this;c(b).load(function(){d.oIframeBody=c(b).contents().find("body")})},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.oCheckBox,"change","XE_TOGGLE_EDITOR_RESIZE")},$ON_XE_TOGGLE_EDITOR_RESIZE:function(){if(this.oCheckBox.checked==true){if(this._prevHeight==
 void 0)this._prevHeight=this.inputArea.style.height;this.oVerticalResizer.style.display="none";this.oApp.registerBrowserEvent(this.oIframeBody,"keydown","XE_EDITOR_RESIZE");this.inputArea.style.height=this.oIframe.style.height=this.oIframeBody[0].scrollHeight+"px"}else{c(this.oIframeBody).unbind("keydown");this.oVerticalResizer.style.display="block";this.inputArea.style.height=this._prevHeight;this.oIframe.style.height=this._prevHeight}},$ON_XE_EDITOR_RESIZE:function(){this.inputArea.style.height=
 this.oIframe.style.height=this.oIframeBody[0].scrollHeight+"px"}});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;var p="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=[];if(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;a=a.replace(regex,function(a,d,g,h){d=d||"";g=g.toLowerCase();h=c.trim(h||"");if(d){h=[];a="";if(!b.length)return"";do{a=b[b.length-1];if(a.tag==g){a.state!="deleted"&&
-h.push("</"+a.tag+">");b.pop()}}while(b.length&&a.tag==g);return h.join("")}if(c.inArray(g,p)>=0){a=h.length;g=="br"&&(h="");if(!h||h.substring(a-1,a)!="/")h=h+"/";return"<"+g+" "+c.trim(h)+">"}b.push({tag:g,state:""});return"<"+d+g+(h?" "+h:"")+">"});if(b.length){var d="";do{d=b.pop();d.state!="deleted"&&(a=a+("</"+d.tag+">"))}while(b.length)}regex=/<\/p>[ \t]*(\n)?/ig;return a=a.replace(regex,"</p>\n")},IR_TO:function(a){return a}});xe.XE_Extension=c.Class({name:"XE_Extension",seq:"",last_doc:"",
+/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 p="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=[];if(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;a=a.replace(regex,function(a,d,g,h){d=d||"";g=g.toLowerCase();h=c.trim(h||"");if(d){h=[];a="";if(c.inArray(g,p)>=0||!b.length)return"";do{a=b.pop();a.tag==g&&a.state!=
+"deleted"&&h.push("</"+a.tag+">")}while(b.length&&a.tag!=g);return h.join("")}if(c.inArray(g,p)>=0){a=h.length;g=="br"&&(h="");if(!h||h.substring(a-1,a)!="/")h=h+"/";return"<"+g+" "+c.trim(h)+">"}b.push({tag:g,state:""});return"<"+d+g+(h?" "+h:"")+">"});if(b.length){var d="";do{d=b.pop();d.state!="deleted"&&(a=a+("</"+d.tag+">"))}while(b.length)}regex=/<\/p>[ \t]*(\n)?/ig;return a=a.replace(regex,"</p>\n")},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");if(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("widget")&&b.attr("editor_component","image_link");if(this.last_doc!=a){b.unbind("dblclick.widget").bind("dblclick.widget",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);if(!a.attr("component_onclick_event_added")){a.click(b);a.attr("component_onclick_event_added",
+c(this);this.nodeName=="IMG"&&(!b.attr("editor_component")&&!b.attr("widget"))&&b.attr("editor_component","image_link");if(this.last_doc!=a){b.unbind("dblclick.widget").bind("dblclick.widget",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);if(!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)if(confirm(this.form._saved_doc_message.value)){c(this.form.title).val(a);this.oApp.setIR(b);typeof editorGetAutoSavedDoc=="function"&&editorGetAutoSavedDoc(this.form)}else 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;if(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=a+c(this).html()}).eq(0).html(a);
-var e=0;b.eq(0).nextAll("td,th").andSelf().filter(".xe_selected_cell").each(function(){e=e+d._getSpan(this,"col")});this._getRect(b.eq(0));var f=b.eq(0).parent("tr"),g=b.eq(b.length-1).parent("tr"),h=b.parents("table").eq(0).find("tr"),f=h.index(g.get(0))-h.index(f.get(0))+this._getSpan(b.eq(b.length-1),"row");b.eq(0).attr("colSpan",e).attr("rowSpan",f);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 e=this._getRect(a.eq(0)).top,f=this._getRect(a.eq(a.length-1)).bottom;(a=b.find("td,th").filter(function(){var a=d._getRect(c(this));return!(a.bottom<=e||a.top>=f)})).filter(".xe_selected_cell").each(function(){var b=c(this),e=b.parent("tr"),f=d._getSpan(b,"row"),j=d._getRect(b),n=[],m=b.clone().html("<br />"),l=1,o=1;if(f>1){l=Math.ceil(f/2);o=f-l;n.push(function(){b.attr("rowSpan",l)});m.attr("rowSpan",o)}else{a.filter(function(){if(b.get(0)==
+var f=0;b.eq(0).nextAll("td,th").andSelf().filter(".xe_selected_cell").each(function(){f=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),n=[],m=b.clone().html("<br />"),l=1,o=1;if(f>1){l=Math.ceil(f/2);o=f-l;n.push(function(){b.attr("rowSpan",l)});m.attr("rowSpan",o)}else{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;n.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");if(f.length){e=f.eq(l-1).children("td,th").filter(function(){return d._getRect(c(this)).left>j.left});c.browser.msie?e.length?e.eq(0).before(m.get(0).outerHTML):f.eq(l-1).append(m.get(0).outerHTML):e.length?
-e.slice(0,1).before(m):f.slice(l-1,1).append(m)}else e.after(e.clone().empty().append(m));c.each(n,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 e=a.eq(0).parent("tr"),f=this._getRect(e.find(".xe_selected_cell:first")).left,g=this._getRect(e.find(".xe_selected_cell:last")).right;
-(a=b.find("td,th").filter(function(){var a=d._getRect(c(this));return!(a.right<=f||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=e-g;b.attr("colSpan",g);f.attr("colSpan",e)}else{var m=d._getRect(b);a.filter(function(){if(b.get(0)==this)return false;var a=c(this),a=d._getRect(a);return a.right<=m.left||a.left>=m.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,e=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 e._removeAllListener()||true;e._getRect(e._startSel=b);e._doc.bind("mousemove",e.$FnMouseMove);e._doc.bind("mouseup",e.$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 e=Math.min(this._startSel.rect.top,this._endSel.rect.top),f=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<f)f=a.left;if(a.top<e)e=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<=f||a.left>=h||a.bottom<=e||a.top>=g?false:true}).addClass("xe_selected_cell")}while(b.length);c.browser.mozilla||setTimeout(function(){var a=d.oApp.getSelection();if(d._startSel){d._startSel.get(0).firstChild||d._startSel.text(" ");a.selectNode(d._startSel.get(0).firstChild);a.collapseToStart();
+e.slice(0,1).before(m):f.slice(l-1,1).append(m)}else e.after(e.clone().empty().append(m));c.each(n,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=e-g;b.attr("colSpan",g);f.attr("colSpan",e)}else{var m=d._getRect(b);a.filter(function(){if(b.get(0)==this)return false;var a=c(this),a=d._getRect(a);return a.right<=m.left||a.left>=m.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){function b(){d=f.getSelection().cloneRange();d.collapseToStart();d=c(d.startContainer).parents().andSelf().filter("td,th").eq(0);if(!d.length)return e._removeAllListener()||true;e._getRect(e._startSel=
+d);e._doc.bind("mousemove",e.$FnMouseMove);e._doc.bind("mouseup",e.$FnMouseUp)}var d=c(a.target).parents().andSelf().filter("td,th,table"),f=this.oApp,e=this;c("td.xe_selected_cell",this.oApp.getWYSIWYGDocument()).removeClass("xe_selected_cell");this._endSel=this._startSel=null;d.length&&this._isLeftClicked(a.button)&&setTimeout(b,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();if(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);
 c(".input_auto>input").change(function(){setTimeout(function(){c(".input_control").is(":hidden")?c(".input_auto").addClass("line"):c(".input_auto").removeClass("line")},1)})})(jQuery);window.xe||(xe={});xe.Editors=[];
-function editorStart_xe(c,o,l,p,a,b,d,e){function f(){try{var a=n.contentWindow.document;if("about:blank"==a.location)throw"blank";a.body.innerHTML=a.body.innerHTML.trim();j.registerPlugin(new xe.XE_EditingArea_WYSIWYG(n));j.registerPlugin(new xe.XpressRangeManager(n));j.registerPlugin(new xe.XE_ExecCommand(n));d&&!a.body.style.fontFamily&&(a.body.style.fontFamily=d);e&&!a.body.style.fontSize&&(a.body.style.fontSize=e);j.run()}catch(b){setTimeout(f,0)}}"undefined"==typeof a&&(a="white");"undefined"==
-typeof b&&(b="xeStyle");"undefined"==typeof d&&(d="");"undefined"==typeof e&&(e="");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:'+p+'px"></iframe>'),h=jQuery('<textarea rows="8" cols="42" class="input_syntax '+a+'" style="display:none"></textarea>'),a=b.get(0).form;a.setAttribute("editor_sequence",c);b.css("display",
+function editorStart_xe(c,o,l,p,a,b,d,f){function e(){try{var a=n.contentWindow.document;if("about:blank"==a.location)throw"blank";a.body.innerHTML=a.body.innerHTML.trim();j.registerPlugin(new xe.XE_EditingArea_WYSIWYG(n));j.registerPlugin(new xe.XpressRangeManager(n));j.registerPlugin(new xe.XE_ExecCommand(n));d&&!a.body.style.fontFamily&&(a.body.style.fontFamily=d);f&&!a.body.style.fontSize&&(a.body.style.fontSize=f);j.run()}catch(b){setTimeout(e,0)}}"undefined"==typeof a&&(a="white");"undefined"==
+typeof b&&(b="xeStyle");"undefined"==typeof d&&(d="");"undefined"==typeof f&&(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:'+p+'px"></iframe>'),h=jQuery('<textarea rows="8" cols="42" class="input_syntax '+a+'" style="display:none"></textarea>'),a=b.get(0).form;a.setAttribute("editor_sequence",c);b.css("display",
 "none");var k="";0<jQuery("input[name=content]",a).size()&&(k=jQuery("input[name=content]",a).val().replace(/src=\"files\/attach/g,'src="'+request_uri+"files/attach"),jQuery("#xpress-editor-"+c).val(k));b.hide().css("width","100%").before(g).after(h);var j=new xe.XpressCore,n=g.get(0),b=b.get(0),g=h.get(0),h=jQuery(".xpress-editor",a).get(0);j.getFrame=function(){return n};j.getContent=function(){editorGetContentTextarea_xe(c)};k=a[l].value;xFF&&!k&&(k="<br />");k=editorReplacePath(k);a[l].value=
 k;jQuery("#xpress-editor-"+c).val(k);editorRelKeys[c]=[];editorRelKeys[c].primary=a[o];editorRelKeys[c].content=a[l];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(p),nMinHeight:100},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("#editorresize").length&&j.registerPlugin(new xe.XE_Editorresize(h,n));!jQuery.browser.msie&&!jQuery.browser.opera&&j.registerPlugin(new xe.XE_WYSIWYGEnterKey(n));(s=a._saved_doc_title)&&j.registerPlugin(new xe.XE_AutoSave(b,
-h));f();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(1024>c.length){var o="#text,A,BR,IMG,EM,STRONG,SPAN,BIG,CITE,CODE,DD,DFN,HR,INS,KBD,LINK,Q,SAMP,SMALL,SUB,SUP,TT".split(","),l=!0,p=jQuery("<div>"+c+"</div>").eq(0).contents();jQuery.each(p,function(){3!=this.nodeType&&-1==jQuery.inArray(this.nodeName,o)&&(l=!1)});l&&(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,e){e=e?e.replace(/ ([A-Z]+?)\=/ig,function(a,b){b=b.toLowerCase();return" "+b+"="}):"";c=c.toLowerCase();b||(b="");return"<"+b+c+e+">"});return c=c.replace("<br>","<br />")}function editorGetIframe(c){return jQuery("iframe#editor_iframe_"+c).get(0)}function editorReplaceHTML(c,o){var o=editorReplacePath(o),l=parseInt(c.id.replace(/^.*_/,""),10);editorRelKeys[l].pasteHTML(o)}
-function editorReplacePath(c){return c=c.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig,function(c,l,p,a,b,d,e){"url("==p?(a="",d=")"):("undefined"==typeof a&&(a='"'),"undefined"==typeof d&&(d='"'),"undefined"==typeof e&&(e=""));b=jQuery.trim(b).replace(/^\.\//,"");return/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(b)?c:"<"+l+p+a+request_uri+b+d+e})}
-function editorGetAutoSavedDoc(c){var o=[];o.mid=current_mid;o.editor_sequence=c.getAttribute("editor_sequence");setTimeout(function(){exec_xml("editor","procEditorLoadSavedDocument",o,function(c){editorRelKeys[o.editor_sequence].primary.value=c.document_srl;"object"==typeof uploadSettingObj[o.editor_sequence]&&editorUploadInit(uploadSettingObj[o.editor_sequence],!0)},"error,message,editor_sequence,title,content,document_srl".split(","))},0)}
+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(1024>c.length){var o="#text A BR IMG EM STRONG SPAN BIG CITE CODE DD DFN HR INS KBD LINK Q SAMP SMALL SUB SUP TT".split(" "),l=!0,p=jQuery("<div>"+c+"</div>").eq(0).contents();jQuery.each(p,function(){3!=this.nodeType&&-1==jQuery.inArray(this.nodeName,o)&&(l=!1)});l&&(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,o){var o=editorReplacePath(o),l=parseInt(c.id.replace(/^.*_/,""),10);editorRelKeys[l].pasteHTML(o)}
+function editorReplacePath(c){return c=c.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig,function(c,l,p,a,b,d,f){"url("==p?(a="",d=")"):("undefined"==typeof a&&(a='"'),"undefined"==typeof d&&(d='"'),"undefined"==typeof f&&(f=""));b=jQuery.trim(b).replace(/^\.\//,"");return/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(b)?c:"<"+l+p+a+request_uri+b+d+f})}
+function editorGetAutoSavedDoc(c){var o=[];o.mid=current_mid;o.editor_sequence=c.getAttribute("editor_sequence");setTimeout(function(){exec_xml("editor","procEditorLoadSavedDocument",o,function(c){editorRelKeys[o.editor_sequence].primary.value=c.document_srl;"object"==typeof uploadSettingObj[o.editor_sequence]&&editorUploadInit(uploadSettingObj[o.editor_sequence],!0)},"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]="HTMLSrc"==c?"html":"wysiwyg"}});xe.XE_PreservTemplate=jQuery.Class({name:"XE_PreservTemplate",isRun:!1,$BEFORE_SET_IR:function(c){if(!this.isRun&&!c)return this.isRun=!0,!1}});
 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(){}});
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index 982091057..a81de8a51 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -109,11 +109,11 @@
 	<input type="hidden" name="module" value="editor" />
 	<input type="hidden" name="act" value="procEditorAdminCheckUseListOrder" />
 	<fieldset class="section">
-		<h2 class="h2">Editor Component</h2>
+		<h2 class="h2">{$lang->editor_component}</h2>
 		<div class="table even easyList">
 			<table id="sortable_table" class="sortable"width="100%" border="1" cellspacing="0">
 				<caption>
-				All({$component_count})
+{$lang->total_count}({$component_count})
 				</caption>
 				<thead>
 					<tr>
@@ -123,6 +123,7 @@
 						<th scope="col">{$lang->author}</th>
 						<th scope="col">{$lang->path}</th>
 						<th scope="col">{$lang->use}</th>
+						<th scope="col">{$lang->cmd_setup}</th>
 						<th scope="col">{$lang->cmd_delete}</th>
 					</tr>
 				</thead>
@@ -146,9 +147,10 @@
 						</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><a href="{getUrl('', 'module', 'admin', 'act', 'dispEditorAdminSetupComponent', 'component_name', $xml_info->component_name)}">{$lang->cmd_setup}</a>
 						<td>
 							<!--@if($xml_info->version && $xml_info->delete_url)-->
-							<a href="{$xml_info->delete_url}">Delete</a>
+							<a href="{$xml_info->delete_url}">{$lang->cmd_delete}</a>
 							<!--@end-->
 						</td>
 					</tr>
diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html
index a7330af14..21dcada8c 100644
--- a/modules/editor/tpl/editor_module_config.html
+++ b/modules/editor/tpl/editor_module_config.html
@@ -112,12 +112,12 @@
 			<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>
+					<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>
+					<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>
@@ -128,12 +128,12 @@
 			<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>
+					<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>
+					<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>
@@ -144,12 +144,12 @@
 			<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>
+					<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>
+					<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>
@@ -160,12 +160,12 @@
 			<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>
+					<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>
+					<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>
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html
index 8984571c0..2641efd37 100644
--- a/modules/editor/tpl/setup_component.html
+++ b/modules/editor/tpl/setup_component.html
@@ -13,7 +13,7 @@
         <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>
+            <td>{$component->title}({$component->component_name}) ver. {$component->version}</td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->component_author}</div></th>
@@ -84,6 +84,7 @@
         </table>
     </div>
     <div class="btnArea">
+        <span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispEditorAdminIndex')}" >{$lang->cmd_back}</a></span>
         <span class="btn"><input type="submit" value="{$lang->cmd_apply}" /></span>
     </div>
 </form>
diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index 58101b90d..be2a1ed6c 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -1,20 +1,22 @@
 <?php
     /**
-     * @class  fileAdminController
+     * admin controller class of the file module
      * @author NHN (developers@xpressengine.com)
-     * @brief admin controller class of the file module
      **/
-
     class fileAdminController extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Delete the attachment of a particular module
+         * Delete the attachment of a particular module
+		 *
+		 * @param int $module_srl Sequence of module to delete files
+		 * @return Object
          **/
         function deleteModuleFiles($module_srl) {
             // Get a full list of attachments
@@ -47,7 +49,9 @@
         }
 
         /**
-         * @brief Delete selected files from the administrator page
+         * Delete selected files from the administrator page
+		 *
+		 * @return Object
          **/
         function procFileAdminDeleteChecked() {
             // An error appears if no document is selected
@@ -68,15 +72,15 @@
             }
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Add file information
+         * Add file information
+		 *
+		 * @return Object
          **/
         function procFileAdminInsertConfig() {
             // Get configurations (using module model object)
@@ -89,16 +93,15 @@
             // 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;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
-         * @brief Add file information for each module
+         * Add file information for each module
+		 *
+		 * @return void
          **/
         function procFileAdminInsertModuleConfig() {
             // Get variables
@@ -138,15 +141,15 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Add to SESSION file srl
+         * Add to SESSION file srl
+		 *
+		 * @return Object
          **/
 		function procFileAdminAddCart()
 		{
@@ -165,7 +168,10 @@
 		}
 
 		/**
-		 * @brief php.ini에서 가져온 값의 형식이 M과 같을경우 byte로 바꿔주기
+		 * Change value from human readable to byte unit
+		 *
+		 * @param string $size_str Size string
+		 * @return int The byte value for input
 		 **/
 		function _changeBytes($size_str)
 		{
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index 7be724a21..1ccc390da 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -1,20 +1,64 @@
 <?php
     /**
-     * @class  fileAdminModel
+     * Admin model class of the file module
      * @author NHN (developers@xpressengine.com)
-     * @brief admin model class of the file module
      **/
-
     class fileAdminModel extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Get all the attachments in order by time descending (for administrators)
+         * Get all the attachments in order by time descending (for administrators)
+		 *
+		 * <pre>
+		 * Search options:
+		 * - s_module_srl:          int[] or int, search module_srl
+		 * - exclude_module_srl:    int[] or int, exclude module_srl
+		 * - isvalid:               Y or N
+		 * - direct_download:       Y or N
+		 * - s_filename:            string, like operation
+		 * - s_filesize_more:       int, more operation, byte unit
+		 * - s_filesize_mega_more:  int, more operation, mega unit
+		 * - s_filesize_less:       int, less operation, byte unit
+		 * - s_filesize_mega_less:  int, less operation, mega unit
+		 * - s_download_count:      int, more operation
+		 * - s_regdate:             string(YYYYMMDDHHMMSS), like prefix operation(STRING%)
+		 * - s_ipaddress:           string, like prefix operation
+		 * - s_user_id:             string
+		 * - s_user_name:           string
+		 * - s_nick_name:           string
+		 * - sort_index:            string. default: files.file_srl
+		 * - page :                 int
+		 * - list_count:            int. default: 20
+		 * - page_count:            int. default: 10
+		 *
+		 * Result data:
+		 * - file_srl
+		 * - upload_target_srl
+		 * - upload_target_type
+		 * - sid
+		 * - module_srl
+		 * - member_srl
+		 * - download_count
+		 * - direct_download
+		 * - source_filename
+		 * - uploaded_filename
+		 * - file_size
+		 * - comment
+		 * - isvaild
+		 * - regdate
+		 * - ipaddress
+		 * 
+		 * </pre>
+		 *
+		 * @param object $obj Search options
+		 * @param array $columnList Column list to get from DB
+		 * @return Object Object contains query result
          **/
         function getFileList($obj, $columnList = array()) {
 			$this->_makeSearchParam($obj, $args);
@@ -51,7 +95,21 @@
         }
 
         /**
-         * @brief Return number of attachments which belongs to a specific document
+         * Return number of attachments which belongs to a specific document
+		 *
+		 * <pre>
+		 * Result data:
+		 * +---------+-------+
+		 * | isvalid | count |
+		 * +---------+-------+
+		 * | Y       | 00    |
+		 * +---------+-------+
+		 * | N       | 00    |
+		 * +---------+-------+
+		 * </pre>
+		 *
+		 * @param object $obj Search options (not used...)
+		 * @return array
          **/
         function getFilesCountByGroupValid($obj = '') {
 			//$this->_makeSearchParam($obj, $args);
@@ -61,7 +119,10 @@
         }
 
         /**
-         * @brief Return number of attachments which belongs to a specific document
+         * Return number of attachments which belongs to a specific date
+		 *
+		 * @param string $date Date string
+		 * @return int
          **/
         function getFilesCountByDate($date = '') {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
@@ -72,6 +133,13 @@
 			return $output->data->count;
         }
 
+		/**
+		 * Make search parameters from object(private)
+		 *
+		 * @param object $obj Original searach options
+		 * @param object $args Result searach options
+		 * @return void
+		 */
 		function _makeSearchParam(&$obj, &$args)
 		{
             // Search options
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index 894332e9d..e4a9d9ad6 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -1,20 +1,21 @@
 <?php
     /**
-     * @class  fileAdminView
+     * Admin view of the module class file
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view of the module class file
      **/
-
     class fileAdminView extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Display output list (for administrator)
+         * Display output list (for administrator)
+		 *
+		 * @return Object
          **/
         function dispFileAdminList() {
             // Options to get a list
@@ -174,7 +175,9 @@
         }
 
         /**
-         * @brief Set attachment information (for administrator)
+         * Set attachment information (for administrator)
+		 *
+		 * @return Object
          **/
         function dispFileAdminConfig() {
             $oFileModel = &getModel('file');
diff --git a/modules/file/file.class.php b/modules/file/file.class.php
index 596f7ca78..eb08aa3ba 100644
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@@ -1,14 +1,14 @@
 <?php
     /**
-     * @class  file
+     * High class of the file module
      * @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
+         * Implement if additional tasks are necessary when installing
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
             // Register action forward (to use in administrator mode)
@@ -43,7 +43,9 @@
         }
 
         /**
-         * @brief a method to check if successfully installed
+         * A method to check if successfully installed
+		 *
+		 * @return bool
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
@@ -72,7 +74,9 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             $oDB = &DB::getInstance();
@@ -124,7 +128,9 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @return Object
          **/
         function recompileCache() {
         }
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 4c1d744a3..2d6108ca8 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -1,24 +1,26 @@
 <?php
     /**
-     * @class  fileController
+     * Controller class of the file module
      * @author NHN (developers@xpressengine.com)
-     * @brief controller class of the file module
      **/
-
     class fileController extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
 
         /**
-         * @brief Upload attachments in the editor
+         * 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.
+		 *
+		 * @return void
          **/
         function procFileUpload() {
             $file_info = Context::get('Filedata');
@@ -45,7 +47,9 @@
 
 
         /**
-         * @brief iframe upload attachments
+         * Iframe upload attachments
+		 *
+		 * @return Object
          **/
         function procFileIframeUpload() {
             // Basic variables setting
@@ -80,7 +84,9 @@
         }
 
         /**
-         * @brief image resize
+         * Image resize
+		 *
+		 * @return Object
          **/
         function procFileImageResize() {
             $source_src = Context::get('source_src');
@@ -109,10 +115,35 @@
 
 
         /**
-          * @brief Download Attachment
+         * Download Attachment
+		 *
+		 * <pre>
          * Receive a request directly
          * file_srl: File sequence
          * sid : value in DB for comparison, No download if not matched
+		 *
+		 * This method call trigger 'file.downloadFile'.
+		 * before, after.
+		 * Trigger object contains:
+		 * - download_url
+		 * - file_srl
+		 * - upload_target_srl
+		 * - upload_target_type
+		 * - sid
+		 * - module_srl
+		 * - member_srl
+		 * - download_count
+		 * - direct_download
+		 * - source_filename
+		 * - uploaded_filename
+		 * - file_size
+		 * - comment
+		 * - isvalid
+		 * - regdate
+		 * - ipaddress
+		 * </pre>
+		 *
+		 * return void
          **/
         function procFileDownload() {
             $oFileModel = &getModel('file');
@@ -247,7 +278,9 @@
         }
 
         /**
-         * @brief Delete an attachment from the editor
+         * Delete an attachment from the editor
+		 *
+		 * @return Object
          **/
         function procFileDelete() {
             // Basic variable setting(upload_target_srl and module_srl set)
@@ -288,7 +321,9 @@
         }
 
         /**
-         * @brief get file list
+         * get file list
+		 *
+		 * @return Object
          **/
         function procFileGetList()
 		{
@@ -321,7 +356,10 @@
 			$this->add('file_list', $fileList);
         }
         /**
-         * @brief A trigger to return numbers of attachments in the upload_target_srl (document_srl)
+         * A trigger to return numbers of attachments in the upload_target_srl (document_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerCheckAttached(&$obj) {
             $document_srl = $obj->document_srl;
@@ -334,7 +372,10 @@
         }
 
         /**
-         * @brief A trigger to link the attachment with the upload_target_srl (document_srl)
+         * A trigger to link the attachment with the upload_target_srl (document_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerAttachFiles(&$obj) {
             $document_srl = $obj->document_srl;
@@ -347,7 +388,10 @@
         }
 
         /**
-         * @brief A trigger to delete the attachment in the upload_target_srl (document_srl)
+         * A trigger to delete the attachment in the upload_target_srl (document_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerDeleteAttached(&$obj) {
             $document_srl = $obj->document_srl;
@@ -358,7 +402,10 @@
         }
 
         /**
-         * @brief A trigger to return numbers of attachments in the upload_target_srl (comment_srl)
+         * A trigger to return numbers of attachments in the upload_target_srl (comment_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerCommentCheckAttached(&$obj) {
             $comment_srl = $obj->comment_srl;
@@ -371,7 +418,10 @@
         }
 
         /**
-         * @brief A trigger to link the attachment with the upload_target_srl (comment_srl)
+         * A trigger to link the attachment with the upload_target_srl (comment_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerCommentAttachFiles(&$obj) {
             $comment_srl = $obj->comment_srl;
@@ -385,7 +435,10 @@
         }
 
         /**
-         * @brief A trigger to delete the attachment in the upload_target_srl (comment_srl)
+         * A trigger to delete the attachment in the upload_target_srl (comment_srl)
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerCommentDeleteAttached(&$obj) {
             $comment_srl = $obj->comment_srl;
@@ -396,7 +449,10 @@
         }
 
         /**
-         * @brief A trigger to delete all the attachements when deleting the module
+         * A trigger to delete all the attachements when deleting the module
+		 *
+		 * @param object $obj Trigger object
+		 * @return Object
          **/
         function triggerDeleteModuleFiles(&$obj) {
             $module_srl = $obj->module_srl;
@@ -407,7 +463,11 @@
         }
 
         /**
-         * @brief Upload enabled
+         * Upload enabled
+		 *
+		 * @param int $editor_sequence
+		 * @param int $upload_target_srl
+		 * @return void
          **/
         function setUploadInfo($editor_sequence, $upload_target_srl=0) {
             $_SESSION['upload_info'][$editor_sequence]->enabled = true;
@@ -415,8 +475,11 @@
         }
 
         /**
-         * @brief Set the attachements of the upload_target_srl to be valid 
+         * 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
+		 *
+		 * @param int $upload_target_srl
+		 * @return Object
          **/
         function setFilesValid($upload_target_srl) {
             $args->upload_target_srl = $upload_target_srl;
@@ -424,7 +487,35 @@
         }
 
         /**
-         * @brief Add an attachement
+         * Add an attachement
+		 *
+		 * <pre>
+		 * This method call trigger 'file.insertFile'.
+		 *
+		 * Before trigger object contains:
+		 * - module_srl
+		 * - upload_target_srl
+		 *
+		 * After trigger object contains:
+		 * - file_srl
+		 * - upload_target_srl
+		 * - module_srl
+		 * - direct_download
+		 * - source_filename
+		 * - uploaded_filename
+		 * - donwload_count
+		 * - file_size
+		 * - comment
+		 * - member_srl
+		 * - sid
+		 * </pre>
+		 *
+		 * @param object $file_info PHP file information array
+		 * @param int $module_srl Sequence of module to upload file
+		 * @param int $upload_target_srl Sequence of target to upload file
+		 * @param int $download_count Initial download count
+		 * @param bool $manual_insert If set true, pass validation check
+		 * @return Object
          **/
         function insertFile($file_info, $module_srl, $upload_target_srl, $download_count = 0, $manual_insert = false) {
             // Call a trigger (before)
@@ -532,7 +623,31 @@
         }
 
         /**
-         * @brief Delete the attachment
+         * Delete the attachment
+		 *
+		 * <pre>
+		 * This method call trigger 'file.deleteFile'.
+		 * Before, after trigger object contains:
+		 * - download_url
+		 * - file_srl
+		 * - upload_target_srl
+		 * - upload_target_type
+		 * - sid
+		 * - module_srl
+		 * - member_srl
+		 * - download_count
+		 * - direct_download
+		 * - source_filename
+		 * - uploaded_filename
+		 * - file_size
+		 * - comment
+		 * - isvalid
+		 * - regdate
+		 * - ipaddress
+		 * </pre>
+		 *
+		 * @param int $file_srl Sequence of file to delete
+		 * @return Object
          **/
         function deleteFile($file_srl) {
             if(!$file_srl) return;
@@ -572,7 +687,10 @@
         }
 
         /**
-         * @brief Delete all attachments of a particular document
+         * Delete all attachments of a particular document
+		 *
+		 * @param int $upload_target_srl Upload target srl to delete files
+		 * @return Object
          **/
         function deleteFiles($upload_target_srl) {
             // Get a list of attachements
@@ -603,7 +721,12 @@
         }
 
         /**
-         * @brief Move an attachement to the other document
+         * Move an attachement to the other document
+		 *
+		 * @param int $source_srl Sequence of target to move
+		 * @param int $target_module_srl New squence of module
+		 * @param int $target_srl New sequence of target
+		 * @return void
          **/
         function moveFile($source_srl, $target_module_srl, $target_srl) {
             if($source_srl == $target_srl) return;
@@ -644,7 +767,12 @@
         }
 
         /**
-         * @brief Find the attachment where a key is upload_target_srl and then return java script code
+         * Find the attachment where a key is upload_target_srl and then return java script code
+		 *
+		 * @deprecated
+		 * @param int $editor_sequence
+		 * @param int $upload_target_srl
+		 * @return void
          **/
         function printUploadedFileList($editor_sequence, $upload_target_srl) {
             return;
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index bcfb5b133..34005e0d3 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -1,22 +1,24 @@
 <?php
     /**
-     * @class  fileModel
+     * Model class of the file module
      * @author NHN (developers@xpressengine.com)
-     * @brief model class of the file module
      **/
-
     class fileModel extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Return a file list attached in the document
+         * 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
+		 *
+		 * @return void
          **/
         function getFileList() {
             $oModuleModel = &getModel('module');
@@ -66,7 +68,10 @@
         }
 
         /**
-         * @brief Return number of attachments which belongs to a specific document
+         * Return number of attachments which belongs to a specific document
+		 *
+		 * @param int $upload_target_srl The sequence to get a number of files
+		 * @return int Returns a number of files
          **/
         function getFilesCount($upload_target_srl) {
             $args->upload_target_srl = $upload_target_srl;
@@ -75,14 +80,21 @@
         }
 
         /**
-         * @brief Get a download path
+         * Get a download path
+		 *
+		 * @param int $file_srl The sequence of file to get url
+		 * @param string $sid
+		 * @return string Returns a url
          **/
         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
+         * Get file configurations
+		 *
+		 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
+		 * @return object Returns configuration.
          **/
         function getFileConfig($module_srl = null) {
             // Get configurations (using module model object)
@@ -121,7 +133,11 @@
         }
 
         /**
-         * @brief Get file information
+         * Get file information
+		 *
+		 * @param int $file_srl The sequence of file to get information
+		 * @param array $columnList The list of columns to get from DB
+		 * @return Object|object|array If error returns an instance of Object. If result set is one returns a object that contins file information. If result set is more than one returns array of object.
          **/
         function getFile($file_srl, $columnList = array()) {
             $args->file_srl = $file_srl;
@@ -154,7 +170,12 @@
         }
 
         /**
-         * @brief Return all files which belong to a specific document
+         * Return all files which belong to a specific document
+		 *
+		 * @param int $upload_target_srl The sequence of target to get file list
+		 * @param array $columnList The list of columns to get from DB
+		 * @param string $sortIndex The column that used as sort index
+		 * @return array Returns array of object that contains file information. If no result returns null.
          **/
         function getFiles($upload_target_srl, $columnList = array(), $sortIndex = 'file_srl') {
             $args->upload_target_srl = $upload_target_srl;
@@ -178,7 +199,9 @@
         }
 
         /**
-         * @brief Return configurations of the attachement (it automatically checks if an administrator is)
+         * Return configurations of the attachement (it automatically checks if an administrator is)
+		 *
+		 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
          **/
         function getUploadConfig() {
             $logged_info = Context::get('logged_info');
@@ -199,7 +222,10 @@
         }
 
         /**
-         * @brief Return messages for file upload and it depends whether an admin is or not
+         * Return messages for file upload and it depends whether an admin is or not
+		 *
+		 * @param int $attached_size
+		 * @return string
          **/
         function getUploadStatus($attached_size = 0) {
             $file_config = $this->getUploadConfig();
@@ -218,12 +244,22 @@
         }
 
         /**
-         * @brief Return file configuration of the module
+         * Return file configuration of the module
+		 *
+		 * @param int $module_srl The sequence of module to get configuration
+		 * @return object
          **/
         function getFileModuleConfig($module_srl) {
             return $this->getFileConfig($module_srl);
         }
 
+		/**
+		 * Returns a grant of file
+		 *
+		 * @param object $file_info The file information to get grant
+		 * @param object $member_info The member information to get grant
+		 * @return object Returns a grant of file
+		 */
 		function getFileGrant($file_info, $member_info){
 			if (!$file_info) return null;
 
diff --git a/modules/file/file.view.php b/modules/file/file.view.php
index 823d14c1c..bef3d879a 100644
--- a/modules/file/file.view.php
+++ b/modules/file/file.view.php
@@ -1,24 +1,23 @@
 <?php
     /**
-     * @class  fileView
+     * The view class file module
      * @author NHN (developers@xpressengine.com)
-     * @brief The view class file module
-     *
-     *
-     *
      **/
-
     class fileView extends file {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief This is for additional configuration for service module
+         * This is for additional configuration for service module
          * It only receives file configurations
+		 *
+		 * @param string $obj The html string of page of addition setup of module
+		 * @return Object
          **/
         function triggerDispFileAdditionSetup(&$obj) {
             $current_module_srl = Context::get('module_srl');
diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php
index 33c9ef062..88fc25c12 100644
--- a/modules/importer/extract.class.php
+++ b/modules/importer/extract.class.php
@@ -1,33 +1,97 @@
 <?php
-    /**
-     * @class extract 
-     * @author NHN (developers@xpressengine.com)
-     * @brief Class to save each file by using tags in the large xml
-     **/
+	/**
+	 * extract class
+	 * Class to save each file by using tags in the large xml
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
     class extract {
+		/**
+		 * Temp file's key. made by md5 with filename
+		 * @var string
+		 */
         var $key = '';
+		/**
+		 * Temp cache file path
+		 * @var string
+		 */
         var $cache_path = './files/cache/importer';
+		/**
+		 * Temp index cache file path
+		 * @var string
+		 */
         var $cache_index_file = './files/cache/importer';
-        
+		/**
+		 * File name
+		 * @var string
+		 */
         var $filename = null;
+		/**
+		 * Start tag
+		 * @var string
+		 */
         var $startTag = '';
+		/**
+		 * End tag
+		 * @var string
+		 */
         var $endTag = '';
+		/**
+		 * Item start tag
+		 * @var string
+		 */
         var $itemStartTag = '';
+		/**
+		 * Item end tag
+		 * @var string
+		 */
         var $itemEndTag = '';
 
+		/**
+		 * File resource
+		 * @var string
+		 */
         var $fd = null;
+		/**
+		 * Index file resource
+		 * @var string
+		 */
         var $index_fd = null;
 
+		/**
+		 * Start tag open status
+		 * @var bool
+		 */
         var $isStarted = false;
+		/**
+		 * End tag close status
+		 * @var bool
+		 */
         var $isFinished = true;
 
+		/**
+		 * Buffer
+		 * @var string
+		 */
         var $buff = 0;
 
+		/**
+		 * File count
+		 * @var int
+		 */
         var $index = 0;
 
-        /**
-         * @brief Get arguments for constructor, file name, start tag, end tag, tag name for each item
-         **/
+		/**
+		 * Get arguments for constructor, file name, start tag, end tag, tag name for each item
+		 * @param string $filename
+		 * @param string $startTag
+		 * @param string $endTag
+		 * @param string $itemTag
+		 * @param string $itemEndTag
+		 * @return Object
+		 */
         function set($filename, $startTag, $endTag, $itemTag, $itemEndTag) {
             $this->filename = $filename;
 
@@ -46,9 +110,10 @@
             return $this->openFile();
         }
 
-        /**
-         * @brief Open an indicator of the file
-         **/
+		/**
+		 * Open an indicator of the file
+		 * @return Object
+		 */
         function openFile() {
             FileHandler::removeFile($this->cache_index_file);
             $this->index_fd = fopen($this->cache_index_file,"a");
@@ -104,7 +169,11 @@
 
             return new Object();
         }
-        
+
+		/**
+		 * Close an indicator of the file
+		 * @return void
+		 */
         function closeFile() {
             $this->isFinished = true;
             fclose($this->fd);
@@ -115,6 +184,10 @@
             return $this->isFinished || !$this->fd || feof($this->fd);
         }
 
+		/**
+		 * Save item
+		 * @return void
+		 */
         function saveItems() {
 			FileHandler::removeDir($this->cache_path.$this->key);
 			$this->index = 0;
@@ -123,6 +196,10 @@
 			}
         }
 
+		/**
+		 * Merge item
+		 * @return void
+		 */
         function mergeItems($filename) {
             $this->saveItems();
 
@@ -144,6 +221,10 @@
             fclose($fd);
         }
 
+		/**
+		 * Get item. Put data to buff
+		 * @return void
+		 */
         function getItem() {
             if($this->isFinished()) return;
 
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 72c817d66..59acd4cc8 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -1,26 +1,37 @@
 <?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');
 
+	/**
+	 * importerAdminController class
+	 * admin controller class of importer module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
     class importerAdminController extends importer {
-
+		/**
+		 * Unit count
+		 * @var int
+		 */
         var $unit_count = 300;
+		/**
+		 * Xml parser
+		 * @var XmlParser
+		 */
         var $oXmlParser = null;
 
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
 		/**
-		 * @brief Check whether the passing filename exists or not. Detect the file type, too.
+		 * Check whether the passing filename exists or not. Detect the file type, too.
+		 * @return void
 		 */
 		function procImporterAdminCheckXmlFile() {
 			global $lang;
@@ -77,9 +88,10 @@
 			$this->add('result_message', $resultMessage);
 		}
 
-        /**
-         * @brief sync member information with document information
-         **/
+		/**
+		 * Sync member information with document information
+		 * @return void
+		 */
         function procImporterAdminSync() {
 			/* DBMS가 CUBRID인 경우 MySQL과 동일한 방법으로는 문서 및 댓글에 대한 사용자 정보를 동기화 할 수 없으므로 예외 처리 합니다.
 			  CUBRID를 사용하지 않는 경우에만 보편적인 기존 질의문을 사용합니다. */
@@ -131,9 +143,10 @@
             $this->setMessage('msg_sync_completed');
         }
 
-        /**
-         * @brief Pre-analyze the xml file and cache it
-         **/
+		/**
+		 * Pre-analyze the xml file and cache it
+		 * @return void
+		 */
         function procImporterAdminPreProcessing() {
             // Get the target xml file to import
             $xml_file = Context::get('xml_file');
@@ -230,9 +243,10 @@
             $this->add('status',0);
         }
 
-        /**
-         * @brief Migrate data after completing xml file extraction
-         **/
+		/**
+		 * Migrate data after completing xml file extraction
+		 * @return void
+		 */
         function procImporterAdminImport() {
             // Variable setting
             $type = Context::get('type');
@@ -284,9 +298,13 @@
             } else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
         }
 
-        /**
-         * @brief Import member information
-         **/
+		/**
+		 * Import member information
+		 * @param int $key
+		 * @param int $cur
+		 * @param string $index_file
+		 * @return int
+		 */
         function importMember($key, $cur, $index_file) {
             if(!$cur) $cur = 0;
             // Create the xmlParser object
@@ -426,9 +444,13 @@
             return $idx-1;
         }
 
-        /**
-         * @brief Import message information parsed from a given xml file
-         **/
+		/**
+		 * Import message information parsed from a given xml file
+		 * @param int $key
+		 * @param int $cur
+		 * @param string $index_file
+		 * @return int
+		 */
         function importMessage($key, $cur, $index_file) {
             if(!$cur) $cur = 0;
             // Create the xmlParser object
@@ -515,9 +537,14 @@
             return $idx-1;
         }
 
-        /**
-         * @brief Import data in module.xml format
-         **/
+		/**
+		 * Import data in module.xml format
+		 * @param int $key
+		 * @param int $cur
+		 * @param string $index_file
+		 * @param int $module_srl
+		 * @return int
+		 */
         function importModule($key, $cur, $index_file, $module_srl) {
             // Pre-create the objects needed
             $this->oXmlParser = new XmlParser();
@@ -647,6 +674,7 @@
                 $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);
+				$obj->last_updater = base64_decode($xmlDoc->post->last_updater->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;
@@ -719,9 +747,13 @@
             return $idx-1;
         }
 
-        /**
-         * @brief Trackbacks
-         **/
+		/**
+		 * Trackbacks
+		 * @param resource $fp
+		 * @param int $module_srl
+		 * @param int $document_srl
+		 * @return int
+		 */
         function importTrackbacks($fp, $module_srl, $document_srl) {
             $started = false;
             $buff = null;
@@ -760,9 +792,13 @@
             return $cnt;
         }
 
-        /**
-         * @brief Comments
-         **/
+		/**
+		 * Comments
+		 * @param resource $fp
+		 * @param int $module_srl
+		 * @param int $document_srl
+		 * @return int
+		 */
         function importComments($fp, $module_srl, $document_srl) {
             $started = false;
             $buff = null;
@@ -869,9 +905,14 @@
             return $cnt;
         }
 
-        /**
-         * @brief Import attachment
-         **/
+		/**
+		 * Import attachment
+		 * @param resource $fp
+		 * @param int $module_srl
+		 * @param int $upload_target_srl
+		 * @param array $files
+		 * @return int
+		 */
         function importAttaches($fp, $module_srl, $upload_target_srl, &$files) {
             $uploaded_count = 0;
 
@@ -972,9 +1013,10 @@
             return $uploaded_count;
         }
 
-        /**
-         * @biref Return a filename to temporarily use
-         **/
+		/**
+		 * Return a filename to temporarily use
+		 * @return string
+		 */
         function getTmpFilename() {
             $path = "./files/cache/importer";
             if(!is_dir($path)) FileHandler::makeDir($path);
@@ -983,9 +1025,11 @@
             return $filename;
         }
 
-        /**
-         * @brief Read buff until key value comes out from a specific file point
-         **/
+		/**
+		 * Read buff until key value comes out from a specific file point
+		 * @param resource $fp
+		 * @return string
+		 */
         function saveTemporaryFile($fp) {
             $temp_filename = $this->getTmpFilename();
             $f = fopen($temp_filename, "w");
@@ -1007,9 +1051,11 @@
         }
 
 
-        /**
-         * @brief Set extra variables
-         **/
+		/**
+		 * Set extra variables
+		 * @param resource $fp
+		 * @return array
+		 */
         function importExtraVars($fp) {
             $buff = null;
             while(!feof($fp)) {
diff --git a/modules/importer/importer.admin.view.php b/modules/importer/importer.admin.view.php
index 893eb8491..cb149660a 100644
--- a/modules/importer/importer.admin.view.php
+++ b/modules/importer/importer.admin.view.php
@@ -1,23 +1,25 @@
 <?php
-    /**
-     * @class  importerAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the importer module 
-     **/
-
+	/**
+	 * importerAdminView class
+	 * admin view class of the importer module 
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
     class importerAdminView extends importer {
-
-        /**
-         * @brief Initialization
-         *
-         * Importer module is divided by general use and administrative use \n
-         **/
+		/**
+		 * Initialization
+		 * Importer module is divided by general use and administrative use \n
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Display a form to upload the xml file
-         **/
+		/**
+		 * Display a form to upload the xml file
+		 * @return void
+		 */
         function dispImporterAdminContent() {
             $this->setTemplatePath($this->module_path.'tpl');
 
@@ -54,9 +56,10 @@
             $this->setTemplateFile($template_filename);
         }
 
-        /**
-         * @brief Display a form to upload the xml file
-         **/
+		/**
+		 * Display a form to upload the xml file
+		 * @return void
+		 */
         function dispImporterAdminImportForm() {
 			$oDocumentModel = &getModel('document');	//for document lang use in this page
 
diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php
index 79c8fa834..dca74b282 100644
--- a/modules/importer/importer.class.php
+++ b/modules/importer/importer.class.php
@@ -1,36 +1,41 @@
 <?php
-    /**
-     * @class  importer
-     * @author NHN (developers@xpressengine.com)
-     * @brief high class of importer module
-     **/
-
+	/**
+	 * importer
+	 * high class of importer module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
     class importer extends ModuleObject {
-
-        /**
-         * @brief Implement if additional tasks are necessary when installing
-         **/
+		/**
+		 * Implement if additional tasks are necessary when installing
+		 * @return Object
+		 */
         function moduleInstall() {
             return new Object();
         }
 
-        /**
-         * @brief a method to check if successfully installed
-         **/
+		/**
+		 * A method to check if successfully installed
+		 * @return bool
+		 */
         function checkUpdate() {
             return false;
         }
 
-        /**
-         * @brief Execute update
-         **/
+		/**
+		 * Execute update
+		 * @return Object
+		 */
         function moduleUpdate() {
             return new Object();
         }
 
-        /**
-         * @brief Re-generate the cache file
-         **/
+		/**
+		 * Re-generate the cache file
+		 * @return void
+		 */
         function recompileCache() {
         }
     }
diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php
index adfe8d3d0..53efff1c7 100644
--- a/modules/importer/ttimport.class.php
+++ b/modules/importer/ttimport.class.php
@@ -1,20 +1,34 @@
 <?php
-    /**
-     * @class ttimport 
-     * @author NHN (developers@xpressengine.com)
-     * @brief  ttxml import class
-     **/
-
     @set_time_limit(0);
     @require_once('./modules/importer/extract.class.php');
 
+	/**
+	 * ttimport class
+	 * ttxml import class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
     class ttimport {
-
+		/**
+		 * Xml Parse
+		 * @var XmlParser
+		 */
         var $oXmlParser = null;
 
-        /**
-         * @brief import data in module.xml format
-         **/
+		/**
+		 * Import data in module.xml format
+		 * @param int $key
+		 * @param int $cur
+		 * @param string $index_file
+		 * @param int $unit_count
+		 * @param int $module_srl
+		 * @param int $guestbook_module_srl
+		 * @param string $user_id
+		 * @param string $module_name
+		 * @return int
+		 */
         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();
@@ -330,7 +344,16 @@
             return $idx-1;
         }
 
-
+		/**
+		 * Insert textyle guest book
+		 * @param object $val
+		 * @param int $module_srl
+		 * @param object $member_info
+		 * @param int $textyle_guestbook_srl
+		 * @param int $parent_srl
+		 * @param int $author_xml_id
+		 * @return int|bool
+		 */
 		function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null) {
             $tobj = null;
             if($textyle_guestbook_srl>0){
@@ -372,9 +395,15 @@
 		}
 
 
-        /**
-         * @brief Attachment
-         **/
+		/**
+		 * Attachment
+		 * @param resource $fp
+		 * @param int $module_srl
+		 * @param int $upload_target_srl
+		 * @param array $files
+		 * @param string $buff
+		 * @return bool
+		 */
         function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff) {
             $uploaded_count = 0;
 
@@ -441,9 +470,10 @@
             return false;
         }
 
-        /**
-         * @biref Return a filename to temporarily use
-         **/
+		/**
+		 * Return a filename to temporarily use
+		 * @return string
+		 */
         function getTmpFilename() {
             $path = "./files/cache/importer";
             if(!is_dir($path)) FileHandler::makeDir($path);
@@ -452,9 +482,12 @@
             return $filename;
         }
 
-        /**
-         * @brief Read buff until key value comes out from a specific file point
-         **/
+		/**
+		 * Read buff until key value comes out from a specific file point
+		 * @param resource $fp
+		 * @param string $buff
+		 * @return string
+		 */
         function saveTemporaryFile($fp, $buff) {
             $temp_filename = $this->getTmpFilename();
             $buff = substr($buff, 9);
@@ -473,9 +506,11 @@
             return $temp_filename;
         }
 
-        /**
-         * @brief Replace img tag in the ttxml
-         **/
+		/**
+		 * Replace img tag in the ttxml
+		 * @param array $matches
+		 * @return string
+		 */
         function _replaceTTAttach($matches) {
             $name = $matches[2];
             if(!$name) return $matches[0];
@@ -496,9 +531,10 @@
             }
         }
 
-        /**
-         * @brief Convert the video file
-         **/
+		/**
+		 * Convert the video file
+		 * @return string
+		 */
         function _replaceTTMovie($matches) {
             $key = $matches[1];
             if(!$key) return $matches[0];
@@ -513,9 +549,16 @@
                     '</object>';
         }
 
-        /**
-         * @brief Comment
-         **/
+		/**
+		 * Comment
+		 * @param object $val
+		 * @param int $module_srl
+		 * @param int $document_srl
+		 * @param object $member_info
+		 * @param int $parent_srl
+		 * @param int $author_xml_id
+		 * @return bool|int|object
+		 */
         function insertComment($val, $module_srl, $document_srl, $member_info, $parent_srl = 0, $author_xml_id) {
             $tobj = null;
             $tobj->comment_srl = getNextSequence();
@@ -580,7 +623,15 @@
             }
             return false;
         }
-        // List category
+
+		/**
+		 * List category
+		 * @param object $obj
+		 * @param array $category
+		 * @param int $idx
+		 * @param int $parent
+		 * @return void
+		 */
         function arrangeCategory($obj, &$category, &$idx, $parent = 0) {
             if(!$obj->category) return;
             if(!is_array($obj->category)) $c = array($obj->category);
diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
index 95ca40e6b..e5016e71d 100644
--- a/modules/install/lang/lang.xml
+++ b/modules/install/lang/lang.xml
@@ -11,21 +11,20 @@
 		<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 name="language">
+			<value xml:lang="ko"><![CDATA[설치 언어 선택]]></value>
+			<value xml:lang="en"><![CDATA[Select language]]></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ükleme dilini seçin]]></value>
+			<value xml:lang="vi"><![CDATA[Chọn ngôn ngữ cài đặt]]></value>
 		</item>
 		<item name="condition">
 			<value xml:lang="ko"><![CDATA[설치 조건 확인]]></value>
@@ -142,13 +141,6 @@
 			<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>
@@ -312,18 +304,6 @@
 		<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>
@@ -420,15 +400,15 @@
 		</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>
+			<value xml:lang="en"><![CDATA[Use CUBRID as a database. See <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a> for more info]]></value>
+			<value xml:lang="jp"><![CDATA[CUBRID DBを利用します。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用CUBRID DB。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用 CUBRID DB。 <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="fr"><![CDATA[Utiliser la Base de Données de CUBRID.  <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="ru"><![CDATA[Используем CUBRID DB. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="es"><![CDATA[Usar BD CUBRID. <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manual</a>]]></value>
+			<value xml:lang="tr"><![CDATA[CUBRID'ü veritabanı olarak kullanın. Daha fazla bilgi için <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Manuel</a>i inceleyiniz]]></value>
+			<value xml:lang="vi"><![CDATA[Sử dụng <b>CUBRID</b> Database.  <a href="http://www.cubrid.org/wiki_tutorials/entry/cubrid-installation-instructions" target="_blank">Hướng dẫn</a>]]></value>
 		</item>
 		<item name="mssql">
 			<value xml:lang="ko"><![CDATA[MSSQL DB를 이용합니다.]]></value>
@@ -562,16 +542,16 @@
 		<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 name="db_name">
+		<value xml:lang="ko"><![CDATA[DB 이름]]></value>
+		<value xml:lang="en"><![CDATA[DB Name]]></value>
+		<value xml:lang="jp"><![CDATA[DB 名前]]></value>
+		<value xml:lang="zh-CN"><![CDATA[DB 姓名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[DB 姓名]]></value>
+		<value xml:lang="fr"><![CDATA[DB Nom]]></value>
+		<value xml:lang="ru"><![CDATA[DB Имя]]></value>
+		<value xml:lang="es"><![CDATA[DB Nombre]]></value>
+		<value xml:lang="vi"><![CDATA[DB Tên]]></value>
 	</item>
 	<item name="db_database_file">
 		<value xml:lang="ko"><![CDATA[DB 데이터베이스 파일]]></value>
@@ -791,70 +771,40 @@
 		<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>
+		<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>
+		<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>
+		<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>
@@ -877,34 +827,14 @@ Xin cảm ơn đã sử dụng XE!]]></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 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>
 </lang>
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
index 8ed52b759..a60bd36a9 100644
--- a/modules/install/tpl/css/install.css
+++ b/modules/install/tpl/css/install.css
@@ -105,7 +105,7 @@ html{height:100%;background:url(../img/bgHtml.gif) repeat-x 0 0}
 .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{padding:10px 20px;margin:0 20px 20px 20px;background:#555;color:#eee;line-height:1.5}
 .desc ul{margin:0 0 0 20px;padding:0}
 .desc strong{color:#F60}
 .agreement{color:#eee}
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index fe763051e..bd1f2b7ed 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.firebird.html b/modules/install/tpl/form.firebird.html
index fcc532fb1..a930c8ba2 100644
--- a/modules/install/tpl/form.firebird.html
+++ b/modules/install/tpl/form.firebird.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html
index ca3a802bf..1d4f42dea 100644
--- a/modules/install/tpl/form.mssql.html
+++ b/modules/install/tpl/form.mssql.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index ea054192d..64e6cd820 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html
index ea054192d..64e6cd820 100644
--- a/modules/install/tpl/form.mysql_innodb.html
+++ b/modules/install/tpl/form.mysql_innodb.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html
index ea054192d..64e6cd820 100644
--- a/modules/install/tpl/form.mysqli.html
+++ b/modules/install/tpl/form.mysqli.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/form.postgresql.html b/modules/install/tpl/form.postgresql.html
index e439dc22e..59beed55e 100644
--- a/modules/install/tpl/form.postgresql.html
+++ b/modules/install/tpl/form.postgresql.html
@@ -17,7 +17,7 @@
 					<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="dbName">{$lang->db_name}</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>
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index ac09b51aa..275e15eec 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -1,4 +1,4 @@
-<!--%import("./css/install.css")-->
+<load target="./css/install.css" />
 <div id="xei">
 	<div id="header">
 		<h1><img src="img/xe.gif" width="163" height="26" alt="Xpress Engine" /></h1>
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index 89f6e92fd..2fe78c096 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -1,39 +1,29 @@
-<!--%import("js/install_admin.js")-->
-<!--#include("header.html")-->
+<load target="js/install_admin.js" />
+<include target="header.html" />
 	<div id="body">
-<!--#include("progress_menu.html")-->
+		<include target="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']}" />
+				<input type="hidden" name="module" value="install" />
+				<input type="hidden" name="act" value="procInstallAgreement" /> <!-- UX/Remove -->
+				<input type="hidden" name="lgpl_agree" value="Y" /> <!-- UX/Remove -->
+				<input type="hidden" name="enviroment_gather" value="N" /> <!-- UX/Remove -->
 				<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>
+					<ul style="list-style:none">
+						<li loop="$lang_supported=>$key,$val" style="position:relative; margin:0 0 4px 0">
+							<i cond="$l==$key" style="position:absolute;top:0;left:-16px;font-style:normal;font-weight:bold;color:red" title="Selected Language">&#10004;</i>
+							<a href="{getUrl('l', $key)}" cond="$l!=$key">{$val}</a>
+							<strong cond="$l==$key">{$val}</strong>
+						</li>
+					</ul>
 				</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>
-							<div class="aList" style="bottom:20px;top:auto">
-								<ul>
-									<li loop="$lang_supported=>$key,$val"><a href="{getUrl('l', $key)}">{$val}</a></li>
-								</ul>
-							</div>
-						</div>
-					</div>
 					<div class="fRight">
-						<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_agree_license}" /></span>
+						<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_next}" /></span>
 					</div>
 				</div>
 			</form>
 		</div>
 	</div>
-
-<!--#include("footer.html")-->
+<include target="footer.html" />
diff --git a/modules/install/tpl/js/install.js b/modules/install/tpl/js/install.js
index ca38567b5..d63db0139 100644
--- a/modules/install/tpl/js/install.js
+++ b/modules/install/tpl/js/install.js
@@ -1,14 +1,4 @@
 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');
diff --git a/modules/install/tpl/progress_menu.html b/modules/install/tpl/progress_menu.html
index 1a5bd5d9b..9a75f09bd 100644
--- a/modules/install/tpl/progress_menu.html
+++ b/modules/install/tpl/progress_menu.html
@@ -1,11 +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>
+<div id="progress">
+	<ul>
+		<li class="active"|cond="$act==''">{$lang->install_progress_menu['language']}</li>
+		<li class="active"|cond="$act=='dispInstallCheckEnv'">{$lang->install_progress_menu['condition']}</li>
+		<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '3'">{$lang->install_progress_menu['ftp']}</li>
+		<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '4'">{$lang->install_progress_menu['dbSelect']}</li>
+		<li class="active"|cond="$act=='dispInstallDBForm'">{$lang->install_progress_menu['dbInfo']}</li>
+		<li class="active"|cond="$act=='dispInstallConfigForm'">{$lang->install_progress_menu['configInfo']}</li>
+		<li class="active"|cond="$act=='dispInstallManagerForm'">{$lang->install_progress_menu['adminInfo']}</li>
+	</ul>
+</div>
diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php
index 0a1167117..466fa3e54 100644
--- a/modules/integration_search/integration_search.admin.controller.php
+++ b/modules/integration_search/integration_search.admin.controller.php
@@ -1,21 +1,24 @@
 <?php
     /**
-     * @class  integration_searchAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the integration_search module
-     *
-     * Search Management
-     *
+     * The admin view class of the integration_search module
+	 *
+	 * @author NHN (developers@xpressengine.com)
      **/
 
     class integration_searchAdminController extends integration_search {
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
-        function init() {}
+        function init()
+		{
+		}
 
         /**
-         * @brief Save Settings
+         * Save Settings
+		 *
+		 * @return mixed
          **/
         function procIntegration_searchAdminInsertConfig() {
             // Get configurations (using module model object)
@@ -31,16 +34,14 @@
             $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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
-         * @brief Save the skin information
+         * Save the skin information
+		 *
+		 * @return mixed
          **/
         function procIntegration_searchAdminInsertSkin() {
             // Get configurations (using module model object)
@@ -107,12 +108,9 @@
 			$output = $oModuleController->insertModuleConfig('integration_search',$args);
 
             $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', 'dispIntegration_searchAdminSkinInfo');
-				$this->setRedirectUrl($returnUrl);
-				return;
-			}
-			else $output;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminSkinInfo');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
     }
 ?>
diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php
index 6abc799e6..02de5904d 100644
--- a/modules/integration_search/integration_search.admin.view.php
+++ b/modules/integration_search/integration_search.admin.view.php
@@ -1,11 +1,8 @@
 <?php
     /**
-     * @class  integration_searchAdminView
+     * The admin view class of the integration_search module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the integration_search module
-     *
-     * Search Management
-     *
      **/
 
     class integration_searchAdminView extends integration_search {
@@ -13,7 +10,9 @@
         var $config = null;
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
             // Get configurations (using module model object)
@@ -25,7 +24,9 @@
         }
 
         /**
-         * @brief Module selection and skin set
+         * Module selection and skin set
+		 *
+		 * @return Object
          **/
         function dispIntegration_searchAdminContent() {
             // Get a list of skins(themes)
@@ -60,7 +61,9 @@
         }
 
         /**
-         * @brief Skin Settings
+         * Skin Settings
+		 *
+		 * @return Object
          **/
         function dispIntegration_searchAdminSkinInfo() {
             $oModuleModel = &getModel('module');
diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php
index f82c2aa0a..6ff8a5702 100644
--- a/modules/integration_search/integration_search.class.php
+++ b/modules/integration_search/integration_search.class.php
@@ -1,14 +1,16 @@
 <?php
     /**
-     * @class  integration_search
+     * The view class of the integration_search module
+	 *
      * @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
+         * Implement if additional tasks are necessary when installing
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
             // Registered in action forward
@@ -19,21 +21,27 @@
         }
 
         /**
-         * @brief a method to check if successfully installed
+         * Check methoda whether successfully installed
+		 *
+		 * @return bool
          **/
         function checkUpdate() {
             return false;
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             return new Object(0, 'success_updated');
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @return void
          **/
         function recompileCache() {
         }
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
index 456c5e180..c25e37d26 100644
--- a/modules/integration_search/integration_search.model.php
+++ b/modules/integration_search/integration_search.model.php
@@ -1,19 +1,30 @@
 <?php
     /**
-     * @class  integrationModel
+     * The model class of integration module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief Model class of integration module
      **/
 
     class integration_searchModel extends module {
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Search documents
+         * Search documents
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_target Target
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 *
+		 * @return Object output document list
          **/
         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);
@@ -43,7 +54,15 @@
         }
 
         /**
-         * @brief Comment Search
+         * Search comment
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 *
+		 * @return Object output comment list
          **/
         function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
             if(is_array($module_srls_list)){
@@ -71,7 +90,16 @@
         }
 
         /**
-         * @brief Search trackbacks
+         * Search trackbacks
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_target Target
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 *
+		 * @return Object output trackback list
          **/
         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);
@@ -93,7 +121,16 @@
         }
 
         /**
-         * @brief File Search
+         * Search file
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 * @param string $direct_download Y or N
+		 *
+		 * @return Object output file list
          **/
         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);
@@ -176,14 +213,30 @@
         }
 
         /**
-         * @brief Multimedia Search
+         * Search Multimedia. call function _getFiles().
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 *
+		 * @return Object
          **/
         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
+         * Search for attachments. call function _getFiles().
+		 *
+		 * @param string $target choose target. exclude or include for $module_srls_list
+		 * @param string $module_srls_list module_srl list to string type. ef - 102842,59392,102038
+		 * @param string $search_keyword Keyword
+		 * @param integer $page page of page navigation
+		 * @param integer $list_count list count of page navigation
+		 *
+		 * @return Object
          **/
         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 19e85d709..1d1e1860a 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -1,11 +1,8 @@
 <?php
     /**
-     * @class  integration_searchView
+     * The view class of the integration_search module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief view class of the integration_search module
-     *
-     * Search Output
-     *
      **/
 
     class integration_searchView extends integration_search {
@@ -14,13 +11,17 @@
         var $skin = 'default';
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Search Result
+         * Search Result
+		 *
+		 * @return Object
          **/
         function IS() {
             $oFile = &getClass('file');
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 93e00320e..a5ad4100d 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -11,8 +11,8 @@
 		<action name="dispLayoutAdminMobileContent" 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="dispLayoutAdminAllInstanceList" 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" />
diff --git a/modules/layout/lang/lang.xml b/modules/layout/lang/lang.xml
index 1571f05dd..0baaac8cd 100644
--- a/modules/layout/lang/lang.xml
+++ b/modules/layout/lang/lang.xml
@@ -1004,6 +1004,12 @@
 		<value xml:lang="en"><![CDATA[Layouts]]></value>
 		<value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value>
 		<value xml:lang="zh-TW"><![CDATA[已安裝版面]]></value>
+	</item>
+	<item name="instance_layout">
+		<value xml:lang="ko"><![CDATA[생성된 레이아웃]]></value>
+		<value xml:lang="en"><![CDATA[Instance of layout]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已安裝版面]]></value>
 
 	</item>
 	<item name="faceoff_export">
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 3e1f0d6b6..b0f63609f 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -2,21 +2,23 @@
     /**
      * @class  layoutAdminController
      * @author NHN (developers@xpressengine.com)
-     * @brief admin controller class of the layout module
+     * admin controller class of the layout module
      **/
 
     class layoutAdminController extends layout {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
-		// deprecated
         /**
-         * @brief Create a new layout
+         * Create a new layout
          * Insert a title into "layouts" table in order to create a layout
+		 * @deprecated 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procLayoutAdminInsert() {
 			if(Context::get('layout') == 'faceoff') return $this->stop('not supported');
@@ -42,16 +44,25 @@
 			$output = $this->procLayoutAdminUpdate();
 			if (!$output->toBool()) return $output;
 
-			$this->setRedirectUrl(Context::get('success_return_url'));
+			return $this->setRedirectUrl(Context::get('success_return_url'), $output);
         }
 
-        // Insert layout information into the DB
+        /**
+         * Insert layout information into the DB
+		 * @param object $args layout information
+		 * @return Object
+         **/
         function insertLayout($args) {
             $output = executeQuery("layout.insertLayout", $args);
             return $output;
         }
 
-        // Initiate if it is faceoff layout
+        /**
+         * Initiate if it is faceoff layout
+		 * @param int $layout_srl
+		 * @param string $layout_name
+		 * @return void 
+         **/
         function initLayout($layout_srl, $layout_name){
             $oLayoutModel = &getModel('layout');
             // Import a sample layout if it is faceoff
@@ -64,8 +75,9 @@
         }
 
         /**
-         * @brief Update layout information
+         * Update layout information
          * Apply a title of the new layout and extra vars
+		 * @return Object
          **/
         function procLayoutAdminUpdate() {
             // Consider the rest of items as extra vars, except module, act, layout_srl, layout, and title  .. Some gurida ..
@@ -177,9 +189,14 @@
             if(!$output->toBool()) return $output;
 
 			$this->setRedirectUrl(Context::get('error_return_url'));
-			return new Object();
+			return $output;
         }
 
+        /**
+         * Update layout information into the DB
+		 * @param object $args
+		 * @return Object
+         **/
         function updateLayout($args) {
             $output = executeQuery('layout.updateLayout', $args);
             if($output->toBool()) {
@@ -198,8 +215,9 @@
         }
 
         /**
-         * @brief Delete Layout
+         * Delete Layout
          * Delete xml cache file too when deleting a layout
+		 * @return Object
          **/
         function procLayoutAdminDelete() {
             $layout_srl = Context::get('layout_srl');
@@ -207,6 +225,11 @@
             return $this->deleteLayout($layout_srl);
         }
 
+        /**
+         * Delete layout xml cache file
+		 * @param int $layout_srl
+		 * @return Object
+         **/
         function deleteLayout($layout_srl) {
             $oLayoutModel = &getModel('layout');
 
@@ -231,7 +254,8 @@
         }
 
         /**
-         * @brief Adding Layout Code
+         * Adding Layout Code
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procLayoutAdminCodeUpdate() {
 			$mode = Context::get('mode');
@@ -264,7 +288,8 @@
         }
 
         /**
-         * @brief Reset layout code
+         * Reset layout code
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procLayoutAdminCodeReset() {
             $layout_srl = Context::get('layout_srl');
@@ -291,8 +316,8 @@
 
 
         /**
-         * @brief Layout setting page -> Upload an image
-         *
+         * Layout setting page -> Upload an image
+		 * @return void
          **/
         function procLayoutAdminUserImageUpload(){
             if(!Context::isUploaded()) exit();
@@ -309,8 +334,10 @@
         }
 
         /**
-         * @brief Layout setting page -> Upload an image
-         *
+         * insert image into user layout
+		 * @param int $layout_srl
+         * @param object $source file data
+		 * @return boolean (true : success, false : fail)
          **/
         function insertUserLayoutImage($layout_srl,$source){
             $oLayoutModel = &getModel('layout');
@@ -328,20 +355,9 @@
             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
-         *
+         * Layout setting page -> Delete an image
+		 * @return void
          **/
         function procLayoutAdminUserImageDelete(){
             $filename = Context::get('filename');
@@ -351,10 +367,24 @@
 			$this->setRedirectUrl(Context::get('error_return_url'));
         }
 
+        /**
+         * delete image into user layout
+		 * @param int $layout_srl
+         * @param string $filename
+		 * @return void
+         **/
+        function removeUserLayoutImage($layout_srl,$filename){
+            $oLayoutModel = &getModel('layout');
+            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            @unlink($path . $filename);
+        }
+
 		// deprecated
         /**
-         * @brief Save layout configuration
+         * Save layout configuration
          * save in "ini" format for faceoff
+		 * @deprecated
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procLayoutAdminUserValueInsert(){
             $oModuleModel = &getModel('module');
@@ -404,8 +434,10 @@
         }
 
         /**
-         * @brief Layout setting, save "ini"
-         *
+         * Layout setting, save "ini"
+		 * @param int $layout_srl
+		 * @param object $arr layout ini
+		 * @return void
          **/
         function insertUserLayoutValue($layout_srl,$arr){
             $oLayoutModel = &getModel('layout');
@@ -413,13 +445,12 @@
             FileHandler::writeIniFile($file, $arr);
         }
 
-        function writeUserLayoutCss(){
-
-        }
-
         /**
-         * @brief Add the widget code for faceoff into user layout file
-         *
+         * Add the widget code for faceoff into user layout file
+		 * @param int $layout_srl
+		 * @param object $arg
+		 * @param string $content
+		 * @return string
          **/
         function addExtension($layout_srl,$arg,$content){
             $oLayoutModel = &getModel('layout');
@@ -443,8 +474,9 @@
 
 
         /**
-         * @brief Delete temp files for faceoff
-         *
+         * Delete temp files for faceoff
+		 * @param int $layout_srl
+         * @return void
          **/
          function deleteUserLayoutTempFile($layout_srl){
              $oLayoutModel = &getModel('layout');
@@ -455,8 +487,8 @@
          }
 
         /**
-         * @brief faceoff export
-         *
+         * export user layout
+         * @return void
          **/
          function procLayoutAdminUserLayoutExport(){
             $layout_srl = Context::get('layout_srl');
@@ -548,10 +580,10 @@
             exit();
          }
 
-		// deprecated
         /**
-         * @brief faceoff import
-         *
+         * faceoff import
+		 * @deprecated
+         * @return void
          **/
          function procLayoutAdminUserLayoutImport(){
 			return $this->stop('not supported');
@@ -574,6 +606,12 @@
 			$this->setRedirectUrl(Context::get('error_return_url'));
         }
 
+        /**
+         * import layout
+		 * @param int $layout_srl
+		 * @param string $source_file path of imported file
+         * @return void
+         **/
         function importLayout($layout_srl, $source_file) {
             $oLayoutModel = &getModel('layout');
             $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 1cfc39437..836a2b1c9 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -2,41 +2,48 @@
     /**
      * @class  layoutAdminView
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the layout module
+     * admin view class of the layout module
      **/
 
     class layoutAdminView extends layout {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
             $this->setTemplatePath($this->module_path.'tpl');
         }
 
 		/**
-		 * @brief Display a installed layout list
+		 * Display a installed layout list
+		 * @return void
 		 **/
 		function dispLayoutAdminInstalledList() {
+			$type = Context::get('type');
+			$type = ($type != 'M') ? 'P' : 'M';
+
 			// Set a layout list
 			$oLayoutModel = &getModel('layout');
-			$layout_list = $oLayoutModel->getDownloadedLayoutList('P', true);
+			$layout_list = $oLayoutModel->getDownloadedLayoutList($type, true);
 			if(!is_array($layout_list))
 			{
 				$layout_list = array();
 			}
 			
-			// 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');
+			if($type == 'P')
+			{
+				// 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');
 			}
-			$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');
@@ -59,32 +66,52 @@
 		}
 
 		/**
-		 * @brief Display a installed mobile layout list
+		 * Display list of pc layout all instance
+		 * @return void|Object (void : success, Object : fail)
 		 */
-		function dispLayoutAdminInstalledMobileList() {
-			// Set a layout list
-			$oLayoutModel = &getModel('layout');
-			$layout_list = $oLayoutModel->getDownloadedLayoutList('M', true);
-			Context::set('type', 'M');
+		function dispLayoutAdminAllInstanceList()
+		{
+			$type = Context::get('type');
 
+			if (!in_array($type, array('P', 'M'))) $type = 'P';
+
+			$oLayoutModel = &getModel('layout');
+			
 			$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..');
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+			$_layout_list = $oLayoutModel->getLayoutInstanceList(0, $type, null, $columnList);
 
-			foreach($layout_list as $no => $layout_info)
+			$layout_list = array();
+			foreach($_layout_list as $item)
 			{
-				$layout_list[$no]->description = nl2br(trim($layout_info->description));
+				if(!$layout_list[$item->layout])
+				{
+					$layout_list[$item->layout] = array();
+					$layout_info = $oLayoutModel->getLayoutInfo($item->layout, null, $type);
+					if ($layout_info)
+					{
+						$layout_list[$item->layout]['title'] = $layout_info->title; 
+					}
+				}
+
+				$layout_list[$item->layout][] = $item;
 			}
+
 			Context::set('layout_list', $layout_list);
+
+			$this->setTemplateFile('layout_all_instance_list');
+
+			$security = new Security();
+			$security->encodeHTML('layout_list..');
 		}
 
 		/**
-		 * @brief Display list of pc layout instance
+		 * Display list of pc layout instance
+		 * @return void|Object (void : success, Object : fail)
 		 */
 		function dispLayoutAdminInstanceList()
 		{
@@ -111,8 +138,9 @@
 		}
 
         /**
-         * @brief Layout setting page
+         * Layout setting page
          * Once select a layout with empty value in the DB, then adjust values
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispLayoutAdminInsert() {
 			$oModel = &getModel('layout');
@@ -154,7 +182,8 @@
         }
 
 		/**
-         * @brief Insert Layout details
+         * Insert Layout details
+		 * @return void
          **/
         function dispLayoutAdminModify() {
             // Set the layout after getting layout information
@@ -193,9 +222,10 @@
 			$this->setTemplateFile('layout_modify');
         }
 
-		// deprecated
         /**
-         * @brief The first page of the layout admin
+         * The first page of the layout admin
+		 * @deprecated
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispLayoutAdminContent() {
 			$path = Context::get('path');
@@ -209,7 +239,11 @@
             $this->setTemplateFile('index');
         }
 
-		// deprecated
+        /**
+         * The first page of the mobile layout admin
+		 * @deprecated
+		 * @return void
+         **/
 		function dispLayoutAdminMobileContent() {
             $oLayoutModel = &getModel('layout');
 			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
@@ -221,7 +255,8 @@
 		}
 
         /**
-         * @brief Edit layout codes
+         * Edit layout codes
+		 * @return void
          **/
         function dispLayoutAdminEdit() {
             // Set the layout with its information
@@ -230,7 +265,7 @@
             $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();
+            if(!$layout_info) return $this->dispLayoutAdminInstalledList();
 
             // Get Layout Code
             $oLayoutModel = &getModel('layout');
@@ -280,7 +315,8 @@
         }
 
         /**
-         * @brief Preview a layout
+         * Preview a layout
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispLayoutAdminPreview() {
             $layout_srl = Context::get('layout_srl');
@@ -332,9 +368,10 @@
 
         }
 
-		// deprecated
         /**
-         * @brief Pop-up details of the layout(conf/info.xml)
+         * Pop-up details of the layout(conf/info.xml)
+		 * @deprecated
+		 * @return void
          **/
         function dispLayoutAdminInfo() {
             // Get the layout information
@@ -353,9 +390,10 @@
             $this->setTemplateFile('layout_detail_info');
         }
 
-		// deprecated
         /**
-         * @brief Modify admin layout of faceoff
+         * Modify admin layout of faceoff
+		 * @deprecated
+		 * @return void
          **/
         function dispLayoutAdminLayoutModify(){
             // Get layout_srl
@@ -400,7 +438,11 @@
             $this->setTemplateFile('faceoff_layout_edit');
         }
 
-		// deprecated
+        /**
+         * display used images info for faceoff
+		 * @deprecated
+		 * @return void
+         **/
         function dispLayoutAdminLayoutImageList(){
             $layout_srl = Context::get('layout_srl');
             $oLayoutModel = &getModel('layout');
diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php
index 387fd8746..e7e0ff13d 100644
--- a/modules/layout/layout.class.php
+++ b/modules/layout/layout.class.php
@@ -2,13 +2,14 @@
     /**
      * @class  layout
      * @author NHN (developers@xpressengine.com)
-     * @brief high class of the layout module 
+     * high class of the layout module 
      **/
 
     class layout extends ModuleObject {
 
         /**
-         * @brief Implement if additional tasks are necessary when installing
+         * Implement if additional tasks are necessary when installing
+		 * @return Object
          **/
         function moduleInstall() {
             // Create a directory to be used in the layout
@@ -18,7 +19,8 @@
         }
 
         /**
-         * @brief a method to check if successfully installed
+         * a method to check if successfully installed
+		 * @return boolean
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
@@ -37,7 +39,8 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 * @return Object
          **/
         function moduleUpdate() {
             $oDB = &DB::getInstance();
@@ -68,7 +71,8 @@
 
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 * @return void
          **/
         function recompileCache() {
             $path = './files/cache/layout';
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 9bdfe4f88..3d2e92016 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -3,22 +3,32 @@
      * @class  layoutModel
      * @author NHN (developers@xpressengine.com)
      * @version 0.1
-     * @brief Model class of the layout module
+     * Model class of the layout module
      **/
 
     class layoutModel extends layout {
 
+		/**
+		 * Check user layout temp
+		 * @var string
+		 **/
         var $useUserLayoutTemp = null;
+
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
-		// deprecated
         /**
-         * @brief Get a layout list created in the DB
+         * 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
+		 * @deprecated
+		 * @param int $site_srl
+		 * @param string $layout_type (P : PC, M : Mobile)
+		 * @param array $columnList
+		 * @return array layout lists in site
          **/
         function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array()) {
             if(!$site_srl) {
@@ -32,7 +42,12 @@
         }
 
 		/**
-		 * @brief Get layout instance list
+		 * Get layout instance list
+		 * @param int $siteSrl
+		 * @param string $layoutType (P : PC, M : Mobile)
+		 * @param string $layout name of layout
+		 * @param array $columnList
+		 * @return array layout lists in site
 		 **/
 		function getLayoutInstanceList($siteSrl = 0, $layoutType = 'P', $layout = null, $columnList = array())
 		{
@@ -49,8 +64,10 @@
 		}
 
         /**
-         * @brief Get one of layout information created in the DB
+         * Get one of layout information created in the DB
          * Return DB info + XML info of the generated layout
+		 * @param int $layout_srl
+		 * @return object info of layout
          **/
 		function getLayout($layout_srl) {
             // cache controll
@@ -68,21 +85,23 @@
 	            $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;
-				}
+				// 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
+         * Get a layout path
+		 * @param string $layout_name
+		 * @param string $layout_type (P : PC, M : Mobile)
+		 * @return string path of layout
          **/
         function getLayoutPath($layout_name, $layout_type = "P") {
 			$layout_parse = explode('.', $layout_name);
@@ -100,8 +119,11 @@
         }
 
         /**
-         * @brief Get a type and information of the layout
+         * Get a type and information of the layout
          * A type of downloaded layout
+		 * @param string $layout_type (P : PC, M : Mobile)
+		 * @param boolean $withAutoinstallInfo
+		 * @return array info of layout
          **/
         function getDownloadedLayoutList($layout_type = "P", $withAutoinstallInfo = false) {
 			if ($withAutoinstallInfo) $oAutoinstallModel = &getModel('autoinstall');
@@ -142,8 +164,8 @@
         }
 
 		/**
-		 * @brief Get a count of layout
-		 * @param $layout_type: a type of layout(P|M)
+		 * Get a count of layout
+		 * @param string $layoutType (P : PC, M : Mobile)
 		 * @return int
 		 **/
 		function getInstalledLayoutCount($layoutType = 'P')
@@ -153,8 +175,8 @@
 		}
 
 		/**
-		 * @brief Get list of layouts directory
-		 * @param $layoutType: a type of layout(P|M)
+		 * Get list of layouts directory
+		 * @param string $layoutType (P : PC, M : Mobile)
 		 * @return array
 		 **/
 		function _getInstalledLayoutDirectories($layoutType = 'P')
@@ -180,8 +202,12 @@
 		}
 
         /**
-         * @brief Get information by reading conf/info.xml in the module
+         * Get information by reading conf/info.xml in the module
          * It uses caching to reduce time for xml parsing ..
+		 * @param string $layout
+		 * @param object $info
+		 * @param string $layoutType (P : PC, M : Mobile)
+		 * @return object info of layout
          **/
         function getLayoutInfo($layout, $info = null, $layout_type = "P") {
             if($info) {
@@ -441,7 +467,6 @@
 
             }
 
-
             // header_script
             $oModuleModel = &getModel('module');
             $layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
@@ -455,9 +480,10 @@
             return $layout_info;
         }
 
-
         /**
-         * @brief Return a list of images which are uploaded on the layout setting page
+         * Return a list of images which are uploaded on the layout setting page
+		 * @param int $layout_srl
+		 * @return array image list in layout
          **/
         function getUserLayoutImageList($layout_srl){
             $path = $this->getUserLayoutImagePath($layout_srl);
@@ -465,9 +491,11 @@
             return $list;
         }
 
-
         /**
-         * @brief Get ini configurations and make them an array.
+         * Get ini configurations and make them an array.
+		 * @param int $layout_srl
+		 * @param string $layout_name
+		 * @return array 
          **/
         function getUserLayoutIniConfig($layout_srl, $layout_name=null){
             $file = $this->getUserLayoutIni($layout_srl);
@@ -480,29 +508,36 @@
         }
 
         /**
-         * @brief user layout path
+         * get user layout path
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutPath($layout_srl){
             return sprintf("./files/faceOff/%s",getNumberingPath($layout_srl,3));
         }
 
         /**
-         * @brief user layout image path
+         * get user layout image path
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutImagePath($layout_srl){
             return $this->getUserLayoutPath($layout_srl). 'images/';
         }
 
         /**
-         * @brief css which is set by an administrator on the layout setting page
+         * css which is set by an administrator on the layout setting page
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutCss($layout_srl){
             return $this->getUserLayoutPath($layout_srl). 'layout.css';
         }
 
-
         /**
-         * @brief Import faceoff css from css module handler
+         * Import faceoff css from css module handler
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutFaceOffCss($layout_srl){
             $src = $this->_getUserLayoutFaceOffCss($layout_srl);
@@ -510,25 +545,28 @@
             return $src;
         }
 
-
         /**
-         * @brief Import faceoff css from css module handler
+         * Import faceoff css from css module handler
+		 * @param int $layout_srl
+		 * @return string
          **/
         function _getUserLayoutFaceOffCss($layout_srl){
             return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
         }
 
         /**
-         * @brief user layout tmp html
+         * get user layout tmp html
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutTempFaceOffCss($layout_srl){
             return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
         }
 
-
-
         /**
-         * @brief user layout html
+         * user layout html
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutHtml($layout_srl){
             $src = $this->getUserLayoutPath($layout_srl). 'layout.html';
@@ -542,15 +580,18 @@
         }
 
         /**
-         * @brief user layout tmp html
+         * user layout tmp html
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutTempHtml($layout_srl){
             return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
         }
 
-
         /**
-         * @brief user layout ini
+         * user layout ini
+		 * @param int $layout_srl
+		 * @return string
          **/
         function getUserLayoutIni($layout_srl){
             $src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
@@ -564,58 +605,75 @@
         }
 
         /**
-         * @brief user layout tmp ini
+         * user layout tmp ini
+		 * @param int $layout_srl
+		 * @return string
          **/
         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
+         * user layout cache
+         * TODO It may need to remove the file itself
+		 * @param int $layout_srl
+		 * @param string $lang_type
+		 * @return string
          **/
         function getUserLayoutCache($layout_srl,$lang_type){
             return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
         }
 
         /**
-         * @brief layout cache
+         * layout cache
+		 * @param int $layout_srl
+		 * @param string $lang_type
+		 * @return string
          **/
         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
+         * default layout ini to prevent arbitrary changes by a user
+		 * @param string $layout_name
+		 * @return string
          **/
         function getDefaultLayoutIni($layout_name){
             return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
         }
 
         /**
-         * @brief default layout html to prevent arbitrary changes by a user
+         * default layout html to prevent arbitrary changes by a user
+		 * @param string $layout_name
+		 * @return string
          **/
         function getDefaultLayoutHtml($layout_name){
             return $this->getDefaultLayoutPath($layout_name). 'layout.html';
         }
 
         /**
-         * @brief default layout css to prevent arbitrary changes by a user
+         * default layout css to prevent arbitrary changes by a user
+		 * @param string $layout_name
+		 * @return string
          **/
         function getDefaultLayoutCss($layout_name){
             return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
         }
 
         /**
-         * @brief default layout path to prevent arbitrary changes by a user
+         * default layout path to prevent arbitrary changes by a user
+		 * @deprecated
+		 * @return string
          **/
         function getDefaultLayoutPath() {
             return "./modules/layout/faceoff/";
         }
 
-
         /**
-         * @brief faceoff is
+         * faceoff is
+		 * @param string $layout_name
+		 * @return boolean (true : faceoff, false : layout)
          **/
         function useDefaultLayout($layout_name){
             $info = $this->getLayoutInfo($layout_name);
@@ -623,17 +681,19 @@
             else return false;
         }
 
-
         /**
-         * @brief Set user layout as temporary save mode
+         * Set user layout as temporary save mode
+		 * @param string $flag (default 'temp')
+		 * @return void
          **/
         function setUseUserLayoutTemp($flag='temp'){
             $this->useUserLayoutTemp = $flag;
         }
 
-
         /**
-         * @brief Temp file list for User Layout
+         * Temp file list for User Layout
+		 * @param int $layout_srl
+		 * @return array temp files info
          **/
         function getUserLayoutTempFileList($layout_srl){
             $file_list = array(
@@ -644,9 +704,10 @@
             return $file_list;
         }
 
-
         /**
-         * @brief Saved file list for User Layout
+         * Saved file list for User Layout
+		 * @param int $layout_srl
+		 * @return array files info
          **/
         function getUserLayoutFileList($layout_srl){
             $file_list = array(
@@ -664,7 +725,10 @@
         }
 
         /**
-         * @brief faceOff related services for the operation run out
+         * faceOff related services for the operation run out
+		 * @deprecated
+		 * @param object $layout_info
+		 * @return void
          **/
         function doActivateFaceOff(&$layout_info) {
             $layout_info->faceoff_ini_config = $this->getUserLayoutIniConfig($layout_info->layout_srl, $layout_info->layout);
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 56926c9e5..6dcda6966 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -2,20 +2,22 @@
     /**
      * @class  layoutView
      * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the layout module
+     * admin view class of the layout module
      **/
 
     class layoutView extends layout {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
             $this->setTemplatePath($this->module_path.'tpl');
         }
 
         /**
-         * @brief Pop-up layout details(conf/info.xml)
+         * Pop-up layout details(conf/info.xml)
+		 * @return void
          **/
         function dispLayoutInfo() {
             // Get the layout information
@@ -30,7 +32,8 @@
         }
 
 		/**
-         * @brief Preview a layout
+         * Preview a layout
+		 * @return void|Object (void : success, Object : fail)
          **/
         function dispLayoutPreview() {
 			// admin check
diff --git a/modules/layout/tpl/installed_layout_list.html b/modules/layout/tpl/installed_layout_list.html
index 0eadca49a..5f84333e3 100644
--- a/modules/layout/tpl/installed_layout_list.html
+++ b/modules/layout/tpl/installed_layout_list.html
@@ -1,12 +1,8 @@
 <include target="header.html" />
 <div class="table even easyList dsTg">
+<include target="sub_tab.html" />
 	<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>
 				<span class="side"><button type="button" class="text"><span class="hide">{$lang->simple_view}</span><span class="show">{$lang->detail_view}</span></button></span>
 		</caption>
 		<thead>
@@ -55,4 +51,4 @@
 			</block>
 		</tbody>
 	</table>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html
new file mode 100644
index 000000000..0646fc43c
--- /dev/null
+++ b/modules/layout/tpl/layout_all_instance_list.html
@@ -0,0 +1,48 @@
+<script type="text/javascript">
+	xe.lang.confirm_delete = '{$lang->confirm_delete}';
+</script>
+<include target="header.html" />
+<load target="js/adminList.js" usecdn="true" />
+<div class="table even easyList">
+<include target="sub_tab.html" />
+	<table width="100%" border="1" cellspacing="0">
+		<caption>
+				<span class="side"><button type="button" class="text"><span class="hide">{$lang->simple_view}</span><span class="show">{$lang->detail_view}</span></button></span>
+		</caption>
+		<thead>
+			<tr>
+				<th scope="col" class="nowr">{$lang->number}</th>
+				<th scope="col" class="nowr">{$lang->layout_name}</th>
+				<th scope="col" class="title">{$lang->title}</th>
+				<th scope="col" class="nowr">{$lang->regdate}</th>
+				<th scope="col" class="nowr">{$lang->cmd_layout_management}</th>
+				<th scope="col" class="nowr">{$lang->cmd_layout_edit}</th>
+				<th scope="col" class="nowr">{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+{@$count=1}
+			<!--@foreach($layout_list as $layout)-->
+{@$layout_name = $layout['title']}
+{@unset($layout['title'])}
+			<tr loop="$layout => $no, $item">
+				<td class="nowr" rowspan="{count($layout)}" cond="$no === 0" >{$count++}</td>
+				<td class="nowr" rowspan="{count($layout)}" cond="$no === 0" >{$layout_name}</td>
+				<td class="title">{$item->title}</td>
+				<td class="nowr">{zdate($item->regdate, "Y-m-d")}</td>
+				<td class="nowr"><a href="{getUrl('act', 'dispLayoutAdminModify', 'layout_srl', $item->layout_srl)}">{$lang->cmd_layout_management}</a></td>
+				<td class="nowr"><a href="{getUrl('act', 'dispLayoutAdminEdit', 'layout_srl', $item->layout_srl)}">{$lang->cmd_layout_edit}</a></td>
+				<td class="nowr">
+					<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="{$item->layout_srl}" />
+
+						<input class="text" type="submit" value="{$lang->cmd_delete}" />
+					</form>
+				</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
diff --git a/modules/layout/tpl/sub_tab.html b/modules/layout/tpl/sub_tab.html
new file mode 100644
index 000000000..6413f1feb
--- /dev/null
+++ b/modules/layout/tpl/sub_tab.html
@@ -0,0 +1,14 @@
+<div class="cnb">
+		<a cond="$type == 'M'" href="{getUrl('act', 'dispLayoutAdminInstalledList', 'type', 'P')}">PC({$pcLayoutCount})</a>
+		<block cond="$type != 'M'">PC({$pcLayoutCount})</block>
+		|
+		<a cond="$type != 'M'" href="{getUrl('act', 'dispLayoutAdminInstalledList', 'type', 'M')}">Mobile({$mobileLayoutCount})</a>
+		<block cond="$type == 'M'">Mobile({$mobileLayoutCount})</block>
+</div>
+<div class="cnb">
+		<a cond="$act != 'dispLayoutAdminAllInstanceList'" href="{getUrl('act', 'dispLayoutAdminAllInstanceList', 'layout_srl', '')}">{$lang->instance_layout}</a>
+		<block cond="$act == 'dispLayoutAdminAllInstanceList'">{$lang->instance_layout}</block>
+		|
+		<a cond="$act != 'dispLayoutAdminInstalledList'" href="{getUrl('act', 'dispLayoutAdminInstalledList')}">{$lang->installed_layout}</a>
+		<block cond="$act == 'dispLayoutAdminInstalledList'">{$lang->installed_layout}</block>
+</div>
diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml
index 539057b04..3d5aab329 100644
--- a/modules/member/lang/lang.xml
+++ b/modules/member/lang/lang.xml
@@ -155,6 +155,10 @@
 		<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_email_address">
+		<value xml:lang="ko"><![CDATA[이메일 주소와 일치하는 회원이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered an invalid email address. There is no member who has the email, entered.]]></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>
@@ -929,6 +933,14 @@
 		<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_find_member_account_with_email">
+		<value xml:lang="ko"><![CDATA[이메일 주소로 계정 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find Account with Email address]]></value>
+	</item>
+	<item name="cmd_find_member_account_with_email_question">
+		<value xml:lang="ko"><![CDATA[질문/답변으로 계정 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find Account with Q&amp;A]]></value>
+	</item>
 	<item name="cmd_resend_auth_mail">
 		<value xml:lang="ko"><![CDATA[인증 메일 재발송]]></value>
 		<value xml:lang="en"><![CDATA[Request for Activation Mail]]></value>
@@ -2019,7 +2031,7 @@
 	</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="en"><![CDATA[lease input the email address you have entered during the registration and we will send your account info to this email address.]]></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>
@@ -2234,6 +2246,22 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới,
 		<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="login_trial_limit1">
+		<value xml:lang="ko"><![CDATA[로그인 시도 횟수 제한 횟수]]></value>
+		<value xml:lang="en"><![CDATA[Sign in trial limit]]></value>
+	</item>
+	<item name="login_trial_limit2">
+		<value xml:lang="ko"><![CDATA[로그인 시도 횟수 제한 시간]]></value>
+		<value xml:lang="en"><![CDATA[Sign in trial limit]]></value>
+	</item>
+	<item name="about_login_trial_limit1">
+		<value xml:lang="ko"><![CDATA[정해진 시간 안에 허용되는 로그인 횟수를 입력하십시오. 짧은 시간 동안 하나의 아이피(IP)에서 시도할 수 있는 로그인 횟수에 제한을 둡니다.]]></value>
+		<value xml:lang="en"><![CDATA[Set the number of trial limit. Limit the number of trial to sign in from a IP address.]]></value>
+	</item>
+	<item name="about_login_trial_limit2">
+		<value xml:lang="ko"><![CDATA[지정된 횟수의 로그인을 허용하는 시간을 정하십시오. 짧은 시간 동안 하나의 아이피(IP)에서 시도할 수 있는 로그인 횟수에 제한을 둡니다. 시간은 가장 마지막 로그인 시도의 시각으로부터의 시간을 기준으로 측정합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Set the time limit to try the written times of sign in. Limit the number of trial to sign in during the span of time, from a IP address.]]></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>
@@ -2466,4 +2494,23 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới,
 	<item name="msg_success_modify_email_address">
 		<value xml:lang="ko"><![CDATA[이메일 주소가 정상적으로 변경되었습니다. 변경된 이메일 주소로 로그인 가능합니다.]]></value>
 	</item>
+	<item name="group">
+		<value xml:lang="ko"><![CDATA[그룹]]></value>
+		<value xml:lang="en"><![CDATA[Group]]></value>
+	</item>
+	<item name="retrieve_password">
+		<value xml:lang="en"><![CDATA[Retrieve password]]></value>
+	</item>
+	<item name="excess_ip_access_count">
+		<value xml:lang="ko"><![CDATA[로그인 가능 횟수를 초과하셨습니다. %s 간 로그인 하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There was too much sign in trial from your devices in a short time. You can not sign in for %s.]]></value>
+	</item>
+	<item name="login_fail_report">
+		<value xml:lang="ko"><![CDATA[로그인 실패 기록 보고 입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Sign in failure report.]]></value>
+	</item>
+	<item name="login_fail_report_contents">
+		<value xml:lang="ko"><![CDATA[<h2>확인하지 않은 로그인 실패 기록이 있습니다.</h2><div>%1$s</div><p>* 이 알림은 한번만 보입니다.<br />* 이 메시지는 쪽지와 이메일로 발송됩니다.<br />* 이 메시지는 로그인이 성공한 순간, 로그인 성공 이전 실패 기록을 모아서 발송합니다.<br />발송 시각: %2$s</p>]]></value>
+		<value xml:lang="en"><![CDATA[<h2>There is unfolded sign in failure report</h2><div>%1$s</div><p>* This notification is shown once.<br />* This message will be send to your email and message.<br />* This message contains sign in failure records, before a ID sign in success.<br />Sending: %2$s</p>]]></value>
+	</item>
 </lang>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 904bd3af4..778d79b7e 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -2,19 +2,21 @@
     /**
      * @class  memberAdminController
      * @author NHN (developers@xpressengine.com)
-     * @brief member module of the admin controller class
+     * member module of the admin controller class
      **/
 
     class memberAdminController extends member {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Add a user (Administrator)
+         * Add a user (Administrator)
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminInsert() {
            // if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
@@ -103,15 +105,14 @@
 			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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Delete a user (Administrator)
+         * Delete a user (Administrator)
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminDelete() {
             // Separate all the values into DB entries and others
@@ -125,6 +126,10 @@
             $this->setMessage("success_deleted");
         }
 
+        /**
+         * Set config of member
+		 * @return void|Object (void : success, Object : fail)
+         **/
 		function procMemberAdminInsertConfig(){
             $input_args = Context::gets(
 				'enable_join',
@@ -133,6 +138,7 @@
 				'webmaster_email',
 				'limit_day',
 				'change_password_date',
+				'max_error_count','max_error_count_time',
 				'agreement',
 				'after_login_url',
 				'after_logout_url',
@@ -186,7 +192,7 @@
 					$signupItem->isDefaultForm = in_array($key, $items);
 					
 					$signupItem->name = $key;
-					if(in_array($key, $items)) $signupItem->title = $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);
@@ -226,18 +232,30 @@
 				$this->_createLoginRuleset($args->identifier);
 				$this->_createFindAccountByQuestion($args->identifier);
 			}
+
+			// check agreement value exist
+			if($args->agreement)
+			{
+				$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
+				$output = FileHandler::writeFile($agreement_file, $args->agreement);
+
+				unset($args->agreement);
+			}
 			$output = $oModuleController->updateModuleConfig('member', $args);
 
 			// default setting end
 			$this->setMessage('success_updated');
 
-			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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig');
+			$this->setRedirectUrl($returnUrl);
 		}
 
+        /**
+         * Create ruleset file of signup
+		 * @param object $signupForm (user define signup form)
+		 * @param string $agreement
+		 * @return void
+         **/
 		function _createSignupRuleset($signupForm, $agreement = null){
 			$xml_file = './files/ruleset/insertMember.xml';
 			$buff = '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL
@@ -285,6 +303,11 @@
 			$validator->getJsPath();
 		}
 
+        /**
+         * Create ruleset file of login
+		 * @param string $identifier (login identifier)
+		 * @return void
+         **/
 		function _createLoginRuleset($identifier){
 			$xml_file = './files/ruleset/login.xml';
 			$buff = '<?xml version="1.0" encoding="utf-8"?>'
@@ -307,6 +330,11 @@
 			$validator->getJsPath();
 		}
 
+        /**
+         * Create ruleset file of find account
+		 * @param string $identifier (login identifier)
+		 * @return void
+         **/
 		function _createFindAccountByQuestion($identifier){
 			$xml_file = './files/ruleset/find_member_account_by_question.xml';
 			$buff = '<?xml version="1.0" encoding="utf-8"?>'
@@ -333,7 +361,8 @@
 		}
 
         /**
-         * @brief Add a user group
+         * Add a user group
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminInsertGroup() {
             $args = Context::gets('title','description','is_default','image_mark');
@@ -344,15 +373,13 @@
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Update user group information
+         * Update user group information
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminUpdateGroup() {
             $group_srl = Context::get('group_srl');
@@ -366,15 +393,13 @@
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Update user group information
+         * Update user group information
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminDeleteGroup() {
             $group_srl = Context::get('group_srl');
@@ -386,15 +411,13 @@
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Add a join form
+         * Add a join form
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminInsertJoinForm() {
             $args->member_join_form_srl = Context::get('member_join_form_srl');
@@ -451,13 +474,14 @@
 
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList');
+			$this->setRedirectUrl($returnUrl);
         }
 
+        /**
+         * Delete a join form
+		 * @return void
+         **/
 		function procMemberAdminDeleteJoinForm(){
             $member_join_form_srl = Context::get('member_join_form_srl');
 			$this->deleteJoinForm($member_join_form_srl);
@@ -476,7 +500,9 @@
 		}
 
         /**
-         * @brief Move up/down the member join form and modify it
+         * Move up/down the member join form and modify it
+		 * @deprecated
+		 * @return void
          **/
         function procMemberAdminUpdateJoinForm() {
             $member_join_form_srl = Context::get('member_join_form_srl');
@@ -505,6 +531,7 @@
 
 		/**
 		 * selected member manager layer in dispAdminList 
+		 * @return void|Object (void : success, Object : fail)
 		 **/
 		function procMemberAdminSelectedMemberManage(){
 			$var = Context::getRequestVars();
@@ -572,15 +599,13 @@
 				}
 			}
 
-			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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
+			$this->setRedirectUrl($returnUrl);
 		}
 
         /**
-         * @brief Delete the selected members
+         * Delete the selected members
+		 * @return void|Object (void : success, Object : fail)
          */
         function procMemberAdminDeleteMembers() {
             $target_member_srls = Context::get('target_member_srls');
@@ -600,7 +625,8 @@
         }
 
         /**
-         * @brief Update a group of selected memebrs
+         * Update a group of selected memebrs
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminUpdateMembersGroup() {
             $member_srl = Context::get('member_srl');
@@ -657,7 +683,8 @@
         }
 
         /**
-         * @brief Add a denied ID
+         * Add a denied ID
+		 * @return void
          **/
         function procMemberAdminInsertDeniedID() {
             $user_ids = Context::get('user_id');
@@ -672,15 +699,13 @@
 
 			$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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Update denied ID
+         * Update denied ID
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAdminUpdateDeniedID() {
             $user_id = Context::get('user_id');
@@ -699,7 +724,9 @@
         }
 
         /**
-         * @brief Add an administrator
+         * Add an administrator
+		 * @param object $args
+		 * @return object (info of added member)
          **/
         function insertAdmin($args) {
             // Assign an administrator
@@ -714,7 +741,10 @@
         }
 
         /**
-         * @brief Change the group values of member
+         * Change the group values of member
+		 * @param int $source_group_srl
+		 * @param int $target_group_srl
+		 * @return Object
          **/
         function changeGroup($source_group_srl, $target_group_srl) {
             $args->source_group_srl = $source_group_srl;
@@ -724,7 +754,9 @@
         }
 
         /**
-         * @brief find_account_answerInsert a group
+         * find_account_answerInsert a group
+		 * @param object $args
+		 * @return Object
          **/
         function insertGroup($args) {
             if(!$args->site_srl) $args->site_srl = 0;
@@ -741,7 +773,9 @@
         }
 
         /**
-         * @brief Modify Group Information
+         * Modify Group Information
+		 * @param object $args
+		 * @return Object
          **/
         function updateGroup($args) {
             // Check the value of is_default. 
@@ -758,6 +792,9 @@
 
         /**
          * Delete a Group
+		 * @param int $group_srl
+		 * @param int $site_srl
+		 * @return Object
          **/
         function deleteGroup($group_srl, $site_srl = 0) {
             // Create a member model object
@@ -781,6 +818,7 @@
 
         /**
          * Set group config
+		 * @return void
          **/
 		function procMemberAdminGroupConfig() {
 			$vars = Context::getRequestVars();	
@@ -812,13 +850,14 @@
 
 			$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');
-				$this->setRedirectUrl($returnUrl);
-				return;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+			$this->setRedirectUrl($returnUrl);
 		}
 
+        /**
+         * Set group order
+		 * @return void
+         **/
         function procMemberAdminUpdateGroupOrder() {
 			$vars = Context::getRequestVars();
 			
@@ -828,11 +867,14 @@
 				executeQuery('member.updateMemberGroupListOrder', $args);
 			}
 
-			header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')));
+			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'));
         }
 
         /**
-         * @brief Register denied ID
+         * Register denied ID
+		 * @param string $user_id
+		 * @param string $description
+		 * @return Object
          **/
         function insertDeniedID($user_id, $description = '') {
             $args->user_id = $user_id;
@@ -843,7 +885,9 @@
         }
 
         /**
-         * @brief Delete a denied ID
+         * Delete a denied ID
+		 * @param string $user_id
+		 * @return Object
          **/
         function deleteDeniedID($user_id) {
             $args->user_id = $user_id;
@@ -851,7 +895,9 @@
         }
 
         /**
-         * @brief Delete a join form
+         * Delete a join form
+		 * @param int $member_join_form_srl
+		 * @return Object
          **/
         function deleteJoinForm($member_join_form_srl) {
             $args->member_join_form_srl = $member_join_form_srl;
@@ -860,7 +906,10 @@
         }
 
         /**
-         * @brief Move up a join form
+         * Move up a join form
+		 * @deprecated
+		 * @param int $member_join_form_srl
+		 * @return Object
          **/
         function moveJoinFormUp($member_join_form_srl) {
             $oMemberModel = &getModel('member');
@@ -899,7 +948,10 @@
         }
 
         /**
-         * @brief Move down a join form
+         * Move down a join form
+		 * @deprecated
+		 * @param int $member_join_form_srl
+		 * @return Object
          **/
         function moveJoinFormDown($member_join_form_srl) {
             $oMemberModel = &getModel('member');
diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index e13dd7a8a..64012361c 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -2,26 +2,40 @@
     /**
      * @class  memberAdminModel
      * @author NHN (developers@xpressengine.com)
-     * @brief  admin model class of member module
+     * admin model class of member module
      **/
 
     class memberAdminModel extends member {
 
         /**
-         * @brief Keep data internally which may be frequently called.
+         * info of member
+		 * @var object
          **/
         var $member_info = NULL;
+
+        /**
+         * info of member groups
+		 * @var array
+         **/
         var $member_groups = NULL;
+
+        /**
+         * info of sign up form
+		 * @var array
+         **/
         var $join_form_list = NULL;
 
         /**
-         * @brief Initialization
+         * Initialization
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Get a member list
+         * Get a member list
+		 * 
+		 * @return object|array (object : when member count is 1, array : when member count is more than 1)
          **/
         function getMemberList() {
             // Search option
@@ -119,7 +133,12 @@
         }
 
         /**
-         * @brief Get a memebr list for each site
+         * Get a memebr list for each site
+		 * 
+		 * @param int $site_srl
+		 * @param int $page
+		 *
+		 * @return array
          **/
         function getSiteMemberList($site_srl, $page = 1) {
             $args->site_srl = $site_srl;
@@ -131,6 +150,11 @@
             return $output;
         }
 
+        /**
+         * Get member_srls lists about site admins
+		 * 
+		 * @return array 
+         **/
 		function getSiteAdminMemberSrls(){
 			$output = executeQueryArray('member.getSiteAdminMemberSrls');
 			if (!$output->toBool() || !$output->data) return array();
@@ -144,7 +168,9 @@
 		}
 
         /**
-         * @brief Return colorset list of a skin in the member module
+         * Return colorset list of a skin in the member module
+		 * 
+		 * @return void 
          **/
         function getMemberAdminColorset() {
             $skin = Context::get('skin');
@@ -167,7 +193,11 @@
         }
 
         /**
-         * @brief Return member count with date
+         * Return member count with date
+		 * 
+		 * @param string $date
+		 *
+		 * @return int
          **/
         function getMemberCountByDate($date = '') {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
@@ -179,7 +209,11 @@
         }
 
         /**
-         * @brief Return site join member count with date
+         * Return site join member count with date
+		 *
+		 * @param string $date
+		 *
+		 * @return int
          **/
         function getMemberGroupMemberCountByDate($date = '') {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
@@ -191,7 +225,9 @@
         }
 
         /**
-         * @brief Return add join Form
+         * Return add join Form
+		 *
+		 * @return void
          **/
         function getMemberAdminInsertJoinForm() {
 			$member_join_form_srl = Context::get('member_join_form_srl');
@@ -214,6 +250,13 @@
 
             $this->add('tpl', str_replace("\n"," ",$tpl));
 		}
+
+
+        /**
+         * check allowed target ip address when  login for admin. 
+		 *
+		 * @return boolean (true : allowed, false : refuse)
+         **/
 		function getMemberAdminIPCheck() {
 		
 			$db_info = Context::getDBInfo();
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 5dd3e36fe..d00f31778 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -2,15 +2,29 @@
     /**
      * @class  memberAdminView
      * @author NHN (developers@xpressengine.com)
-     * @brief  member module's admin view class
+     * member module's admin view class
      **/
 
     class memberAdminView extends member {
 
-        var $group_list = NULL; ///< group list        
-		var $memberInfo = NULL; ///< selected member info
+		/**
+		 * Group list
+		 * 
+		 * @var array
+		 **/
+        var $group_list = NULL;
+
+		/**
+		 * Selected member info
+		 * 
+		 * @var array
+		 **/
+		var $memberInfo = NULL;
+
         /**
-         * @brief initialization         
+         * initialization
+		 *
+		 * @return void
 		 **/
         function init() {
             $oMemberModel = &getModel('member');
@@ -31,7 +45,9 @@
         }
 
         /**
-         * @brief display member list         
+         * display member list
+		 *
+		 * @return void
 		 **/
         function dispMemberAdminList() {
             $oMemberAdminModel = &getAdminModel('member');
@@ -81,7 +97,9 @@
         }
 
         /**
-         * @brief default configuration for member management
+         * default configuration for member management
+		 *
+		 * @return void
          **/
         function dispMemberAdminConfig() {
 			global $lang;            // retrieve configuration via module model instance
@@ -124,7 +142,9 @@
         }
 
         /**
-         * @brief display member information
+         * display member information
+		 *
+		 * @return void
          **/
         function dispMemberAdminInfo() {
             $oMemberModel = &getModel('member');
@@ -148,7 +168,9 @@
         }
 
         /**
-         * @brief display member insert form
+         * display member insert form
+		 *
+		 * @return void
          **/
         function dispMemberAdminInsert() {
             // retrieve extend form
@@ -189,6 +211,14 @@
 			$this->setTemplateFile('insert_member');
         }
 
+        /**
+         * Get tags by the member info type 
+		 *
+		 * @param object $memberInfo
+		 * @param boolean $isAdmin (true : admin, false : not admin)
+		 *
+		 * @return array
+         **/
 		function _getMemberInputTag($memberInfo, $isAdmin = false){
             $oMemberModel = &getModel('member');
             $extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
@@ -239,7 +269,7 @@
 						}else{
 							$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
 						}
-						$inputTag .= sprintf('<p class="a"><input type="file" name="%s" id="%s" value="" /> <span class="desc">%s : %dpx, %s : %dpx</span></p>'
+						$inputTag .= sprintf('<p class="a"><input type="file" name="%s" id="%s" value="" /></p><p><span class="desc">%s : %dpx, %s : %dpx</span></p>'
 											 ,$formInfo->name
 											 ,$formInfo->name
 											 ,$lang->{$formInfo->name.'_max_width'}
@@ -253,7 +283,7 @@
 								,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 />';
+						$inputTag = '<select name="find_account_question" style="width:290px; display:block;">%s</select>';
 						$optionTag = array();
 						foreach($lang->find_account_question_items as $key=>$val){
 							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
@@ -264,9 +294,9 @@
 													,$val);
 						}
 						$inputTag = sprintf($inputTag, implode('', $optionTag));
-						$inputTag .= '<input type="text" name="find_account_answer" value="'.$memberInfo['find_account_answer'].'" />';
+						$inputTag .= '<input type="text" name="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" class="inputText long tall" />';
 					}else{
-						$inputTag = sprintf('<input type="text" name="%s" value="%s" />'
+						$inputTag = sprintf('<input type="text" name="%s" value="%s" class="inputText long tall" />'
 									,$formInfo->name
 									,$memberInfo[$formInfo->name]);
 					}
@@ -372,7 +402,9 @@ EOD;
 		}
 
         /**
-         * @brief display member delete form
+         * display member delete form
+		 *
+		 * @return void
          **/
         function dispMemberAdminDeleteForm() {
             if(!Context::get('member_srl')) return $this->dispMemberAdminList();
@@ -380,7 +412,9 @@ EOD;
         }
 
         /**
-         * @brief display group list
+         * display group list
+		 *
+		 * @return void
          **/
         function dispMemberAdminGroupList() {
             $oModuleModel = &getModel('module');
@@ -401,7 +435,9 @@ EOD;
 		}
 
         /**
-         * @brief Display a list of member join form         
+         * Display a list of member join form
+		 * 
+		 * @return void
 		 **/
         function dispMemberAdminJoinFormList() {
             // Create a member model object            
@@ -416,7 +452,9 @@ EOD;
         }
 
         /**
-         * @brief Display an admin page for memebr join forms         
+         * Display an admin page for memebr join forms
+		 *
+		 * @return void
 		 **/
         function dispMemberAdminInsertJoinForm() {
             // Get the value of join_form            
@@ -437,7 +475,9 @@ EOD;
         }
 
         /**
-         * @brief Display denied ID list         
+         * Display denied ID list
+		 *
+		 * @return void
 		 **/
         function dispMemberAdminDeniedIDList() {
             // Create a member model object            
@@ -457,7 +497,9 @@ EOD;
         }
 
         /**
-         * @brief Update all the member groups         
+         * Update all the member groups
+		 *
+		 * @return void
 		 **/
         function dispMemberAdminManageGroup() {
             // Get a list of the selected member            
@@ -476,7 +518,9 @@ EOD;
         }
 
         /**
-         * @brief Delete all members         
+         * Delete members
+		 *
+		 * @return void
 		 **/
         function dispMemberAdminDeleteMembers() {
             // Get a list of the selected member            
diff --git a/modules/member/member.api.php b/modules/member/member.api.php
index a749955ff..b8605f788 100644
--- a/modules/member/member.api.php
+++ b/modules/member/member.api.php
@@ -2,14 +2,17 @@
     /**
      * @class  memberAPI
      * @author NHN (developers@xpressengine.com)
-     * @brief API Processing of View Action in the member module
+     * API Processing of View Action in the member module
      **/
 
     class memberAPI extends member {
 
-
         /**
-         * @brief Content List
+         * Content List
+		 *
+		 * @param Object $oModule
+		 *
+		 * @return void
          **/
         function dispSavedDocumentList(&$oModule) {
             $document_list = $this->arrangeContentList(Context::get('document_list'));
@@ -17,8 +20,13 @@
             $oModule->add('page_navigation',Context::get('page_navigation'));
         }
 
-
-
+        /**
+         * Arrange Contents
+		 *
+		 * @param array $content_list
+		 *
+		 * @return array
+         **/
         function arrangeContentList($content_list) {
             $output = array();
             if(count($content_list)) {
@@ -27,7 +35,13 @@
             return $output;
         }
 
-
+        /**
+         * Arrange Contents
+		 *
+		 * @param array $content_list
+		 *
+		 * @return array
+         **/
         function arrangeContent($content) {
             $output = null;
             if($content){
@@ -35,6 +49,5 @@
             }
             return $output;
         }
-
     }
 ?>
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index ee17290ad..95b35730b 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -2,14 +2,21 @@
     /**
      * @class  member
      * @author NHN (developers@xpressengine.com)
-     * @brief high class of the member module
+     * high class of the member module
      **/
     class member extends ModuleObject {
 
+		/**
+		 * Use sha1 encryption
+		 *
+		 * @var boolean
+		 **/
 		var $useSha1 = false;
 
         /**
-         * @brief constructor
+         * constructor
+		 *
+		 * @return void
          **/
         function member() {
             if(!Context::isInstalled()) return;
@@ -21,6 +28,8 @@
                 Context::addSSLAction('dispMemberModifyPassword');
                 Context::addSSLAction('dispMemberSignUpForm');
                 Context::addSSLAction('dispMemberModifyInfo');
+				Context::addSSLAction('dispMemberLoginForm');
+				Context::addSSLAction('dispMemberFindAccount');
                 Context::addSSLAction('procMemberLogin');
                 Context::addSSLAction('procMemberModifyPassword');
                 Context::addSSLAction('procMemberInsert');
@@ -30,7 +39,9 @@
         }
 
         /**
-         * @brief Implement if additional tasks are necessary when installing
+         * Implement if additional tasks are necessary when installing
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
             // Register action forward (to use in administrator mode)
@@ -58,43 +69,46 @@
 
 			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'};
+			// Create a member controller object
+			$oMemberController = &getController('member');
+			$oMemberAdminController = &getAdminController('member');
+
+			if(!$args->signupForm || !is_array($args->signupForm))
+			{
+				$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;
 				}
-				if ($signupItem->isIdentifier)
-					array_unshift($list_order, $signupItem);
-				else
-					$list_order[] = $signupItem;
+				$args->signupForm = $list_order;
+				$args->identifier = $identifier;
+
+				$oModuleController->insertModuleConfig('member',$args);
+
+				// Create Ruleset File
+				FileHandler::makeDir('./files/ruleset');
+				$oMemberAdminController->_createSignupRuleset($args->signupForm);
+				$oMemberAdminController->_createLoginRuleset($args->identifier);
+				$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
 			}
-			$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)) {
@@ -150,7 +164,9 @@
         }
 
         /**
-         * @brief a method to check if successfully installed
+         * a method to check if successfully installed
+		 * 
+		 * @return boolean
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
@@ -182,11 +198,14 @@
             if(!$oDB->isColumnExists("member", "list_order")) return true;
             if(!$oDB->isIndexExists("member","idx_list_order")) return true;
 
-            $oMemberModel = &getModel('member');
-            $config = $oMemberModel->getMemberConfig();
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
 			// check signup form ordering info
 			if (!$config->signupForm) return true;
 
+			// check agreement field exist
+			if ($config->agreement) 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;
@@ -195,7 +214,9 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             $oDB = &DB::getInstance();
@@ -257,13 +278,24 @@
                 $oDB->addIndex("member","idx_list_order", array("list_order"));
             }
 
-            $oMemberModel = &getModel('member');
-            $config = $oMemberModel->getMemberConfig();
+			$oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('member');
+			$oModuleController = &getController('module');
+
+			// check agreement value exist
+			if($config->agreement)
+			{
+				$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
+				$output = FileHandler::writeFile($agreement_file, $config->agreement);
+
+				unset($config->agreement);
+				$output = $oModuleController->updateModuleConfig('member', $config);
+			}
 
 			// check signup form ordering info
 			if (!$config->signupForm || !is_array($config->signupForm)){
 				global $lang;
-				$oModuleController = &getController('module');
+				$oMemberModel = &getModel('member');
 				// Get join form list which is additionally set
 				$extendItems = $oMemberModel->getJoinFormList();
 				
@@ -312,9 +344,9 @@
 				}
 				$config->signupForm = $list_order;
 				$config->identifier = $identifier;
+				unset($config->agreement);
 				$output = $oModuleController->updateModuleConfig('member', $config);
 			}
-
 			
 			FileHandler::makeDir('./files/ruleset');
 			$oMemberAdminController = &getAdminController('member');
@@ -329,7 +361,9 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @return void
          **/
         function recompileCache() {
             set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
@@ -337,5 +371,70 @@
             $store = new Auth_OpenID_XEStore();
             $store->reset();
         }
-    }
+
+		/**
+		 * @brief Record login error and return the error, about IPaddress.
+		**/
+		function recordLoginError($error = 0, $message = 'success')
+		{
+			if($error == 0) return new Object($error, $message);
+
+			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
+
+			$output = executeQuery('member.getLoginCountByIp', $args);
+			if($output->data && $output->data->count)
+			{
+				// Create a member model object
+				$oMemberModel = &getModel('member');
+				$config = $oMemberModel->getMemberConfig();
+				$last_update = strtotime($output->data->last_update);
+				$term = intval(time()-$last_update);
+				//update, if IP address access in a short time, update count. If not, make count 1.
+				if($term < $config->max_error_count_time)
+				{
+					$args->count = $output->data->count + 1;
+				}
+				else
+				{
+					$args->count = 1;
+				}
+				unset($oMemberModel);
+				unset($config);
+				$output = executeQuery('member.updateLoginCountByIp', $args);
+			}
+			else
+			{
+				//insert
+				$args->count = 1;
+				$output = executeQuery('member.insertLoginCountByIp', $args);
+			}
+			return new Object($error, $message);
+		}
+
+		/**
+		 * @brief Record login error and return the error, about MemberSrl.
+		**/
+		function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
+		{
+			if($error == 0 || !$args->member_srl) return new Object($error, $message);
+
+			$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
+			if($output->data && $output->data->content)
+			{
+				//update
+				$content = unserialize($output->data->content);
+				$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),time());
+				$args->content = serialize($content);
+				$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
+			}
+			else
+			{
+				//insert
+				$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),time());
+				$args->content = serialize($content);
+				$output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args);
+			}
+			return $this->recordLoginError($error, $message);
+		}
+	}
 ?>
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 4f877e6c4..86cde2e9f 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -2,20 +2,34 @@
     /**
      * @class  memberController
      * @author NHN (developers@xpressengine.com)
-     * @brief Controller class of member module
+     * Controller class of member module
      **/
 
     class memberController extends member {
+
+		/**
+		 * Info of selected member
+		 *
+		 * @var object
+		 **/
 		var $memberInfo;
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Log-in by checking user_id and password
+         * Log-in by checking user_id and password
+		 *
+		 * @param string $user_id
+		 * @param string $password
+		 * @param string $keep_signed
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberLogin($user_id = null, $password = null, $keep_signed = null) {
 			if(!$user_id && !$password && Context::getRequestMethod() == 'GET')
@@ -55,23 +69,25 @@
 				}
 			}
 
-			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;
+			if(!$config->after_login_url)
+			{
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 			}
-
-			return $output;
+			else
+			{
+				$returnUrl = $config->after_login_url;
+			}
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
-         * @brief Login by openid
+         * Login by openid
+		 *
+		 * @deprecated
+		 *
+		 * @param string $validator
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberOpenIDLogin($validator = "procMemberOpenIDValidate") {
             $oModuleModel = &getModel('module');
@@ -109,10 +125,19 @@
             $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);
+
+			$this->setRedirectUrl($redirect_url);
         }
 
+        /**
+         * Legacy open id
+		 *
+		 * @deprecated
+		 *
+		 * @param string $openid_identity
+		 *
+		 * @return array
+         **/
         function getLegacyUserIDsFromOpenID($openid_identity) {
             //  Issue 17515512: workaround
             $result = array();
@@ -155,7 +180,9 @@
         }
 
         /**
-         * @brief openid authentication check
+         * openid authentication check
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberOpenIDValidate() {
             set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
@@ -256,14 +283,18 @@
         }
 
         /**
-         * @brief Request member join by openID
+         * Request member join by openID
+		 *
+		 * @return Object 
          **/
         function procMemberAddOpenIDToMember() {
             return $this->procMemberOpenIDLogin("procMemberValidateAddOpenIDToMember");
         }
 
         /**
-         * @brief Validate openID processing
+         * Validate openID processing
+		 *
+		 * @return Object 
          **/
         function procMemberValidateAddOpenIDToMember() {
             set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
@@ -315,7 +346,9 @@
         }
 
         /**
-         * @brief Disconnect OpenID
+         * Disconnect OpenID
+		 *
+		 * @return void 
          **/
         function procMemberDeleteOpenIDFromMember() {
             $logged_info = Context::get('logged_info');
@@ -347,7 +380,9 @@
 
 
         /**
-         * @brief Log-out
+         * Log-out
+		 *
+		 * @return Object
          **/
         function procMemberLogout() {
             // Call a trigger before log-out (before)
@@ -371,7 +406,9 @@
         }
 
         /**
-         * @brief Scrap
+         * Scrap document
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberScrapDocument() {
             // Check login information
@@ -404,7 +441,9 @@
         }
 
         /**
-         * @brief Delete a scrap
+         * Delete a scrap
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberDeleteScrap() {
             // Check login information
@@ -420,15 +459,18 @@
         }
 
         /**
-         * @brief Save posts
-		 * @Deplicated - instead Document Controller - procDocumentTempSave method use
+         * Save posts
+		 * @deprecated - instead Document Controller - procDocumentTempSave method use
+		 * @return Object
          **/
         function procMemberSaveDocument() {
-			return new Object(0, 'Deplicated method');
+			return new Object(0, 'Deprecated method');
         }
 
         /**
-         * @brief Delete the post
+         * Delete the post
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberDeleteSavedDocument() {
             // Check login information
@@ -443,7 +485,9 @@
         }
 
         /**
-         * @brief Check values when member joining
+         * Check values when member joining
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberCheckValue() {
             $name = Context::get('name');
@@ -478,7 +522,9 @@
         }
 
         /**
-         * @brief Join Membership
+         * Join Membership
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberInsert() {
             if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
@@ -497,7 +543,7 @@
 			$getVars = array();
 			if ($config->signupForm){
 				foreach($config->signupForm as $formInfo){
-					if($formInfo->isDefaultForm && $formInfo->isUse && ($formInfo->required || $formInfo->mustRequired)){
+					if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired)){
 						$getVars[] = $formInfo->name;
 					}
 				}
@@ -565,10 +611,18 @@
 
             }
             // 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);
+            if ($config->enable_confirm != 'Y')
+			{
+				if($config->identifier == 'email_address')
+				{
+					$this->doLogin($args->email_address);
+				}
+				else
+				{
+					$this->doLogin($args->user_id);
+				}
+			}
+
             // Results
             $this->add('member_srl', $args->member_srl);
             if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
@@ -581,15 +635,30 @@
             $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;
+			if($config->redirect_url)
+			{
+				$returnUrl = $config->redirect_url;
 			}
+			else
+			{
+				if(Context::get('success_return_url'))
+				{
+					$returnUrl = Context::get('success_return_url');
+				}
+				else if($_COOKIE['XE_REDIRECT_URL'])
+				{
+					$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
+					setcookie("XE_REDIRECT_URL", '', 1);
+				}
+			}
+
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Edit member profile
+         * Edit member profile
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberModifyInfo() {
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
@@ -672,15 +741,15 @@
             // 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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Change the user password
+         * Change the user password
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberModifyPassword() {
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
@@ -709,15 +778,15 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Membership withdrawal
+         * Membership withdrawal
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberLeave() {
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
@@ -744,15 +813,15 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief OpenID Withdrawal
+         * OpenID Withdrawal
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberOpenIDLeave() {
             // Return an error if in the non-login state
@@ -772,7 +841,9 @@
         }
 
         /**
-         * @brief Add a profile image
+         * Add a profile image
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberInsertProfileImage() {
             // Check if the file is successfully uploaded
@@ -792,13 +863,19 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
+        /**
+         * Insert a profile image
+		 * 
+		 * @param int $member_srl
+		 * @param object $target_file
+		 *
+		 * @return void
+         **/
         function insertProfileImage($member_srl, $target_file) {
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
@@ -823,7 +900,9 @@
         }
 
         /**
-         * @brief Add an image name
+         * Add an image name
+		 * 
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberInsertImageName() {
             // Check if the file is successfully uploaded
@@ -843,13 +922,19 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
+        /**
+         * Insert a image name
+		 * 
+		 * @param int $member_srl
+		 * @param object $target_file
+		 *
+		 * @return void
+         **/
         function insertImageName($member_srl, $target_file) {
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
@@ -871,7 +956,9 @@
         }
 
         /**
-         * @brief Delete profile image
+         * Delete profile image
+		 *
+		 * @return Object
          **/
         function procMemberDeleteProfileImage() {
             $member_srl = Context::get('member_srl');
@@ -894,7 +981,9 @@
         }
 
         /**
-         * @brief Delete Image name
+         * Delete Image name
+		 *
+		 * @return void
          **/
         function procMemberDeleteImageName() {
             $member_srl = Context::get('member_srl');
@@ -917,7 +1006,9 @@
         }
 
         /**
-         * @brief Add an image to mark
+         * Add an image to mark
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberInsertImageMark() {
             // Check if the file is successfully uploaded
@@ -937,13 +1028,19 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
+        /**
+         * Insert a image mark
+		 * 
+		 * @param int $member_srl
+		 * @param object $target_file
+		 *
+		 * @return void
+         **/
         function insertImageMark($member_srl, $target_file) {
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
@@ -962,11 +1059,12 @@
 
             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
+         * Delete Image Mark
+		 *
+		 * @return Object
          **/
         function procMemberDeleteImageMark() {
             $member_srl = Context::get('member_srl');
@@ -982,7 +1080,9 @@
         }
 
         /**
-         * @brief Find ID/Password
+         * Find ID/Password
+		 *
+		 * @return Object
          **/
         function procMemberFindAccount() {
             $email_address = Context::get('email_address');
@@ -1056,12 +1156,18 @@
             $oMail->send();
             // Return message
             $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-            return new Object(0,$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', '');
+				$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
+			}
+			return new Object(0,$msg);
         }
 
 
         /**
-         * @brief Generate a temp password by answering to the pre-determined question
+         * Generate a temp password by answering to the pre-determined question
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberFindAccountByQuestion() {
             $oMemberModel = &getModel('member');
@@ -1105,16 +1211,15 @@
 
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+			$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
         }
 
         /**
-         * @brief Execute finding ID/Passoword
+         * 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
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberAuthAccount() {
             // Test user_id and authkey
@@ -1148,8 +1253,10 @@
         }
 
         /**
-         * @brief Execute finding ID/Passoword
+         * 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
+		 *
+		 * @return Object
          **/
         function procMemberUpdateAuthMail() {
             $member_srl = Context::get('member_srl');
@@ -1209,7 +1316,9 @@
         }
 
         /**
-         * @brief Request to re-send the authentication mail
+         * Request to re-send the authentication mail
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberResendAuthMail() {
             // Get an email_address
@@ -1264,15 +1373,15 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
-         * @brief Join a virtual site
+         * Join a virtual site
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberSiteSignUp() {
             $site_module_info = Context::get('site_module_info');
@@ -1288,7 +1397,9 @@
         }
 
         /**
-         * @brief Leave the virtual site
+         * Leave the virtual site
+		 *
+		 * @return void|Object (void : success, Object : fail)
          **/
         function procMemberSiteLeave() {
             $site_module_info = Context::get('site_module_info');
@@ -1303,7 +1414,11 @@
         }
 
         /**
-         * @brief Save the member configurations
+         * Save the member configurations
+		 *
+		 * @param object $args
+		 *
+		 * @return void
          **/
         function setMemberConfig($args) {
             if(!$args->skin) $args->skin = "default";
@@ -1333,7 +1448,12 @@
         }
 
         /**
-         * @brief Save the signature as a file
+         * Save the signature as a file
+		 *
+		 * @param int $member_srl
+		 * @param string $signature
+		 *
+		 * @return void
          **/
         function putSignature($member_srl, $signature) {
             $signature = trim(removeHackTag($signature));
@@ -1351,7 +1471,11 @@
         }
 
         /**
-         * @brief Delete the signature file
+         * Delete the signature file
+		 *
+		 * @param string $member_srl
+		 *
+		 * @return void
          **/
         function delSignature($member_srl) {
             $filename = sprintf('files/member_extra_info/signature/%s%d.gif', getNumberingPath($member_srl), $member_srl);
@@ -1359,7 +1483,13 @@
         }
 
         /**
-         * @brief Add group_srl to member_srl
+         * Add group_srl to member_srl
+		 *
+		 * @param int $member_srl
+		 * @param int $group_srl
+		 * @param int $site_srl
+		 *
+		 * @return Object
          **/
         function addMemberToGroup($member_srl,$group_srl,$site_srl=0) {
             $args->member_srl = $member_srl;
@@ -1374,12 +1504,22 @@
             $output = executeQuery('member.addMemberToGroup',$args);
             $output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
 
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+            	$cache_key = 'object_member_groups:'.$member_srl.'_'.$site_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+			
             return $output;
         }
 
         /**
-         * @brief Change a group of certain members
+         * Change a group of certain members
          * Available only when a member has a single group
+		 *
+		 * @param object $args
+		 *
+		 * @return Object
          **/
         function replaceMemberGroup($args) {
             $obj->site_srl = $args->site_srl;
@@ -1404,12 +1544,21 @@
                 $output = executeQuery('member.addMemberToGroup', $obj);
                 if(!$output->toBool()) return $output;
             }
+
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+            	$cache_key = 'object_member_groups:'.$member_srl.'_'.$site_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+
             return new Object();
         }
 
 
         /**
-         * @brief Auto-login
+         * Auto-login
+		 *
+		 * @return void
          **/
         function doAutologin() {
             // Get a key value of auto log-in
@@ -1435,7 +1584,6 @@
 
             $do_auto_login = false;
 
-
             // Compare key values based on the information
             $key = md5($user_id . $password . $_SERVER['HTTP_USER_AGENT']);
 
@@ -1479,46 +1627,109 @@
         }
 
         /**
-         * @brief Log-in
+         * Log-in
+		 *
+		 * @param string $user_id
+		 * @param string $password
+		 * @param boolean $keep_signed
+		 *
+		 * @return Object
          **/
-        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');
+		function doLogin($user_id, $password = '', $keep_signed = false) {
+			$user_id = strtolower($user_id);
+			if(!$user_id) return new Object(-1, 'null_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');
+			// check IP access count.
+			$config = $oMemberModel->getMemberConfig();
+			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
+			$output = executeQuery('member.getLoginCountByIp', $args);
+			$count = (int)$output->data->count;
+			if($config->max_error_count < $count)
+			{
+				$last_update = strtotime($output->data->last_update);
+				$term = intval(time()-$last_update);
+				if($term < $config->max_error_count_time)
+				{
+					$term = $config->max_error_count_time - $term;
+					if($term < 60) $term = intval($term).Context::getLang('unit_sec');
+					elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
+					elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
+					else $term = intval($term/86400).Context::getLang('unit_day');
+					return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				}
+				else
+				{
+					$args->ipaddress = $_SERVER['REMOTE_ADDR'];
+					$output = executeQuery('member.deleteLoginCountByIp', $args);
+				}
+			}
 
-	    }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, $this->memberInfo->member_srl)) 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")));
+			// check identifier
+			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 $this->recordLoginError(-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 $this->recordLoginError(-1, 'invalid_user_id');
+			}
+			// Password Check
+			if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password, $this->memberInfo->member_srl)) return $this->recordMemberLoginError(-1, 'invalid_password',$this->memberInfo);
+			// 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);
+			// check if there is login fail records.
+			$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
+			if($output->data && $output->data->content)
+			{
+				$title = Context::getLang('login_fail_report');
+				$message = '<ul>';
+				$content = unserialize($output->data->content);
+				foreach($content as $val)
+				{
+					$message .= '<li>'.date('Y-m-d H:i:s P',$val[2]).'<br /> Access IP: '.$val[0].'<br /> Message: '.$val[1].'</li>';
+				}
+				$message .= '</ul>';
+				$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d H:i:s P'));
+
+				//send message
+				$oCommunicationController = &getController('communication');
+				$oCommunicationController->sendMessage($args->member_srl, $args->member_srl, $title, $content, true);
+				
+				if($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
+				{
+					$view_url = Context::getRequestUri();
+					$title = sprintf("%s @ %s",$title,$view_url);
+					$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>",$content, $view_url, $view_url, $this->memberInfo->nick_name, $this->memberInfo->email_id);
+					$oMail = new Mail();
+					$oMail->setTitle($title);
+					$oMail->setContent($content);
+					$oMail->setSender($this->memberInfo->email_id.'('.$this->memberInfo->nick_name.')', $this->memberInfo->email_address);
+					$oMail->setReceiptor($this->memberInfo->email_id.'('.$this->memberInfo->nick_name.')', $this->memberInfo->email_address);
+					$oMail->send();
+				}
+				$output = executeQuery('member.deleteLoginCountHistoryByMemberSrl', $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;
@@ -1529,7 +1740,7 @@
                 $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($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+31536000, '/');
             }
 			if($this->memberInfo->is_admin == 'Y') {
 				 $oMemberAdminModel = &getAdminModel('member');
@@ -1544,7 +1755,7 @@
         }
 
         /**
-         * @brief Update or create session information
+         * Update or create session information
          **/
         function setSessionInfo() {
             $oMemberModel = &getModel('member');
@@ -1584,10 +1795,6 @@
             }
             */
 
-			// XSS defence
-			$oSecurity = new Security($this->memberInfo);
-			$oSecurity->encodeHTML('user_name', 'nick_name', 'address.');
-
             // Information stored in the session login user
             Context::set('is_logged', true);
             Context::set('logged_info', $this->memberInfo);
@@ -1600,7 +1807,7 @@
         }
 
         /**
-         * @brief Logged method for providing a personalized menu
+         * Logged method for providing a personalized menu
          * Login information is used in the output widget, or personalized page
          **/
         function addMemberMenu($act, $str) {
@@ -1612,7 +1819,7 @@
         }
 
         /**
-         * @brief Nickname and click Log In to add a pop-up menu that appears when the method
+         * 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');
@@ -1628,7 +1835,7 @@
         }
 
         /**
-         * @brief Add users to the member table
+         * Add users to the member table
          **/
         function insertMember(&$args, $password_is_hashed = false) {
             // Call a trigger (before)
@@ -1797,7 +2004,7 @@
         }
 
         /**
-         * @brief Modify member information
+         * Modify member information
          **/
         function updateMember($args) {
             // Call a trigger (before)
@@ -1821,7 +2028,7 @@
                 unset($args->denied);
             }
 
-			// check mamber identifier form
+			// check member identifier form
 			$config = $oMemberModel->getMemberConfig();
 
 			$output = executeQuery('member.getMemberInfoByMemberSrl', $args);
@@ -1834,7 +2041,7 @@
 				$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');
+				if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_user_id');
 
 				$args->user_id = $orgMemberInfo->user_id;
 			}
@@ -1913,7 +2120,7 @@
         }
 
         /**
-         * @brief Modify member password
+         * Modify member password
          **/
         function updateMemberPassword($args) {
             $output = executeQuery('member.updateChangePasswordDate', $args);
@@ -1944,7 +2151,7 @@
         }
 
         /**
-         * @brief Delete User
+         * Delete User
          **/
         function deleteMember($member_srl) {
             // Call a trigger (before)
@@ -2012,7 +2219,7 @@
         }
 
         /**
-         * @brief Destroy all session information
+         * Destroy all session information
          **/
         function destroySessionInfo() {
             if(!$_SESSION || !is_array($_SESSION)) return;
@@ -2112,11 +2319,8 @@
             $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+			$this->setRedirectUrl($returnUrl);
 		}
 
 		function procMemberAuthEmailAddress(){
diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php
index 4950b0035..608b26d9a 100644
--- a/modules/member/member.mobile.php
+++ b/modules/member/member.mobile.php
@@ -31,9 +31,13 @@ class memberMobile extends member
             return;
         }
 
-        // Set a template file
+		// get member module configuration.
+		$oMemberModel = &getModel('member');
+		$config = $oMemberModel->getMemberConfig();
+		Context::set('identifier', $config->identifier);
 
-        Context::set('referer_url', $_SERVER['HTTP_REFERER']);
+        // Set a template file
+		Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER']));
         $this->setTemplateFile('login_form');
     }
 
@@ -95,6 +99,39 @@ class memberMobile extends member
         $this->setTemplateFile('member_info_mobile');
     }
 
+		/**
+		* @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');
+
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+			Context::set('identifier', $config->identifier);
+
+			$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 Edit member profile
      **/
@@ -149,6 +186,9 @@ class memberMobile extends member
         // A message appears if the user is not logged-in
         if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
+		$config = $oMemberModel->getMemberConfig();
+		Context::set('identifier', $config->identifier);
+
         $logged_info = Context::get('logged_info');
         $member_srl = $logged_info->member_srl;
 
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index adf105dcf..87adbfc50 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -51,6 +51,9 @@
 
 			if (!$config->identifier) $config->identifier = 'user_id';
 
+			if (!$config->max_error_count) $config->max_error_count = 10;
+			if (!$config->max_error_count_time) $config->max_error_count_time = 300;
+
             return $config;
         }
 
@@ -83,7 +86,8 @@
                 $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
             }
             // When click other's nickname
-            if($member_srl != $logged_info->member_srl) {
+            if($member_srl != $logged_info->member_srl && $logged_info->member_srl)
+			{
                 // Send an email
                 if($member_info->email_address) {
                     $url = 'mailto:'.htmlspecialchars($member_info->email_address);
@@ -197,31 +201,33 @@
         /**
          * @brief Return member information with member_srl
          **/
-        function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array()) {
-            if(!$member_srl) return;
+		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()){
+			if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
+			{
+				$oCacheHandler = &CacheHandler::getInstance('object');
+				if($oCacheHandler->isSupport())
+				{
 					$cache_key = 'object:'.$member_srl;
-					$output = $oCacheHandler->get($cache_key);
+					$GLOBALS['__member_info__'][$member_srl] = $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];
-        }
+				if(!$GLOBALS['__member_info__'][$member_srl])
+				{
+					$args->member_srl = $member_srl;
+					$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
+					if(!$output->data) return;
+					$this->arrangeMemberInfo($output->data, $site_srl);
+
+					//insert in cache
+					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				}
+			}
+
+			return $GLOBALS['__member_info__'][$member_srl];
+		}
 
         /**
          * @brief Add member info from extra_vars and other information
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 0a7f64436..370ec0ec7 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -65,6 +65,13 @@
             unset($member_info->email_id);
             unset($member_info->email_host);
 
+			if($logged_info->is_admin != 'Y' && ($member_info->member_srl != $logged_info->member_srl))
+			{
+				$start = strpos($member_info->email_address, '@')+1;
+				$replaceStr = str_repeat('*', (strlen($member_info->email_address) - $start));
+				$member_info->email_address = substr_replace($member_info->email_address, $replaceStr, $start);
+			}
+
             if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
 			
 			Context::set('memberInfo', get_object_vars($member_info));
@@ -82,11 +89,11 @@
         /**
          * @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"]))
+        function dispMemberSignUpForm() 
+		{
+			//setcookie for redirect url in case of going to member sign up
 			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');
@@ -108,6 +115,7 @@
 			$identifierForm->name = $member_config->identifier;
 			$identifierForm->value = $member_info->{$member_config->identifier};
 			Context::set('identifierForm', $identifierForm);
+
             // Set a template file
             $this->setTemplateFile('signup_form');
         }
@@ -247,8 +255,14 @@
                 $this->setTemplateFile('redirect.html');
                 return;
             }
+
+			// get member module configuration.
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+			Context::set('identifier', $config->identifier);
+
             // Set a template file
-            Context::set('referer_url', $_SERVER['HTTP_REFERER']);
+            Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER']));
 			Context::set('act', 'procMemberLogin');
             $this->setTemplateFile('login_form');
         }
diff --git a/modules/member/queries/deleteLoginCountByIp.xml b/modules/member/queries/deleteLoginCountByIp.xml
new file mode 100644
index 000000000..3e915621e
--- /dev/null
+++ b/modules/member/queries/deleteLoginCountByIp.xml
@@ -0,0 +1,8 @@
+<query id="deleteLoginCountByIp" action="delete">
+	<tables>
+		<table name="member_login_count" />
+	</tables>
+	<conditions>
+		<condition operation="equal" column="ipaddress" var="ipaddress" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/member/queries/deleteLoginCountHistoryByMemberSrl.xml b/modules/member/queries/deleteLoginCountHistoryByMemberSrl.xml
new file mode 100644
index 000000000..806dd4fa1
--- /dev/null
+++ b/modules/member/queries/deleteLoginCountHistoryByMemberSrl.xml
@@ -0,0 +1,8 @@
+<query id="deleteLoginCountHistoryByMemberSrl" action="delete">
+	<tables>
+		<table name="member_count_history" />
+	</tables>
+	<conditions>
+		<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/member/queries/getLoginCountByIp.xml b/modules/member/queries/getLoginCountByIp.xml
new file mode 100644
index 000000000..a305712b1
--- /dev/null
+++ b/modules/member/queries/getLoginCountByIp.xml
@@ -0,0 +1,11 @@
+<query id="getLoginCountByIp" action="select">
+    <tables>
+        <table name="member_login_count" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="ipaddress" var="ipaddress" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/member/queries/getLoginCountHistoryByMemberSrl.xml b/modules/member/queries/getLoginCountHistoryByMemberSrl.xml
new file mode 100644
index 000000000..fe28ffeb8
--- /dev/null
+++ b/modules/member/queries/getLoginCountHistoryByMemberSrl.xml
@@ -0,0 +1,11 @@
+<query id="getLoginCountHistoryByMemberSrl" action="select">
+	<tables>
+		<table name="member_count_history" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="member_srl" var="member_srl" />
+	</conditions>
+</query>
\ No newline at end of file
diff --git a/modules/member/queries/insertLoginCountByIp.xml b/modules/member/queries/insertLoginCountByIp.xml
new file mode 100644
index 000000000..2d3a4e0f7
--- /dev/null
+++ b/modules/member/queries/insertLoginCountByIp.xml
@@ -0,0 +1,11 @@
+<query id="insertLoginCountByIp" action="insert">
+	<tables>
+		<table name="member_login_count" />
+	</tables>
+	<columns>
+		<column name="ipaddress" var="ipaddress" notnull="notnull" />
+		<column name="count" var="count" notnull="notnull" />
+		<column name="regdate" default="curdate()" />
+		<column name="last_update" default="curdate()" />
+	</columns>
+</query>
diff --git a/modules/member/queries/insertLoginCountHistoryByMemberSrl.xml b/modules/member/queries/insertLoginCountHistoryByMemberSrl.xml
new file mode 100644
index 000000000..e0c9da1b2
--- /dev/null
+++ b/modules/member/queries/insertLoginCountHistoryByMemberSrl.xml
@@ -0,0 +1,10 @@
+<query id="insertLoginCountHistoryByMemberSrl" action="insert">
+	<tables>
+		<table name="member_count_history" />
+	</tables>
+	<columns>
+		<column name="member_srl" var="member_srl" notnull="notnull" />
+		<column name="content" var="content" notnull="notnull" />
+		<column name="last_update" default="curdate()" />
+	</columns>
+</query>
diff --git a/modules/member/queries/updateLoginCountByIp.xml b/modules/member/queries/updateLoginCountByIp.xml
new file mode 100644
index 000000000..b2dcd284a
--- /dev/null
+++ b/modules/member/queries/updateLoginCountByIp.xml
@@ -0,0 +1,12 @@
+<query id="updateLoginCountByIp" action="update">
+	<tables>
+		<table name="member_login_count" />
+	</tables>
+	<columns>
+		<column name="count" var="count" notnull="notnull" />
+		<column name="last_update" var="last_update" notnull="notnull" default="curdate()" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="ipaddress" var="ipaddress" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/member/queries/updateLoginCountHistoryByMemberSrl.xml b/modules/member/queries/updateLoginCountHistoryByMemberSrl.xml
new file mode 100644
index 000000000..d5f91926d
--- /dev/null
+++ b/modules/member/queries/updateLoginCountHistoryByMemberSrl.xml
@@ -0,0 +1,12 @@
+<query id="updateLoginCountHistoryByMemberSrl" action="update">
+	<tables>
+		<table name="member_count_history" />
+	</tables>
+	<columns>
+		<column name="content" var="content" notnull="notnull" />
+		<column name="last_update" var="last_update" notnull="notnull" default="curdate()" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/member/ruleset/findAccount.xml b/modules/member/ruleset/findAccount.xml
new file mode 100644
index 000000000..50f47c6a2
--- /dev/null
+++ b/modules/member/ruleset/findAccount.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>
\ No newline at end of file
diff --git a/modules/member/ruleset/insertConfig.xml b/modules/member/ruleset/insertConfig.xml
index 58503c1cf..72ad3e29e 100644
--- a/modules/member/ruleset/insertConfig.xml
+++ b/modules/member/ruleset/insertConfig.xml
@@ -5,5 +5,7 @@
     <fields>
 		<field name="webmaster_name" required="true" length="2:40" />
 		<field name="webmaster_email" length="1:200" rule="email" />
+		<field name="max_error_count" length="1:20" rule="number" />
+		<field name="max_error_count_time" length="1:20" rule="number" />
     </fields>
 </ruleset>
diff --git a/modules/member/schemas/member_count_history.xml b/modules/member/schemas/member_count_history.xml
new file mode 100644
index 000000000..fc7503cf2
--- /dev/null
+++ b/modules/member/schemas/member_count_history.xml
@@ -0,0 +1,5 @@
+<table name="member_count_history">
+	<column name="member_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+	<column name="content" type="bigtext" notnull="notnull" />
+	<column name="last_update" type="date" index="idx_last_update" />
+</table>
\ No newline at end of file
diff --git a/modules/member/schemas/member_login_count.xml b/modules/member/schemas/member_login_count.xml
new file mode 100644
index 000000000..3620d2913
--- /dev/null
+++ b/modules/member/schemas/member_login_count.xml
@@ -0,0 +1,6 @@
+<table name="member_login_count">
+	<column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
+	<column name="count" type="number" size="11" notnull="notnull" />
+	<column name="regdate" type="date" index="idx_regdate" />
+	<column name="last_update" type="date" index="idx_last_update" />
+</table>
\ No newline at end of file
diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html
index 3136bd80b..0b79c09f4 100644
--- a/modules/member/skins/default/find_member_account.html
+++ b/modules/member/skins/default/find_member_account.html
@@ -1,6 +1,6 @@
 <include target="./common_header.html" />
 <load target="filter/find_member_account.xml" />
-<h1 class="h1">{$lang->cmd_find_member_account}</h1>
+<h2 class="h2">{$lang->cmd_find_member_account_with_email}</h2>
 <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}" />
@@ -17,7 +17,7 @@
 	</div>
 </form>
 <!--@if(count($lang->find_account_question_items)>1)-->
-<h1 class="h1">{$lang->cmd_find_member_account}</h1>
+<h2 class="h2">{$lang->cmd_find_member_account_with_email_question}</h2>
 <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" />
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index bcc14d96e..426e4a3a1 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -5,11 +5,11 @@
 </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', '')}" />
+	<input type="hidden" name="success_return_url" value="{$referer_url}" />
 	<input type="hidden" name="act" value="procMemberLogin" />
 	<ul>
 		<li>
-			<p class="q"><label for="uid">{$lang->user_id}</label></p>
+			<p class="q"><label for="uid"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label></p>
 			<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
 		</li>
 		<li>
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 733c0922a..7fc21e042 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -45,8 +45,8 @@
 			<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>
+					<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>
diff --git a/modules/member/tpl/css/mlogin.css b/modules/member/tpl/css/mlogin.css
index cc8dc0692..0d2747989 100644
--- a/modules/member/tpl/css/mlogin.css
+++ b/modules/member/tpl/css/mlogin.css
@@ -31,6 +31,11 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .ff label+input[type=text],
 .ff label+input[type=password],
 .ff label+textarea{padding:5px}
+/* Help */
+.hp{background:#eee;border-top:1px solid #ddd;padding:12px 10px !important;margin:10px 0px !important;}
+.hp li{margin:0;display:inline;border-left:1px solid #ccc;padding:0 4px 0 8px;}
+.hp li:first-child{border:0;}
+.hp a{color:#333;text-decoration:none}
 /* Button Area */
 .bna{text-align:center;padding:0 10px;margin:10px 0}
 .bna:after{content:"";display:block;clear:both}
@@ -40,3 +45,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .bn[href]{height:26px}
 .bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
 .bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
+.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.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}
\ No newline at end of file
diff --git a/modules/member/tpl/css/msignup.css b/modules/member/tpl/css/msignup.css
index 0798f4df1..9555f31fb 100644
--- a/modules/member/tpl/css/msignup.css
+++ b/modules/member/tpl/css/msignup.css
@@ -51,3 +51,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .bn[href]{height:26px}
 .bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
 .bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
+.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.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}
\ No newline at end of file
diff --git a/modules/member/tpl/find_member_account.html b/modules/member/tpl/find_member_account.html
new file mode 100644
index 000000000..4268b11ca
--- /dev/null
+++ b/modules/member/tpl/find_member_account.html
@@ -0,0 +1,59 @@
+<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
+<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
+<load target="css/msignup.css" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<div class="hx h2"><h2>{$lang->cmd_find_member_account_with_email}</h2></div>
+<form action="./" ruleset="findAccount" method="post" class="ff">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberFindAccount" />
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispMemberFindAccount')}" />
+	<ul>
+		<li>
+			<label for="email_address1">{$lang->email_address}</label>
+			<input id="email_address1" type="text" name="email_address" />
+		</li>
+	</ul>
+	<div class="bna">
+		<input type="submit" class="bn dark" value="{$lang->cmd_send_mail}" />
+	</div>
+</form>
+
+<!--@if(count($lang->find_account_question_items)>1)-->
+<div class="hx h2"><h2>{$lang->cmd_find_member_account_with_email_question}</h2></div>
+<p style="margin:3px 10px;color:#666">{$lang->about_find_account_question}</p>
+<form action="./" method="post" class="ff" 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="act" value="procMemberFindAccountByQuestion" />
+	<input type="hidden" name="success_return_url" value="{getUrl('', 'act', 'dispMemberGetTempPassword')}" />
+    <input type="hidden" name="page" value="{$page}" />
+	<ul>
+		<li cond="$identifier == 'user_id'">
+			<label for="user_id2">{$lang->user_id}</label>
+			<input type="text" name="user_id" id="user_id2" />
+		</li>
+		<li>
+			<label for="email_address2">{$lang->email_address}</label>
+			<input type="text" name="email_address" id="email_address2" />
+		</li>
+		<li>
+			<label for="question">{$lang->find_account_question}</label>
+			<select id="question" name="find_account_question" style="width:290px;display:block;">
+			<!--@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>
+			<input type="text" name="find_account_answer" value="" />
+		</li>
+	</ul>
+	<div class="bna">
+		<input type="submit" class="bn dark" value="{$lang->cmd_get_temp_password}" />
+	</div>
+</form>
+<!--@end-->
diff --git a/modules/member/tpl/find_temp_password.html b/modules/member/tpl/find_temp_password.html
new file mode 100644
index 000000000..3ba9e7c94
--- /dev/null
+++ b/modules/member/tpl/find_temp_password.html
@@ -0,0 +1,7 @@
+<load target="css/msignup.css" usecdn="true" />
+<div>
+<div class="hx h2"><h2>{$lang->cmd_find_member_account}</h2></div>
+<p>{$lang->about_temp_password}</p>
+<p><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->: {$user_id}</p>
+<p>{$lang->temp_password}: {$temp_password}</p>
+</div>
\ No newline at end of file
diff --git a/modules/member/tpl/login_form.html b/modules/member/tpl/login_form.html
index 3b8b89d73..b949b637d 100644
--- a/modules/member/tpl/login_form.html
+++ b/modules/member/tpl/login_form.html
@@ -1,5 +1,9 @@
+<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
 <load target="css/mlogin.css" usecdn="true" />
 <div class="bd">
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
 <div class="hx h2">
 	<h2>{$lang->cmd_login}</h2>
 </div>
@@ -8,12 +12,33 @@
 		<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="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></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="message info" id="keep_msg" style="display:none;">
+			<p>{$lang->about_keep_warning}</p>
+		</div>
 		<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>
+		<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>
+		</ul>
 	</form>
 </div>
+
+<script type="text/javascript">
+jQuery(function($){
+	var keep_msg = $('#keep_msg');
+	keep_msg.hide();
+	$('#autoLogin').change(function(){
+		if($(this).is(':checked')){
+			keep_msg.slideDown(200);
+		} else {
+			keep_msg.slideUp(200);
+		}
+	});
+});
+</script>
\ No newline at end of file
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index a1663489d..95c947de3 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -51,6 +51,14 @@
 				<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="max_error_count">{$lang->login_trial_limit1}</label></p>
+				<p class="a"><input type="text" id="max_error_count" name="max_error_count" value="{$config->max_error_count}" style="width:30px" /><span class="desc">{$lang->about_login_trial_limit1}</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="max_error_count_time">{$lang->login_trial_limit2}</label></p>
+				<input type="text" id="max_error_count_time" name="max_error_count_time" value="{$config->max_error_count_time}" style="width:30px" /><span class="desc">{$lang->unit_sec}({$lang->about_login_trial_limit2})</span></p>
+			</li>
 			<li>
 				<p class="q"><label for="agreement">{$lang->agreement}</label></p>
 				<p class="a">{$editor}</p>
diff --git a/modules/member/tpl/modify_password.html b/modules/member/tpl/modify_password.html
index bdcb797a7..30244586c 100644
--- a/modules/member/tpl/modify_password.html
+++ b/modules/member/tpl/modify_password.html
@@ -1,30 +1,38 @@
-{@ 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) }
-
 <load target="css/msignup.css" usecdn="true" />
-<!--%import("../skins/default/filter/modify_password.xml")-->
+<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
+<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
 <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)">
-    <input type="hidden" name="mid" value="{$mid}" />
-    <input type="hidden" name="document_srl" value="{$document_srl}" />
-    <input type="hidden" name="page" value="{$page}" />
-	<fieldset class="sn">
-		<ul>
-			<li><label for="uid" class="db fb al">{$lang->user_id}</label><div id="uid">{htmlspecialchars($member_info->user_id)}</div></li>
-			<li><label for="cpw" class="db fb al">{$lang->current_password}</label><input type="password" name="current_password" id="cpw" class="itx" /></li>
-			<li><div><label for="npw1" class="db fb al">{$lang->password1}</label><input type="password" name="password1" id="npw1" class="itx" /></div>
-			<div><label for="npw1" class="db fb al">{$lang->password2}</label><input type="password" name="password2" id="npw2" class="itx" /></div>
-			<p style="color:#666">{$lang->about_password}</p></li>
-		</ul>
-	</fieldset>
-	<div class="cm">
-	   <input type="submit" value="{$lang->cmd_registration}" class="bn"/><a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
+    <h2 class="h2">{$member_title = $lang->cmd_modify_member_password}</h2>
+    <form id="fo_insert_member" action="./" method="post" class="ff" ruleset="modifyPassword">
+		<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}" />
+		<fieldset class="sn">
+			<ul>
+				<li>
+					<label for="uid" class="db fb al"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label>
+					<div id="uid"><!--@if($identifier == 'user_id')-->{htmlspecialchars($member_info->user_id)}<!--@else-->{htmlspecialchars($member_info->email_address)}<!--@end--></div>
+				</li>
+				<li>
+					<label for="cpw" class="db fb al">{$lang->current_password}</label>
+					<input type="password" name="current_password" id="cpw" class="itx" />
+				</li>
+				<li>
+					<div><label for="npw1" class="db fb al">{$lang->password1}</label><input type="password" name="password1" id="npw1" class="itx" /></div>
+					<div><label for="npw1" class="db fb al">{$lang->password2}</label><input type="password" name="password2" id="npw2" class="itx" /></div>
+					<p style="color:#666">{$lang->about_password}</p>
+				</li>
+			</ul>
+		</fieldset>
+		<div class="cm">
+		   <input type="submit" value="{$lang->cmd_registration}" class="bn dark" />
+		</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 70be0acb4..078259284 100644
--- a/modules/member/tpl/signup_form.html
+++ b/modules/member/tpl/signup_form.html
@@ -1,3 +1,5 @@
+<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
+<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
 <load target="css/msignup.css" usecdn="true" />
 <load target="js/signup_check.js" usecdn="true" />
 <!--%load_js_plugin("ui")-->
@@ -9,7 +11,7 @@
 	<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="ff" action="./" method="post" enctype="multipart/form-data">
+	<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)-->
@@ -33,23 +35,24 @@
 				<input type="password" name="password" id="password" value=""/>
 			</li>
 			<li> 
-				<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
+				<label for="password2">{$lang->password3} <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>
+			<block loop="$formTags=>$formTag" cond="$formTag->name != 'signature'">
+				<li> 
+					<label>{$formTag->title}</label>
+					{$formTag->inputTag}
+				</li>
+			</block>
 			<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>
+				<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>
+					<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>
 			</li>
 		</ul>
diff --git a/modules/menu/lang/lang.xml b/modules/menu/lang/lang.xml
index f26c9fb14..4b16b8850 100644
--- a/modules/menu/lang/lang.xml
+++ b/modules/menu/lang/lang.xml
@@ -24,6 +24,10 @@
 		<value xml:lang="tr"><![CDATA[Menü Yönetimi]]></value>
 		<value xml:lang="vi"><![CDATA[Quản lý Menu]]></value>
 	</item>
+	<item name="cmd_module_manangement">
+		<value xml:lang="ko"><![CDATA[모듈 설정]]></value>
+		<value xml:lang="en"><![CDATA[Module Setting]]></value>
+	</item>
 	<item name="menu_count">
 		<value xml:lang="ko"><![CDATA[메뉴 수]]></value>
 		<value xml:lang="en"><![CDATA[No. of menus]]></value>
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 696c04416..e0c015c77 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -1,25 +1,45 @@
 <?php
-    /**
-     * @class  menuAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin controller class of the menu module
-     **/
-
+	/**
+	 * menuAdminController class
+	 * admin controller class of the menu module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
     class menuAdminController extends menu {
+		/**
+		 * menu number
+		 * @var int
+		 */
 		var $menuSrl = null;
+		/**
+		 * item key list
+		 * @var array
+		 */
 		var $itemKeyList = array();
+		/**
+		 * map
+		 * @var array
+		 */
 		var $map = array();
+		/**
+		 * checked
+		 * @var array
+		 */
 		var $checked = array();
 
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Add a menu
-         **/
+		/**
+		 * Add a menu
+		 * @return void|object
+		 */
         function procMenuAdminInsert() {
             // List variables
             $site_module_info = Context::get('site_module_info');
@@ -34,16 +54,14 @@
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Change the menu title
-         **/
+		/**
+		 * Change the menu title
+		 * @return void|object
+		 */
         function procMenuAdminUpdate() {
             // List variables
             $args->title = Context::get('title');
@@ -53,17 +71,15 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Delete menu
-         * Delete menu_item and xml cache files
-         **/
+		/**
+		 * Delete menu process method
+		 * @return void|Object
+		 */
         function procMenuAdminDelete() {
             $menu_srl = Context::get('menu_srl');
 
@@ -76,13 +92,16 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap');
+			$this->setRedirectUrl($returnUrl);
         }
 
+		/**
+		 * Delete menu
+		 * Delete menu_item and xml cache files
+		 * @return Object
+		 */
         function deleteMenu($menu_srl) {
             // Delete cache files
             $cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
@@ -107,12 +126,14 @@
             return new Object(0,'success_deleted');
         }
 
-        /**
-         * @brief Add an item to the menu
-         **/
+		/**
+		 * Add an item to the menu
+		 * @return void
+		 */
         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";
@@ -148,12 +169,16 @@
             $args->group_srls = $source_args->group_srls;
 
 			// if cType is CREATE, create module
-			if($source_args->cType == 'CREATE')
+			if($source_args->cType == 'CREATE' || $source_args->cType == 'SELECT')
 			{
 				$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;
+				$cmArgs->menu_srl = $source_args->menu_srl;
+				if($source_args->layout_srl)
+				{
+					$cmArgs->layout_srl = $source_args->layout_srl;
+				}
 
 				switch ($source_args->module_type){
 					case 'WIDGET' :
@@ -167,9 +192,26 @@
 						unset($cmArgs->page_type);
 				}
 
-				$cmArgs->menu_srl = $source_args->menu_srl;
                 $oModuleController = &getController('module');
-				$output = $oModuleController->insertModule($cmArgs);
+				if($source_args->cType == 'CREATE')
+				{
+					$cmArgs->mid = $source_args->create_menu_url;
+					$output = $oModuleController->insertModule($cmArgs);
+				}
+				else
+				{
+					$oModuleModel = &getModel('module');
+					$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_args->module_srl);
+					if($cmArgs->layout_srl)
+					{
+						$module_info->layout_srl = $cmArgs->layout_srl;
+					}
+					$cmArgs = $module_info;
+
+					$cmArgs->mid = $source_args->select_menu_url;
+					$cmArgs->module_srl = $source_args->module_srl;
+					$output = $oModuleController->updateModule($cmArgs);
+				}
 				if(!$output->toBool()) return new Object(-1, $output->message);
 			}
 
@@ -226,16 +268,15 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap', 'menu_srl', $args->menu_srl);
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Delete menu item(menu of the menu)
-         **/
+		/**
+		 * Delete menu item(menu of the menu)
+		 * @return void|Object
+		 */
         function procMenuAdminDeleteItem() {
             // List variables
             $args = Context::gets('menu_srl','menu_item_srl');
@@ -271,16 +312,14 @@
             $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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Move menu items
-         **/
+		/**
+		 * Move menu items
+		 * @return void
+		 */
         function procMenuAdminMoveItem() {
             $menu_srl = Context::get('menu_srl');
             $mode = Context::get('mode');
@@ -292,9 +331,10 @@
             $this->moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode);
         }
 
-        /**
-         * @brief Arrange menu items
-         **/
+		/**
+		 * Arrange menu items
+		 * @return void|object
+		 */
 		function procMenuAdminArrangeItem()
 		{
 			$this->menuSrl = Context::get('menu_srl');
@@ -349,13 +389,18 @@
 			}
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+			$this->setRedirectUrl($returnUrl);
 		}
 
+		/**
+		 * Set parent number to child
+		 * @param int $parent_srl
+		 * @param int $child_index
+		 * @param object $target
+		 * @return void
+		 */
 		function _setParent($parent_srl, $child_index, &$target)
 		{
 			$child_srl = $this->itemKeyList[$child_index];
@@ -372,6 +417,11 @@
 			//return $target;
 		}
 
+		/**
+		 * move item with sub directory(recursive)
+		 * @param object $result
+		 * @return void
+		 */
 		function _recursiveMoveMenuItem($result)
 		{
 			$i = 0;
@@ -386,6 +436,15 @@
 			}
 		}
 
+		/**
+		 * move menu item
+		 * @param int $menu_srl
+		 * @param int $parent_srl
+		 * @param int $source_srl
+		 * @param int $target_srl
+		 * @param string $mode 'move' or 'insert'
+		 * @return void
+		 */
         function moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode){
             // Get the original menus
             $oMenuAdminModel = &getAdminModel('menu');
@@ -428,12 +487,13 @@
             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.
-         **/
+		/**
+		 * 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.
+		 * @return void
+		 */
         function procMenuAdminMakeXmlFile() {
             // Check input value
             $menu_srl = Context::get('menu_srl');
@@ -448,9 +508,10 @@
             $this->add('xml_file',$xml_file);
         }
 
-        /**
-         * @brief Register a menu image button
-         **/
+		/**
+		 * Register a menu image button
+		 * @return void
+		 */
         function procMenuAdminUploadButton() {
             $menu_srl = Context::get('menu_srl');
             $menu_item_srl = Context::get('menu_item_srl');
@@ -478,9 +539,10 @@
             $this->setTemplateFile('menu_file_uploaded');
         }
 
-        /**
-         * @brief Remove the menu image button
-         **/
+		/**
+		 * Remove the menu image button
+		 * @return void
+		 */
         function procMenuAdminDeleteButton() {
             $menu_srl = Context::get('menu_srl');
             $menu_item_srl = Context::get('menu_item_srl');
@@ -491,9 +553,10 @@
             $this->add('target', $target);
         }
 
-        /**
-         * @brief get all act list for admin menu
-         **/
+		/**
+		 * Get all act list for admin menu
+		 * @return void
+		 */
         function procMenuAdminAllActList() {
             $oModuleModel = &getModel('module');
             $installed_module_list = $oModuleModel->getModulesXmlInfo();
@@ -511,9 +574,10 @@
             $this->add('menuList', $menuList);
         }
 
-        /**
-         * @brief get all act list for admin menu
-         **/
+		/**
+		 * Get all act list for admin menu
+		 * @return void|object
+		 */
 		function procMenuAdminInsertItemForAdminMenu()
 		{
             $requestArgs = Context::getRequestVars();
@@ -571,16 +635,15 @@
             // 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;
-			}
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+			$this->setRedirectUrl($returnUrl);
 		}
 
-        /**
-         * @brief Generate XML file for menu and return its location
-         **/
+		/**
+		 * Generate XML file for menu and return its location
+		 * @param int $menu_srl
+		 * @return string
+		 */
         function makeXmlFile($menu_srl) {
             // Return if there is no information when creating the xml file
             if(!$menu_srl) return;
@@ -686,11 +749,16 @@
             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)
-         **/
+		/**
+		 * 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)
+		 * @param array $source_node
+		 * @param array $tree
+		 * @param int $site_srl
+		 * @param string $domain
+		 * @return string
+		 */
         function getXmlTree($source_node, $tree, $site_srl, $domain) {
             if(!$source_node) return;
 
@@ -765,12 +833,17 @@
             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()
-         **/
+		/**
+		 * 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()
+		 * @param array $source_node
+		 * @param array $tree
+		 * @param int $site_srl
+		 * @param string $domain
+		 * @return array
+		 */
         function getPhpCacheCode($source_node, $tree, $site_srl, $domain) {
             $output = array("buff"=>"", "url_list"=>array());
             if(!$source_node) return $output;
@@ -806,6 +879,12 @@
                 $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);
+				
+				foreach($child_output['url_list'] as $key =>$val)
+				{
+					$child_output['url_list'][$key] = addslashes($val);
+				}
+
                 $selected = '"'.implode('","',$child_output['url_list']).'"';
                 $child_buff = $child_output['buff'];
                 $expand = $node->expand;
@@ -867,10 +946,12 @@
             return $output;
         }
 
-        /**
-         * @brief Mapping menu and layout
-         * When setting menu on the layout, map the default layout
-         **/
+		/**
+		 * Mapping menu and layout
+		 * When setting menu on the layout, map the default layout
+		 * @param int $layout_srl
+		 * @param array $menu_srl_list
+		 */
         function updateMenuLayout($layout_srl, $menu_srl_list) {
             if(!count($menu_srl_list)) return;
             // Delete the value of menu_srls
@@ -887,9 +968,11 @@
             }
         }
 
-        /**
-         * @brief Register a menu image button
-         **/
+		/**
+		 * Register a menu image button
+		 * @param object $args
+		 * @return array
+		 */
         function _uploadButton($args)
 		{
 			// path setting
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 8790bcfd9..8a75991f8 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -1,22 +1,25 @@
 <?php
-    /**
-     * @class  menuAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief admin model class of the menu module
-     **/
-
+	/**
+	 * @class  menuAdminModel
+	 * @brief admin model class of the menu module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
     class menuAdminModel extends menu {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Get a list of all menus
-         **/
+		/**
+		 * Get a list of all menus
+		 * @param object $obj
+		 * @return object
+		 */
         function getMenuList($obj) {
             if(!$obj->site_srl) {
                 $site_module_info = Context::get('site_module_info');
@@ -35,9 +38,11 @@
             return $output;
         }
 
-        /**
-         * @brief Return all menus
-         **/
+		/**
+		 * Return all menus
+		 * @param int $site_srl
+		 * @return array
+		 */
         function getMenus($site_srl = null) {
             if(!isset($site_srl)) {
                 $site_module_info = Context::get('site_module_info');
@@ -52,10 +57,12 @@
             return $menus;
         }
 
-        /**
-         * @brief Get information of a new menu from the DB
-         * Return DB and XML information of the menu
-         **/
+		/**
+		 * Get information of a new menu from the DB
+		 * Return DB and XML information of the menu
+		 * @param int $menu_srl
+		 * @return object
+		 */
         function getMenu($menu_srl) {
             // Get information from the DB
             $args->menu_srl = $menu_srl;
@@ -68,10 +75,12 @@
             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
-         **/
+		/**
+		 * Get information of a new menu from the DB, search condition is menu title
+		 * Return DB and XML information of the menu
+		 * @param string $title
+		 * @return object
+		 */
         function getMenuByTitle($title) {
             // Get information from the DB
             $args->title = $title;
@@ -89,10 +98,12 @@
             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
-         **/
+		/**
+		 * Return item information of the menu_srl
+		 * group_srls uses a seperator with comma(,) and converts to an array by explode
+		 * @param int $menu_item_srl
+		 * @return object
+		 */
         function getMenuItemInfo($menu_item_srl) {
             // Get the menu information if menu_item_srl exists
             $args->menu_item_srl = $menu_item_srl;
@@ -112,9 +123,10 @@
             return $node;
         }
 
-        /**
-         * @brief Return item information of the menu_srl
-         **/
+		/**
+		 * Return item information of the menu_srl
+		 * @return void
+		 */
         function getMenuAdminItemInfo()
 		{
 			$menuItemSrl = Context::get('menu_item_srl');
@@ -134,6 +146,7 @@
 					if($moduleInfo->mid == $menuItem->url) {
 						$menuItem->moduleType = $moduleInfo->module;
 						$menuItem->pageType = $moduleInfo->page_type;
+						$menuItem->layoutSrl = $moduleInfo->layout_srl;
 					}
 				}
 			}
@@ -169,6 +182,13 @@
 			$this->add('menu_item', $menuItem);
         }
 
+		/**
+		 * Return menu item list by menu number
+		 * @param int $menu_srl
+		 * @param int $parent_srl
+		 * @param array $columnList
+		 * @return object
+		 */
 		function getMenuItems($menu_srl, $parent_srl = null, $columnList = array())
 		{
 			$args->menu_srl = $menu_srl;
@@ -178,9 +198,12 @@
 			return $output;
 		}
 
-        /**
-         * @brief Return menu name in each language to support multi-language
-         */
+		/**
+		 * Return menu name in each language to support multi-language
+		 * @param string $source_name
+		 * @param int $site_srl
+		 * @return array
+		 */
         function getMenuItemNames($source_name, $site_srl = null) {
             if(!$site_srl) {
                 $site_module_info = Context::get('site_module_info');
@@ -191,10 +214,11 @@
             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
-         **/
+		/**
+		 * 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
+		 * @return void
+		 */
         function getMenuAdminTplInfo() {
             // Get information on the menu for the parameter settings
             $menu_item_srl = Context::get('menu_item_srl');
@@ -234,10 +258,12 @@
             $this->add('tpl', str_replace("\n"," ",$tpl));
         }
 
-        /**
-         * @brief when menu add in sitemap, select module list
+		/**
+		 * @brief when menu add in sitemap, select module list
 		 * this menu showing with trigger
-         **/
+		 * @param int $site_srl
+		 * @return array
+		 */
 		function getModuleListInSitemap($site_srl = 0)
 		{
 			$oModuleModel = &getModel('module');
diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php
index a105e2030..4140ecb4d 100644
--- a/modules/menu/menu.admin.view.php
+++ b/modules/menu/menu.admin.view.php
@@ -1,23 +1,27 @@
 <?php
-    /**
-     * @class  menuAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief admin view class of the menu module
-     **/
-
+	/**
+	 * menuAdminView class
+	 * admin view class of the menu module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
     class menuAdminView extends menu {
 		var $tmpMenu = null;
 
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
             $this->setTemplatePath($this->module_path.'tpl');
         }
 
-        /**
-         * @brief The first page of the menu admin
-         **/
+		/**
+		 * The first page of the menu admin
+		 * @return void
+		 */
         function dispMenuAdminContent() {
             // Get a list of registered menus
             $obj->page = Context::get('page');
@@ -41,9 +45,10 @@
             $this->setTemplateFile('index');
         }
 
-        /**
-         * @brief Page to insert a menu
-         **/
+		/**
+		 * Page to insert a menu
+		 * @return void
+		 */
         function dispMenuAdminInsert() {
             // Set the menu with menu information
             $menu_srl = Context::get('menu_srl');
@@ -58,9 +63,10 @@
             $this->setTemplateFile('menu_insert');
         }
 
-        /**
-         * @brief Menu admin page
-         **/
+		/**
+		 * Menu admin page
+		 * @return void
+		 */
         function dispMenuAdminManagement() {
             // Get information of the menu
             $menu_srl = Context::get('menu_srl');
@@ -82,10 +88,11 @@
         }
 
 
-        /**
-         * @brief Display a mid list to be able to select on the menu
-		 * @perphaps this method not use
-         **/
+		/**
+		 * Display a mid list to be able to select on the menu
+		 * Perphaps this method not use
+		 * @return void
+		 */
         function dispMenuAdminMidList() {
             $oModuleModel = &getModel('module');
             // Get a list of module categories
@@ -113,12 +120,14 @@
             $this->setTemplateFile('mid_list');
         }
 
-        /**
-         * @brief Site map admin menu index page
-         **/
+		/**
+		 * Site map admin menu index page
+		 * @return void
+		 */
 		function dispMenuAdminSiteMap()
 		{
 			Context::loadLang(_XE_PATH_.'modules/document/lang/');
+			Context::loadLang(_XE_PATH_.'modules/layout/lang/');
             $site_srl = Context::get('site_srl');
 			$site_module_info = Context::get('site_module_info');
 
@@ -170,6 +179,10 @@
 			$resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl);
             Context::set('module_list', $resultModuleList);
 
+			$oLayoutModel = &getModel('layout');
+			$layoutList = $oLayoutModel->getLayoutList();
+            Context::set('layout_list', $layoutList);
+
 			// get default group list
 			$oMemberModel = &getModel('member');
 			$output = $oMemberModel->getGroups();
@@ -187,6 +200,11 @@
             $this->setTemplateFile('sitemap');
 		}
 
+		/**
+		 * Setting menu information(recursive)
+		 * @param array $menu
+		 * @return void
+		 */
 		function _menuInfoSetting(&$menu)
 		{
 			$oModuleModel = &getModel('module');
@@ -201,6 +219,8 @@
 					$menu['module_srl'] = $midInfo->module_srl;
 					$menu['setup_index_act'] = $moduleInfo->setup_index_act;
 				}
+				// setting layout srl for layout management
+				$menu['layout_srl'] = $midInfo->layout_srl;
 			}
 			if(count($menu['list']) > 0)
 			{
@@ -211,6 +231,11 @@
 			}
 		}
 
+		/**
+		 * Tree-shaped sorting
+		 * @param array $menuItems
+		 * @return array
+		 */
 		function _arrangeMenuItem($menuItems)
 		{
 			if(is_array($menuItems))
diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php
index fe2420284..01ba40c0b 100644
--- a/modules/menu/menu.class.php
+++ b/modules/menu/menu.class.php
@@ -1,15 +1,17 @@
 <?php
-    /**
-     * @class  menu
-     * @author NHN (developers@xpressengine.com)
-     * @brief high class of the menu module
-     **/
-
+	/**
+	 * menu class
+	 * high class of the menu module
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/menu
+	 * @version 0.1
+	 */
     class menu extends ModuleObject {
-
-        /**
-         * @brief Implement if additional tasks are necessary when installing
-         **/
+		/**
+		 * Implement if additional tasks are necessary when installing
+		 * @return Object
+		 */
         function moduleInstall() {
             // Create a directory to use menu
             FileHandler::makeDir('./files/cache/menu');
@@ -17,20 +19,24 @@
             return new Object();
         }
 
-        /**
-         * @brief a method to check if successfully installed
-         **/
+		/**
+		 * A method to check if successfully installed
+		 * @return bool
+		 */
         function checkUpdate() {
             $oDB = &DB::getInstance();
             // 2009. 02. 11 menu added to the table site_srl
             if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
 
+			// 2012. 02. 01 title index check
+			if(!$oDB->isIndexExists("menu", "idx_title")) return true;
             return false;
         }
 
-        /**
-         * @brief Execute update
-         **/
+		/**
+		 * Execute update
+		 * @return Object
+		 */
         function moduleUpdate() {
             $oDB = &DB::getInstance();
             // 2009. 02. 11 menu added to the table site_srl
@@ -38,12 +44,18 @@
                 $oDB->addColumn('menu','site_srl','number',11,0,true);
             }
 
+			// 2012. 02. 01 title index check
+			if(!$oDB->isIndexExists("menu","idx_title")) {
+                $oDB->addIndex('menu', 'idx_title', array('title'));
+            }
+
             return new Object(0, 'success_updated');
         }
 
-        /**
-         * @brief Re-generate the cache file
-         **/
+		/**
+		 * Re-generate the cache file
+		 * @return void
+		 */
         function recompileCache() {
             $oMenuAdminController = &getAdminController('menu');
             // Wanted list of all the blog module
diff --git a/modules/menu/menu.mobile.php b/modules/menu/menu.mobile.php
index faa52cba1..b2f9201cb 100644
--- a/modules/menu/menu.mobile.php
+++ b/modules/menu/menu.mobile.php
@@ -1,8 +1,23 @@
 <?php
-
+/**
+ * menuMobile class
+ * mobile class of the menu module
+ *
+ * @author NHN (developers@xpressengine.com)
+ * @package /modules/menu
+ * @version 0.1
+ */
 class menuMobile extends moduleObject {
+	/**
+	 * Result data list
+	 * @var array
+	 */
 	var $result = array();
 
+	/**
+	 * Menu depth arrange
+	 * @return void
+	 */
 	function straightenMenu($menu_item, $depth)
 	{
 		if(!$menu_item['link']) return;
@@ -17,6 +32,10 @@ class menuMobile extends moduleObject {
 		}
 	}
 
+	/**
+	 * Display menu
+	 * @return void
+	 */
 	function dispMenuMenu() {
 		$menu_srl = Context::get('menu_srl');
 		$oAdminModel =& getAdminModel('menu');
diff --git a/modules/menu/schemas/menu.xml b/modules/menu/schemas/menu.xml
index dcd74b847..aa6adeaf4 100644
--- a/modules/menu/schemas/menu.xml
+++ b/modules/menu/schemas/menu.xml
@@ -1,7 +1,7 @@
 <table name="menu">
     <column name="menu_srl" type="number" size="12" notnull="notnull" primary_key="primary_key" />
     <column name="site_srl" type="number" size="11" notnull="notnull" default="0" index="menu_site_srl" />
-    <column name="title" type="varchar" size="250" />
+    <column name="title" type="varchar" size="250" index="idx_title"/>
     <column name="listorder" type="number" size="11" default="0" index="idx_listorder" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js
index 570043122..6b7b60e27 100644
--- a/modules/menu/tpl/js/sitemap.js
+++ b/modules/menu/tpl/js/sitemap.js
@@ -29,6 +29,10 @@ $('form.siteMap')
 	$('a._edit').click(function(){
 		resetEditForm();
 		var itemKey = $(this).parent().prevAll('._item_key').val();
+		var itemLayoutKey = $(this).parent().prevAll('._item_layout_key').val();
+		var moduleSrl = $(this).parent().prevAll('input._module_srl_key').val();
+		editForm.find('input[name=module_srl]').val(moduleSrl);
+
 		menuSrl = $(this).parents().prevAll('input[name=menu_srl]').val();
 		menuForm = $('#menu_'+menuSrl);
 		var menuItemSrl = null;
@@ -69,6 +73,7 @@ $('form.siteMap')
 			inputCType[1].checked = true;
 			editForm.find('select[name=module_type]').val(moduleType);
 			editForm.find('select[name=select_menu_url]').val(menuItem.url);
+			editForm.find('select[name=layout_srl]').val(menuItem.layoutSrl);
 		}
 		typeCheck();
 		getModuleList();
@@ -122,8 +127,9 @@ $('form.siteMap')
 
 	var kindModuleLayer = $('#kindModule');
 	var createModuleLayer = $('#createModule');
-	var selectModuleLayer = $('#selectModule');
+	var selectModuleLayer = $('#sModule_id');
 	var insertUrlLayer = $('#insertUrl');
+	var selectLayoutLayer = $('#selectLayout');
 
 	function resetEditForm()
 	{
@@ -131,13 +137,14 @@ $('form.siteMap')
 		createModuleLayer.hide()
 		selectModuleLayer.hide()
 		insertUrlLayer.hide()
+		selectLayoutLayer.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('select[name=layout_srl]')[0].options[0].selected = true;
 		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);
@@ -149,18 +156,18 @@ $('form.siteMap')
 		var $this = $(this);
 
 		resetEditForm();
-		
+
 		editForm.find('.h2').text(xe.lang.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);
+	var checkedValue = null;
 
 	function typeCheck()
 	{
 		var inputTypeCheck = $('input._typeCheck');
-		var checkedValue = null;
 		for(var i=0; i<3; i++)
 		{
 			if(inputTypeCheck[i].checked)
@@ -173,16 +180,20 @@ $('form.siteMap')
 		if(checkedValue == 'CREATE')
 		{
 			kindModuleLayer.show();
-			createModuleLayer.show()
-			selectModuleLayer.hide()
-			insertUrlLayer.hide()
+			createModuleLayer.show();
+			selectModuleLayer.hide();
+			insertUrlLayer.hide();
+			selectLayoutLayer.show();
+			changeLayoutList();
 		}
 		else if(checkedValue == 'SELECT')
 		{
 			kindModuleLayer.show();
-			createModuleLayer.hide()
-			selectModuleLayer.show()
-			insertUrlLayer.hide()
+			createModuleLayer.hide();
+			selectModuleLayer.show();
+			insertUrlLayer.hide();
+			selectLayoutLayer.show();
+			changeLayoutList();
 		}
 		// type is URL
 		else
@@ -191,6 +202,7 @@ $('form.siteMap')
 			createModuleLayer.hide()
 			selectModuleLayer.hide()
 			insertUrlLayer.show()
+			selectLayoutLayer.hide()
 		}
 	}
 
@@ -203,6 +215,8 @@ $('form.siteMap')
 		exec_xml('module','procModuleAdminGetList',params, completeGetModuleList, response_tags);
 	}
 
+	var layoutList = new Array();
+	var moduleList = new Array();
 	function completeGetModuleList(ret_obj)
 	{
 		var module = $('#kModule').val();
@@ -212,19 +226,59 @@ $('form.siteMap')
 		if(ret_obj.module_list[module] != undefined)
 		{
 			var midList = ret_obj.module_list[module].list;
+			var midListByCategory = new Object();
 			for(x in midList)
 			{
+				if(!midList.hasOwnProperty(x)){
+					continue;
+				}
 				var midObject = midList[x];
-				htmlBuffer += '<option value="'+midObject.mid+'"';
-				if(menuUrl == midObject.mid) htmlBuffer += ' selected ';
-				htmlBuffer += '>'+midObject.mid+'('+midObject.browser_title+')</option>';
+
+				if(!midListByCategory[midObject.module_category_srl])
+				{
+					midListByCategory[midObject.module_category_srl] = new Array();
+				}
+				midListByCategory[midObject.module_category_srl].push(midObject);
+			}
+
+			for(x in midListByCategory)
+			{
+				var midGroup = midListByCategory[x];
+				htmlBuffer += '<optgroup label="'+x+'">'
+				for(y in midGroup)
+				{
+					var midObject = midGroup[y];
+					htmlBuffer += '<option value="'+midObject.mid+'"';
+					if(menuUrl == midObject.mid) htmlBuffer += ' selected ';
+					htmlBuffer += '>'+midObject.mid+'('+midObject.browser_title+')</option>';
+
+					layoutList[midObject.mid] = midObject.layout_srl;
+					moduleList[midObject.mid] = midObject.module_srl;
+				}
+				htmlBuffer += '</optgroup>'
 			}
 		}
 		else htmlBuffer = '';
 
-		selectModuleLayer.find('select').html(htmlBuffer);
+		selectModuleLayer.html(htmlBuffer);
+		changeLayoutList();
 	}
-	
+
+	$('#sModule_id').change(changeLayoutList).change();
+	function changeLayoutList()
+	{
+		if(checkedValue == 'SELECT')
+		{
+			var mid = $('#sModule_id').val();
+			$('#layoutSrl').val(layoutList[mid]);
+			editForm.find('input[name=module_srl]').val(moduleList[mid]);
+		}
+		else if(checkedValue == 'CREATE')
+		{
+			$('#layoutSrl').val('0');
+		}
+	}
+
 	function tgMapBtn(){
 		$('.x .siteMap>ul:visible').next('.btnArea').slideDown(50);
 		$('.x .siteMap>ul:hidden').next('.btnArea').slideUp(50);
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 140de9379..c4449928e 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -54,6 +54,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
 		<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}" />
+		<input type="hidden" name="module_srl" value="" />
 		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
 		<h2 class="h2"><span>{$lang->add_menu}</span><span>{$lang->edit_menu}</span></h2>
 			<ul>
@@ -109,6 +110,8 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
 							<option value="{$key}" cond="$key!='page'">{$value->title}</option>
 							</block>
 						</select>
+						<select style="width:290px" id="sModule_id" name="select_menu_url">
+						</select>
 					</p>
 				</li>
 				<li id="createModule">
@@ -117,19 +120,21 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
 						<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 id="selectLayout">
+					<p class="q"><label for="layout_list">{$lang->layout} <em>*</em></label></p>
+					<div class="a">
+						<select name="layout_srl" id="layoutSrl">
+							<option value="0">{$lang->notuse}</option>
+							<option loop="$layout_list => $key, $val" value="{$val->layout_srl}">{$val->title} ({$val->layout})</option>
+						</select>
+					</div>
+				</li>
 				<li>
 					<p class="q">{$lang->about_menu_open_window} <em>*</em></p>
 					<p class="a">
diff --git a/modules/menu/tpl/sitemap.item.html b/modules/menu/tpl/sitemap.item.html
index 6cb9303ad..edd1a44b0 100644
--- a/modules/menu/tpl/sitemap.item.html
+++ b/modules/menu/tpl/sitemap.item.html
@@ -1,11 +1,14 @@
 	<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" />
+		<input type="hidden" name="module_srl[]" value="{$item['module_srl']}" class="_module_srl_key" />
+		<input type="hidden" name="item_layout_key[]" value="{$item['node_srl']}" class="_item_layout_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> |
+			<block cond="$item['layout_srl']"><a href="{getUrl('act', 'dispLayoutAdminModify', 'layout_srl', $item['layout_srl'])}">{$lang->cmd_layout_management}</a> | </block>
+			<block cond="$item['setup_index_act']"><a href="{getUrl('', 'module', 'admin', 'act', $item['setup_index_act'], 'module_srl', $item['module_srl'])}">{$lang->cmd_module_manangement}</a> | </block>
+			<a href="#editMenu" class="modalAnchor _edit">{$lang->cmd_menu_management}</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)">
diff --git a/modules/message/m.skins/default/message.css b/modules/message/m.skins/default/message.css
index 36d85c0ad..e50fbd456 100644
--- a/modules/message/m.skins/default/message.css
+++ b/modules/message/m.skins/default/message.css
@@ -58,3 +58,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .bn[href]{height:26px}
 .bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
 .bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
+.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.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}
\ 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 9c0b8250f..33b085cb5 100644
--- a/modules/message/m.skins/default/system_message.html
+++ b/modules/message/m.skins/default/system_message.html
@@ -3,6 +3,9 @@
 	<div class="hx h2">
 		<h2>{$system_message}</h2>
 	</div>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
 	<div class="co">
 		<!--@if(!$is_logged)-->
         {@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
@@ -13,18 +16,21 @@
         {@ 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">
+			<form action="{getUrl('','act','procMemberLogin')}" 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="uid"><!--@if($member_config->identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></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" />						
+						<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
 						<label for="keepid">{$lang->keep_signed}</label>
 					</p>
+					<div class="message info" id="keep_msg" style="display:none;">
+						<p>{$lang->about_keep_warning}</p>
+					</div>
 					<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>
@@ -62,3 +68,17 @@
 		<!--@end-->
 	</div>
 </div>
+
+<script type="text/javascript">
+jQuery(function($){
+	var keep_msg = $('#keep_msg');
+	keep_msg.hide();
+	$('#keepid').change(function(){
+		if($(this).is(':checked')){
+			keep_msg.slideDown(200);
+		} else {
+			keep_msg.slideUp(200);
+		}
+	});
+});
+</script>
\ No newline at end of file
diff --git a/modules/message/message.admin.controller.php b/modules/message/message.admin.controller.php
index eed7ee199..3fb6bbe2c 100644
--- a/modules/message/message.admin.controller.php
+++ b/modules/message/message.admin.controller.php
@@ -25,11 +25,9 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig');
+			$this->setRedirectUrl($returnUrl);
         }
     }
 ?>
diff --git a/modules/message/message.view.php b/modules/message/message.view.php
index 015307c49..0c3f56036 100644
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@@ -17,8 +17,6 @@
          * @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);
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index 8cc430858..2f72c2463 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -1,4 +1,4 @@
-<load target="../../../../common/js/jquery.js" />
+<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
 <load target="./filter/openid_login.xml" />
 <load target="./message.css" />
 <load target="./message.js" />
@@ -8,7 +8,7 @@
 <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">
+		<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" 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()}" />
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 022368ba9..3d78ffb67 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -22,11 +22,9 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -37,11 +35,9 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -52,11 +48,9 @@
             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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -402,9 +396,12 @@
                 } 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);
+						if(!is_array($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;
@@ -492,11 +489,9 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -516,11 +511,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode');
+			$this->setRedirectUrl($returnUrl);
         }
 
 		function procModuleAdminGetList()
@@ -547,6 +540,7 @@
 
 			$args->sort_index1 = 'sites.domain';
 
+			$moduleCategorySrl = array();
             // Get a list of modules at the site
             $output = executeQueryArray('module.getSiteModules', $args);
             $mid_list = array();
@@ -560,18 +554,56 @@
 
                     $obj = null;
                     $obj->module_srl = $val->module_srl;
+                    $obj->layout_srl = $val->layout_srl;
                     $obj->browser_title = $val->browser_title;
                     $obj->mid = $val->mid;
+                    $obj->module_category_srl = $val->module_category_srl;
+					if($val->module_category_srl > 0)
+					{
+						array_push($moduleCategorySrl, $val->module_category_srl);
+					}
                     $mid_list[$module]->list[$val->mid] = $obj;
                 }
             }
 
+			// Get module category name
+			$moduleCategorySrl = array_unique($moduleCategorySrl);
+			$output = $oModuleModel->getModuleCategories($moduleCategorySrl);
+			$categoryNameList = array();
+			if(is_array($output))
+			{
+				foreach($output AS $key=>$value)
+				{
+					$categoryNameList[$value->module_category_srl] = $value->title;
+				}
+			}
+
             $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;
+
+					// change module category srl to title
+					if(is_array($val->list))
+					{
+						foreach($val->list AS $key=>$value)
+						{
+							if($value->module_category_srl > 0)
+							{
+								$categorySrl = $mid_list[$module]->list[$key]->module_category_srl;
+								if(isset($categoryNameList[$categorySrl]))
+								{
+									$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
+								}
+							}
+							else
+							{
+								$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
+							}
+						}
+					}
                 }
             }
 
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 832e1a21a..2253d057a 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -149,14 +149,6 @@
 				$origin_config->{$key} = $val;
 			}
 
-            //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);
-			}
-
 			return $this->insertModuleConfig($module, $origin_config, $site_srl);
 		}
 
@@ -703,8 +695,11 @@
         /**
          * @brief Change user-defined language
          **/
-        function replaceDefinedLangCode(&$output) {
-            $output = preg_replace_callback('!\$user\_lang\-\>([A-Za-z0-9\_]+)!s', array($this,'_replaceLangCode'), $output);
+        function replaceDefinedLangCode(&$output, $isReplaceLangCode = true) {
+			if($isReplaceLangCode)
+			{
+            	$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+			}
         }
         function _replaceLangCode($matches) {
             static $lang = null;
@@ -788,7 +783,7 @@
 			if (!$ajax)
 			{
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
-				header('location:'.$returnUrl);
+				$this->setRedirectUrl($returnUrl);
 				return;
 			}
 			else
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index f3b255626..306f955ea 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -70,13 +70,15 @@
         function getDefaultMid() {
             $default_url = preg_replace('/\/$/','',Context::getDefaultUrl());
             $request_url = preg_replace('/\/$/','',Context::getRequestUri());
+			$default_url_parse = parse_url($default_url);
+			$request_url_parse = parse_url($request_url);
             $vid = Context::get('vid');
             $mid = Context::get('mid');
 
             // Set up
             // test.xe.com
             $domain = '';
-            if($default_url && $default_url != $request_url) {
+            if($default_url && $default_url_parse['host'] != $request_url_parse['host']) {
                 $url_info = parse_url($request_url);
                 $hostname = $url_info['host'];
                 $path = preg_replace('/\/$/','',$url_info['path']);
@@ -630,8 +632,10 @@
 								$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);
+							if(is_array($info->menu->{$action->attrs->menu_name}->acts)) {
+								@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++;
@@ -1015,9 +1019,10 @@
         /**
          * @brief Get a list of module category
          **/
-        function getModuleCategories() {
+        function getModuleCategories($moduleCategorySrl = array()) {
+			$args->moduleCategorySrl = $moduleCategorySrl;
             // Get data from the DB
-            $output = executeQuery('module.getModuleCategories');
+            $output = executeQuery('module.getModuleCategories', $args);
             if(!$output->toBool()) return $output;
             $list = $output->data;
             if(!$list) return;
diff --git a/modules/module/queries/getModuleCategories.xml b/modules/module/queries/getModuleCategories.xml
index 7e2f9208d..9ccf707f8 100644
--- a/modules/module/queries/getModuleCategories.xml
+++ b/modules/module/queries/getModuleCategories.xml
@@ -2,6 +2,9 @@
     <tables>
         <table name="module_categories" />
     </tables>
+    <conditions>
+        <condition operation="in" column="module_category_srl" var="moduleCategorySrl" />
+    </conditions>
     <navigation>
         <index var="sort_index" default="title" order="asc" />
     </navigation>
diff --git a/modules/module/queries/getSiteModules.xml b/modules/module/queries/getSiteModules.xml
index 6d9988eea..4d6e77026 100644
--- a/modules/module/queries/getSiteModules.xml
+++ b/modules/module/queries/getSiteModules.xml
@@ -7,6 +7,8 @@
         <column name="sites.domain" />
         <column name="modules.site_srl" />
         <column name="modules.module" />
+        <column name="modules.module_category_srl" />
+        <column name="modules.layout_srl" />
         <column name="modules.mid" />
         <column name="modules.browser_title" />
         <column name="modules.module_srl" />
diff --git a/modules/module/tpl/include.manage_selected.html b/modules/module/tpl/include.manage_selected.html
index a6c7389f5..041990027 100644
--- a/modules/module/tpl/include.manage_selected.html
+++ b/modules/module/tpl/include.manage_selected.html
@@ -30,4 +30,4 @@
 		<include target="include.module_grant_setup.html" />
 		<include target="include.multilang.textarea.html" />
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/module/tpl/include.module_grant_setup.html b/modules/module/tpl/include.module_grant_setup.html
index c96c9a582..2379ee747 100644
--- a/modules/module/tpl/include.module_grant_setup.html
+++ b/modules/module/tpl/include.module_grant_setup.html
@@ -32,7 +32,7 @@
 						</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}" />
+							<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>
diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html
index a2b35d2ff..98f741159 100644
--- a/modules/module/tpl/module_langcode.html
+++ b/modules/module/tpl/module_langcode.html
@@ -89,7 +89,8 @@
 	<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}" />
+	<input type="hidden" name="target" value="{$target}" />
+	<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 fcd48a0ac..a98fbbe64 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -43,12 +43,10 @@
 				<td class="nowr">
 					<!--@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-->
+							<a href="{$author->homepage}" onclick="window.open(this.href);return false;" target="_blank">{$author->name}</a>
+						<!--@else-->
+							{$author->name}
+						<!--@endif-->
 					<!--@endforeach-->
 				</td>
 				<td class="nowr">{$val->path}</td>
diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php
index 8f7e6e7ad..f664767a9 100644
--- a/modules/page/page.admin.controller.php
+++ b/modules/page/page.admin.controller.php
@@ -80,11 +80,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -178,11 +176,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php
index e35d79e7b..6a87be27a 100644
--- a/modules/page/page.admin.view.php
+++ b/modules/page/page.admin.view.php
@@ -254,7 +254,8 @@
             Context::set('content', $content);
             // Convert them to teach the widget
             $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($content, true);
+            $content = $oWidgetController->transWidgetCode($content, true, false);
+			$content = str_replace('$', '&#36;', $content);
             Context::set('page_content', $content);
             // Set widget list
             $oWidgetModel = &getModel('widget');
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html
index 21240e1b3..fab4f42e6 100644
--- a/modules/page/tpl/page_info.html
+++ b/modules/page/tpl/page_info.html
@@ -129,7 +129,7 @@
 	<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>
+		<span class="btn"><a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" target="_blank">{$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>
diff --git a/modules/point/lang/lang.xml b/modules/point/lang/lang.xml
index c19eae6ac..ee317ca3b 100644
--- a/modules/point/lang/lang.xml
+++ b/modules/point/lang/lang.xml
@@ -540,4 +540,124 @@
 		<value xml:lang="en"><![CDATA[Give the point]]></value>
 		<value xml:lang="zh-TW"><![CDATA[給予點數]]></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="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="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="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>
 </lang>
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index 45276dc30..5ba78bedc 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -82,11 +82,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminConfig');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -145,11 +143,9 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -183,12 +179,9 @@
 
             $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;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 6f84db511..c79fbb22f 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -4,6 +4,38 @@
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<!-- 검색 -->
+<form action="./" method="get" class="adminSearch" no-error-return-url="true">
+<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>
 <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>
@@ -61,7 +93,7 @@
 </div>
 
 <!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
+<form action="./" method="get" class="adminSearch" no-error-return-url="true">
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="{$act}" />
 
diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php
index 7cc7bfc3b..b992f4983 100644
--- a/modules/poll/poll.admin.controller.php
+++ b/modules/poll/poll.admin.controller.php
@@ -24,11 +24,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
@@ -53,11 +51,9 @@
             }
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
+			$this->setRedirectUrl($returnUrl);
         }
 
 		function procPollAdminAddCart()
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index cc7288e0a..792b81b7d 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -168,11 +168,9 @@
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
+			$this->setRedirectUrl($returnUrl);
         }
 
         /**
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index 0d8ffe5e8..9ebf53297 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -1,23 +1,24 @@
 <?php
     /**
-     * @class  rssAdminController
+     * The admin controller class of the rss module
+	 *
      * @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
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief All RSS feeds configurations
+         * All RSS feeds configurations
+		 *
+		 * @return void
          **/
         function procRssAdminInsertConfig() {
             $oModuleModel = &getModel('module');
@@ -74,16 +75,16 @@
             //$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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex');
+			$this->setRedirectUrl($returnUrl);
         }
 
 
         /**
-         * @brief RSS Module configurations
+         * RSS Module configurations
+		 *
+		 * @return void
          **/
         function procRssAdminInsertModuleConfig() {
             // Get the object
@@ -112,16 +113,16 @@
 
             //$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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
 
         /**
-         * @brief All Feeds with or without change
+         * All Feeds with or without change
+		 *
+		 * @return Object
          **/
         function procRssAdminToggleActivate() {
             $oRssModel = &getModel('rss');
@@ -144,7 +145,10 @@
 
 
         /**
-         * @brief A funciton to configure all Feeds of the RSS module
+         * A funciton to configure all Feeds of the RSS module
+		 *
+		 * @param Object $config RSS all feeds config list
+		 * @return Object
          **/
         function setFeedConfig($config) {
             $oModuleController = &getController('module');
@@ -154,7 +158,14 @@
 
 
         /**
-         * @brief A function t configure the RSS module
+         * A function t configure the RSS module
+		 *
+		 * @param integer $module_srl Module_srl
+		 * @param string $open_rss Choose open rss type. Y : Open all, H : Open summary, N : Not open
+		 * @param string $open_total_feed N : use open total feed, T_N : not use open total feed
+		 * @param string $feed_description Default value is 'N'
+		 * @param string $feed_copyright Default value is 'N'
+		 * @return Object
          **/
         function setRssModuleConfig($module_srl, $open_rss, $open_total_feed = 'N', $feed_description = 'N', $feed_copyright = 'N') {
             $oModuleController = &getController('module');
diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php
index e2a8b417c..37f73ed9b 100644
--- a/modules/rss/rss.admin.view.php
+++ b/modules/rss/rss.admin.view.php
@@ -1,13 +1,15 @@
 <?php
     /**
-     * @class  rssAdminView
-     * @author misol (misol@korea.ac.kr)
-     * @brief The admin view class of the rss module
+     * The admin view class of the rss module
+	 *
+     * @author NHN (developers@xpressengine.com)
      **/
 
 	class rssAdminView extends rss {
 		/**
-		 * @brief Initialization
+		 * Initialization
+		 *
+		 * @return void
 		 **/
 		function init() {
 			//Set template path
@@ -16,7 +18,9 @@
 
 
 		/**
-		 * @brief In case an administrator page has been initialized
+		 * In case an administrator page has been initialized
+		 *
+		 * @return Object
 		 **/
 		function dispRssAdminIndex() {
 			$oModuleModel = &getModel('module');
@@ -53,4 +57,4 @@
 			$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 5b099e6a3..bf6d7f0c4 100644
--- a/modules/rss/rss.class.php
+++ b/modules/rss/rss.class.php
@@ -1,14 +1,16 @@
 <?php
     /**
-     * @class  rss
+     * High class of rss module
+	 *
      * @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
+         * Additional tasks required to accomplish during the installation
+		 *
+		 * @return Object
          **/
         function moduleInstall() {
             // Register in action forward
@@ -25,7 +27,8 @@
         }
 
         /**
-         * @brief A method to check if the installation has been successful
+         * A method to check if the installation has been successful
+		 * @return bool
          **/
         function checkUpdate() {
             $oModuleModel = &getModel('module');
@@ -42,7 +45,9 @@
         }
 
         /**
-         * @brief Execute update
+         * Execute update
+		 *
+		 * @return Object
          **/
         function moduleUpdate() {
             $oModuleModel = &getModel('module');
@@ -63,7 +68,9 @@
         }
 
         /**
-         * @brief Re-generate the cache file
+         * Re-generate the cache file
+		 *
+		 * @return void
          **/
         function recompileCache() {
         }
diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php
index 260a0e1b9..c52db667c 100644
--- a/modules/rss/rss.controller.php
+++ b/modules/rss/rss.controller.php
@@ -1,23 +1,24 @@
 <?php
     /**
-     * @class  rssController
+     * The controller class of rss module
+	 *
      * @author NHN (developers@xpressengine.com)
-     * @brief rss module of the controller class
-     *
-     * Feed the document output
-     *
      **/
 
     class rssController extends rss {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Check whether to use RSS rss url by adding
+         * Check whether to use RSS rss url by adding
+		 *
+		 * @return Object
          **/
         function triggerRssUrlInsert() {
             $oModuleModel = &getModel('module');
@@ -25,6 +26,10 @@
             $current_module_srl = Context::get('module_srl');
             $site_module_info = Context::get('site_module_info');
 
+			if(is_array($current_module_srl))
+			{
+				unset($current_module_srl);
+			}
             if(!$current_module_srl) {
                 $current_module_info = Context::get('current_module_info');
                 $current_module_srl = $current_module_info->module_srl;
diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php
index f282eb178..b217173a6 100644
--- a/modules/rss/rss.model.php
+++ b/modules/rss/rss.model.php
@@ -1,16 +1,18 @@
 <?php
     /**
-     * @class  rssModel
+     * The model class of the rss module
+	 *
      * @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.
+         * Create the Feed url.
+		 *
+		 * @param string $vid Vid
+		 * @param string $mid mid
+		 * @param string $format Feed format. ef)xe, atom, rss1.0
+		 * @return string
          **/
         function getModuleFeedUrl($vid = null, $mid, $format) {
             if(Context::isAllowRewrite()) {
@@ -30,7 +32,10 @@
 
 
         /**
-         * @brief Return the RSS configurations of the specific modules
+         * Return the RSS configurations of the specific modules
+		 *
+		 * @param integer $module_srl Module_srl
+		 * @return Object
          **/
         function getRssModuleConfig($module_srl) {
             // Get the configurations of the rss module
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index eac03b4f3..02274cf95 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -1,24 +1,27 @@
 <?php
     /**
-     * @class  rssView
-     * @author NHN (developers@xpressengine.com)
-     * @brief The view class of the rss module
-     *
-     * Feed the document output
-     *
+     * The view class of the rss module
+	 *
+	 * @author NHN (developers@xpressengine.com)
      **/
 
     class rssView extends rss {
 
         /**
-         * @brief Initialization
+         * Initialization
+		 *
+		 * @return void
          **/
         function init() {
         }
 
         /**
-         * @brief Feed output
+         * Feed output.
          * When trying to directly print out the RSS, the results variable can be directly specified through $oRssView->rss($document_list)
+		 *
+		 * @param Object $document_list Document list 
+		 * @param string $rss_title Rss title
+		 * @param string $add_description Add description
          **/
         function rss($document_list = null, $rss_title = null, $add_description = null) {
             $oDocumentModel = &getModel('document');
@@ -181,7 +184,9 @@
             $this->setTemplateFile('display');
         }
         /**
-         * @brief ATOM output
+         * ATOM output
+		 *
+		 * @return Object
          **/
         function atom() {
             Context::set('format', 'atom');
@@ -189,7 +194,9 @@
         }
 
         /**
-         * @brief Error output
+         * Error output
+		 *
+		 * @return Object
          **/
         function dispError() {
             // Prepare the output message
@@ -197,8 +204,11 @@
         }
 
         /**
-         * @brief Additional configurations for a service module
+         * Additional configurations for a service module
          * Receive the form for the form used by rss
+		 *
+		 * @param string $obj Will be inserted content in template
+		 * @return Object
          **/
         function triggerDispRssAdditionSetup(&$obj) {
             $current_module_srl = Context::get('module_srl');
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index 8b0071b7c..a20bb6b61 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -27,12 +27,8 @@
        	    $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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+			$this->setRedirectUrl($returnUrl);
 		}
 
 		function procSpamfilterAdminInsertDeniedIP(){
@@ -43,13 +39,9 @@
             	$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;
 
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+			$this->setRedirectUrl($returnUrl);
 		}
 		function procSpamfilterAdminInsertDeniedWord(){
 			//스팸 키워드 추가
@@ -58,12 +50,9 @@
 				$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;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+			$this->setRedirectUrl($returnUrl);
 		}
         
         /**
@@ -72,12 +61,9 @@
         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;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
         
         /**
@@ -88,12 +74,8 @@
             //$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;
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
         /**
diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php
index eb42cde01..684c068e7 100644
--- a/modules/trackback/trackback.admin.controller.php
+++ b/modules/trackback/trackback.admin.controller.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  trackbackAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module admin controller class
-     **/
-
+	/**
+	 * trackbackAdminController class
+	 * trackback module admin controller class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackAdminController extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Trackbacks delete selected in admin page
-         **/
+		/**
+		 * Trackbacks delete selected in admin page
+		 * @return void|Object
+		 */
         function procTrackbackAdminDeleteChecked() {
             // An error appears if no document is selected
             $cart = Context::get('cart');
@@ -35,33 +38,30 @@
             }
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Save Settings
-         **/
+		/**
+		 * Save Settings
+		 * @return object
+		 */
         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;
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
+			return $this->setRedirectUrl($returnUrl, $output);
         }
 
-        /**
-         * @brief Trackback Module Settings
-         **/
+		/**
+		 * Trackback Module Settings
+		 * @return void|Object
+		 */
         function procTrackbackAdminInsertModuleConfig() {
             // Get variables
             $module_srl = Context::get('target_module_srl');
@@ -81,16 +81,15 @@
 
             $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;
-			}
+
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
         }
 
-        /**
-         * @brief Trackback Module Settings
-         **/
+		/**
+		 * Trackback Module Settings
+		 * @return void
+		 */
         function procTrackbackAdminAddCart()
 		{
 			$trackback_srl = (int)Context::get('trackback_srl');
@@ -111,9 +110,12 @@
 			}
         }
 
-        /**
-         * @brief Trackback modular set function
-         **/
+		/**
+		 * Trackback modular set function
+		 * @param int $module_srl
+		 * @param string $enable_trackback 'Y' or 'N'
+		 * @return Object
+		 */
         function setTrackbackModuleConfig($module_srl, $enable_trackback) {
             $config->enable_trackback = $enable_trackback;
 
@@ -122,9 +124,11 @@
             return new Object();
         }
 
-        /**
-         * @brief Modules belonging to remove all trackbacks
-         **/
+		/**
+		 * Modules belonging to remove all trackbacks
+		 * @param int $module_srl
+		 * @return object
+		 */
         function deleteModuleTrackbacks($module_srl) {
             // Delete
             $args->module_srl = $module_srl;
diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php
index f2e0305e6..d4b119f81 100644
--- a/modules/trackback/trackback.admin.model.php
+++ b/modules/trackback/trackback.admin.model.php
@@ -1,21 +1,25 @@
 <?php
-    /**
-     * @class  trackbackAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module admin model class
-     **/
-
+	/**
+	 * @class  trackbackAdminModel
+	 * @brief trackback module admin model class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackAdminModel extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Trackbacks Bringing all the time in reverse order (administrative)
-         **/
+		/**
+		 * Trackbacks Bringing all the time in reverse order (administrative)
+		 * @param object $obj
+		 * @return object
+		 */
         function getTotalTrackbackList($obj) {
             // Search options
             $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
@@ -63,6 +67,12 @@
             return $output;
         }
 
+		/**
+		 * Return trackback count by date
+		 * @param strgin $date
+		 * @param array $moduleSrlList
+		 * @return int
+		 */
 		function getTrackbackCountByDate($date = '', $moduleSrlList = array())
 		{
 			if($date) $args->regDate = date('Ymd', strtotime($date));
diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php
index 276d74a9e..671361d1b 100644
--- a/modules/trackback/trackback.admin.view.php
+++ b/modules/trackback/trackback.admin.view.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  trackbackAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module admin view class
-     **/
-
+	/**
+	 * trackbackAdminView class
+	 * trackback module admin view class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackAdminView extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Display output list (administrative)
-         **/
+		/**
+		 * Display output list (administrative)
+		 * @return void
+		 */
         function dispTrackbackAdminList() {
             // Wanted set
             $oModuleModel = &getModel('module');
diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php
index d53b5513a..ad851004a 100644
--- a/modules/trackback/trackback.class.php
+++ b/modules/trackback/trackback.class.php
@@ -1,15 +1,17 @@
 <?php
-    /**
-     * @class  trackback
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module's high class
-     **/
-
+	/**
+	 * trackback class
+	 * trackback module's high class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackback extends ModuleObject {
-
-        /**
-         * @brief Implement if additional tasks are necessary when installing
-         **/
+		/**
+		 * Implement if additional tasks are necessary when installing
+		 * @return Object
+		 */
         function moduleInstall() {
             // Register action forward (to use in administrator mode)
             $oModuleController = &getController('module');
@@ -26,9 +28,10 @@
             return new Object();
         }
 
-        /**
-         * @brief a method to check if successfully installed
-         **/
+		/**
+		 * A method to check if successfully installed
+		 * @return bool
+		 */
         function checkUpdate() {
             $oModuleModel = &getModel('module');
             // 2007. 10. 17 posts deleted, even when the comments will be deleted trigger property
@@ -43,9 +46,10 @@
             return false;
         }
 
-        /**
-         * @brief Execute update
-         **/
+		/**
+		 * Execute update
+		 * @return Object
+		 */
         function moduleUpdate() {
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
@@ -65,9 +69,10 @@
             return new Object(0, 'success_updated');
         }
 
-        /**
-         * @brief Re-generate the cache file
-         **/
+		/**
+		 * Re-generate the cache file
+		 * @return void
+		 */
         function recompileCache() {
         }
 
diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php
index 795206847..575b092fb 100644
--- a/modules/trackback/trackback.controller.php
+++ b/modules/trackback/trackback.controller.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  trackbackController
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module's Controller class
-     **/
-
+	/**
+	 * trackbackController class
+	 * trackback module's Controller class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackController extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Trackbacks sent
-         **/
+		/**
+		 * Trackbacks sent
+		 * @return object
+		 */
         function procTrackbackSend() {
             // Yeokingeul to post numbers and shipping addresses Wanted
             $document_srl = Context::get('target_srl');
@@ -49,9 +52,10 @@
 			return $output;
         }
 
-        /**
-         * @brief Trackback List
-         **/
+		/**
+		 * Trackback List
+		 * @return void
+		 */
         function procTrackbackGetList()
 		{
 			if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
@@ -82,9 +86,10 @@
 			$this->add('trackback_list', $trackbackList);
         }
 
-        /**
-         * @brief Trackbacks send documents from the popup menu add a menu
-         **/
+		/**
+		 * Trackbacks send documents from the popup menu add a menu
+		 * @parma array $menu_list
+		 */
         function triggerSendTrackback(&$menu_list) {
             $logged_info = Context::get('logged_info');
             if(!$logged_info->member_srl) return new Object();
@@ -102,9 +107,11 @@
             return new Object();
         }
 
-        /**
-         * @brief delete document in the document to delete the trigger Trackbacks
-         **/
+		/**
+		 * Delete document in the document to delete the trigger Trackbacks
+		 * @param object $obj
+		 * @return Object
+		 */
         function triggerDeleteDocumentTrackbacks(&$obj) {
             $document_srl = $obj->document_srl;
             if(!$document_srl) return new Object();
@@ -112,9 +119,11 @@
             return $this->deleteTrackbacks($document_srl, true);
         }
 
-        /**
-         * @brief deletion module that deletes all the trigger yeokingeul
-         **/
+		/**
+		 * Deletion module that deletes all the trigger yeokingeul
+		 * @param object $obj
+		 * @return Object
+		 */
         function triggerDeleteModuleTrackbacks(&$obj) {
             $module_srl = $obj->module_srl;
             if(!$module_srl) return new Object();
@@ -123,9 +132,10 @@
             return $oTrackbackController->deleteModuleTrackbacks($module_srl);
         }
 
-        /**
-         * @brief Trackback inserted
-         **/
+		/**
+		 * Trackback inserted
+		 * @return Object
+		 */
         function trackback() {
             // Output is set to XMLRPC
             Context::setRequestMethod("XMLRPC");
@@ -153,6 +163,12 @@
             return $this->insertTrackback($obj);
         }
 
+		/**
+		 * Trackback inserted
+		 * @param object $obj
+		 * @param bool $manual_inserted
+		 * @return Object
+		 */
         function insertTrackback($obj, $manual_inserted = false) {
             // List trackback
             $obj = Context::convertEncoding($obj);
@@ -201,9 +217,12 @@
             return new Object();
         }
 
-        /**
-         * @brief Deleting a single yeokingeul
-         **/
+		/**
+		 * Deleting a single yeokingeul
+		 * @param int $trackback_srl
+		 * @param bool $is_admin
+		 * @return object
+		 */
         function deleteTrackback($trackback_srl, $is_admin = false) {
             // trackback model object creation
             $oTrackbackModel = &getModel('trackback');
@@ -236,9 +255,11 @@
             return $output;
         }
 
-        /**
-         * @brief Delete All RSS Trackback
-         **/
+		/**
+		 * Delete All RSS Trackback
+		 * @param int $document_srl
+		 * @return object
+		 */
         function deleteTrackbacks($document_srl) {
             // Delete
             $args->document_srl = $document_srl;
@@ -247,11 +268,14 @@
             return $output;
         }
 
-        /**
-         * @brief Trackbacks sent to
-         *
-         * After sending the results are not sticky and handling
-         **/
+		/**
+		 * Trackbacks sent to
+		 * After sending the results are not sticky and handling
+		 * @param documentItem $oDocument
+		 * @param string $trackback_url
+		 * @param string $charset
+		 * @return Object
+		 */
         function sendTrackback($oDocument, $trackback_url, $charset) {
             $oModuleController = &getController('module');
             // Information sent by
@@ -320,9 +344,16 @@
 			return new Object(-1, 'msg_trackback_send_failed');
         }
 
-        /**
-         * @brief Within a specific time of a specific ipaddress Trackbacks delete all
-         **/
+		/**
+		 * Within a specific time of a specific ipaddress Trackbacks delete all
+		 * @param int $time
+		 * @param string $ipaddress
+		 * @param string $url
+		 * @param string $blog_name
+		 * @param string $title
+		 * @param string $excerpt
+		 * @return void
+		 */
         function deleteTrackbackSender($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
             $obj->regdate = date("YmdHis",time()-$time);
             $obj->ipaddress = $ipaddress;
diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php
index 16d4e570c..d644c0251 100644
--- a/modules/trackback/trackback.model.php
+++ b/modules/trackback/trackback.model.php
@@ -1,30 +1,37 @@
 <?php
-    /**
-     * @class  trackbackModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module model class
-     **/
-
+	/**
+	 * trackbackModel class
+	 * trackback module model class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackModel extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Wanted a trackback information
-         **/
+		/**
+		 * Wanted a trackback information
+		 * @param int $trackback_srl
+		 * @param array $columnList
+		 * @return object
+		 */
         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
-         **/
+		/**
+		 * Trackbacks document_srl corresponding to the bringing of the total number of
+		 * @param int $document_srl
+		 * @return int
+		 */
         function getTrackbackCount($document_srl) {
             $args->document_srl = $document_srl;
             $output = executeQuery('trackback.getTrackbackCount', $args);
@@ -34,9 +41,11 @@
         }
 
 
-        /**
-         * @brief Trackbacks module_srl corresponding to the bringing of the total number of
-         **/
+		/**
+		 * Trackbacks module_srl corresponding to the bringing of the total number of
+		 * @param int $module_srl
+		 * @return int
+		 */
         function getTrackbackAllCount($module_srl) {
             $args->module_srl = $module_srl;
             $output = executeQuery('trackback.getTrackbackCount', $args);
@@ -46,10 +55,13 @@
         }
 
 
-        /**
-         * @brief For a particular document to a specific ip number of trackbacks recorded
-         * Im spamfilter method used in
-         **/
+		/**
+		 * For a particular document to a specific ip number of trackbacks recorded
+		 * Im spamfilter method used in
+		 * @param int $document_srl
+		 * @param string $ipaddress
+		 * @return int
+		 */
         function getTrackbackCountByIPAddress($document_srl, $ipaddress) {
             $args->document_srl = $document_srl;
             $args->ipaddress = $ipaddress;
@@ -59,9 +71,11 @@
             return (int)$total_count;
         }
 
-        /**
-         * @brief Trackbacks certain documents belonging to the bringing of the list
-         **/
+		/**
+		 * Trackbacks certain documents belonging to the bringing of the list
+		 * @param int $document_srl
+		 * @return array
+		 */
         function getTrackbackList($document_srl) {
             $args->document_srl = $document_srl;
             $args->list_order = 'list_order';
@@ -76,9 +90,11 @@
             return $trackback_list;
         }
 
-        /** 
-         * @brief Bringing a mid Trackbacks
-         **/
+		/** 
+		 * Bringing a mid Trackbacks
+		 * @param object $obj
+		 * @return object
+		 */
         function getNewestTrackbackList($obj) {
             if($obj->mid) {
                 $oModuleModel = &getModel('module');
@@ -98,9 +114,11 @@
             return $output;
         }
         
-        /**
-         * @brief Return to a specific set of modules trackback
-         **/
+		/**
+		 * Return to a specific set of modules trackback
+		 * @param int $module_srl
+		 * @return object
+		 */
         function getTrackbackModuleConfig($module_srl) {
             // Bringing trackback module config
             $oModuleModel = &getModel('module');
@@ -113,9 +131,16 @@
             return $module_trackback_config;
         }
 
-        /**
-         * @brief Fixed in time for the entire yeokingeul Wanted to Register
-         **/
+		/**
+		 * Fixed in time for the entire yeokingeul Wanted to Register
+		 * @param int $time
+		 * @param string $ipaddress
+		 * @param string $url
+		 * @param string $blog_name
+		 * @param string $title
+		 * @param string excerpt
+		 * @return int
+		 */
         function getRegistedTrackback($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
             $obj->regdate = date("YmdHis",time()-$time);
             $obj->ipaddress = $ipaddress;
@@ -127,20 +152,24 @@
             return $output->data->count;
         }
 
-        /**
-         * @brief return by creating a trackback url
-         * Adds the key value in the trackback url.
-         **/
+		/**
+		 * Return by creating a trackback url
+		 * Adds the key value in the trackback url.
+		 * @param int $document_srl
+		 * @return string
+		 */
         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
-         **/
+		/**
+		 * 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
+		 * @param int $document_srl
+		 * @return string
+		 */
         function getTrackbackKey($document_srl) {
             $time = (int) (time()/(60*10));
             $db_info = Context::getDBInfo();
diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php
index ab80b1279..a49f01557 100644
--- a/modules/trackback/trackback.view.php
+++ b/modules/trackback/trackback.view.php
@@ -1,21 +1,24 @@
 <?php
-    /**
-     * @class  trackbackView
-     * @author NHN (developers@xpressengine.com)
-     * @brief trackback module's view class
-     **/
-
+	/**
+	 * @class  trackbackView
+	 * @brief trackback module's view class
+	 *
+	 * @author NHN (developers@xpressengine.com)
+	 * @package /modules/trackback
+	 * @version 0.1
+	 */
     class trackbackView extends trackback {
-
-        /**
-         * @brief Initialization
-         **/
+		/**
+		 * Initialization
+		 * @return void
+		 */
         function init() {
         }
 
-        /**
-         * @brief Display output list (administrative)
-         **/
+		/**
+		 * Display output list (administrative)
+		 * @return void
+		 */
         function dispTrackbackSend() {
             $document_srl = Context::get('document_srl');
             if(!$document_srl) return $this->stop('msg_invalid_request');
@@ -37,10 +40,12 @@
             $this->setTemplateFile('send_trackback_form');
         }
 
-        /**
-         * @brief An additional set of parts for a service module
-         * Use the form out of the settings for trackback
-         **/
+		/**
+		 * An additional set of parts for a service module
+		 * Use the form out of the settings for trackback
+		 * @param string $obj
+		 * @return Object
+		 */
         function triggerDispTrackbackAdditionSetup(&$obj) {
             $current_module_srl = Context::get('module_srl');
             $current_module_srls = Context::get('module_srls');
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php
index 60ec85c5d..59273e311 100644
--- a/modules/trash/trash.admin.controller.php
+++ b/modules/trash/trash.admin.controller.php
@@ -1,15 +1,19 @@
 <?php
 /**
- * @class  documentController
+ * trashAdminController class
+ * trash admin the module's controller class
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief document the module's controller class
- **/
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashAdminController extends trash
 {
 	/**
-	 * @brief object insert to trash
-	 * @param $obj : TrashVO type object
-	 **/
+	 * object insert to trash
+	 * @param TrashVO $obj
+	 * @return Object
+	 */
 	function insertTrash($obj)
 	{
 		if(Context::get('is_logged'))
@@ -32,9 +36,10 @@ class trashAdminController extends trash
 	}
 
 	/**
-	 * @brief empty trash
-	 * @param trashSrls : trash_srl in array
-	 **/
+	 * Empty trash
+	 * @param array trashSrls
+	 * @return Object
+	 */
 	function procTrashAdminEmptyTrash()
 	{
 		global $lang;
@@ -51,17 +56,17 @@ class trashAdminController extends trash
 		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);
+
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
+		return $this->setRedirectUrl($returnUrl, $output);
 	}
 
 	/**
-	 * @brief empty trash - private method
-	 **/
+	 * Empty trash - private method
+	 * @param string $isAll
+	 * @param array trashSrls
+	 * @return Object
+	 */
 	function _relationDataDelete($isAll, &$trashSrls)
 	{
 		if($isAll == 'true') $trashSrls = array();
@@ -95,8 +100,9 @@ class trashAdminController extends trash
 	}
 
 	/**
-	 * @brief restore content object
-	 **/
+	 * Restore content object
+	 * @return void|Object
+	 */
 	function procTrashAdminRestore()
 	{
 		global $lang;
@@ -143,13 +149,15 @@ class trashAdminController extends trash
 		}
 
 		$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;
-		}
+
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
+		$this->setRedirectUrl($returnUrl);
 	}
 
+	/**
+	 * Set trash list to Context
+	 * @return void|Object
+	 */
 	function procTrashAdminGetList()
 	{
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
@@ -173,9 +181,10 @@ class trashAdminController extends trash
 	}
 
 	/**
-	 * @brief empty trash
-	 * @param trashSrls : trash_srl in array
-	 **/
+	 * empty trash
+	 * @param array trashSrls
+	 * @return bool
+	 */
 	function _emptyTrash($trashSrls)
 	{
 		if(!is_array($trashSrls)) return false;
diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php
index 249defdf7..65575da1c 100644
--- a/modules/trash/trash.admin.view.php
+++ b/modules/trash/trash.admin.view.php
@@ -1,15 +1,17 @@
 <?php
 /**
- * @class  trashView
+ * trashAdminView class
+ * Admin view class of the trash module
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief View class of the module trash
- **/
-
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashAdminView extends trash {
-
 	/**
-	 * @brief Initialization
-	 **/
+	 * Initialization
+	 * @return void
+	 */
 	function init() {
 		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
 		$template_path = sprintf("%stpl/",$this->module_path);
@@ -17,8 +19,9 @@ class trashAdminView extends trash {
 	}
 
 	/**
-	 * @brief trash list
-	 **/
+	 * Trash list
+	 * @return void
+	 */
 	function dispTrashAdminList() {
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php
index 067c04079..9a73743e5 100644
--- a/modules/trash/trash.class.php
+++ b/modules/trash/trash.class.php
@@ -1,23 +1,28 @@
 <?php
 /**
- * @class  document
+ * trash class
+ * trash the module's high class
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief document the module's high class
- **/
+ * @package /modules/trash
+ * @version 0.1
+ */
 
 require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
 
 class trash extends ModuleObject {
 	/**
-	 * @brief Implement if additional tasks are necessary when installing
-	 **/
+	 * Implement if additional tasks are necessary when installing
+	 * @return Object
+	 */
 	function moduleInstall() {
 		return new Object();
 	}
 
 	/**
-	 * @brief a method to check if successfully installed
-	 **/
+	 * A method to check if successfully installed
+	 * @return bool
+	 */
 	function checkUpdate() {
 		//$oDB = &DB::getInstance();
 		//$oModuleModel = &getModel('module');
@@ -26,8 +31,9 @@ class trash extends ModuleObject {
 	}
 
 	/**
-	 * @brief Execute update
-	 **/
+	 * Execute update
+	 * @return Object
+	 */
 	function moduleUpdate() {
 		//$oDB = &DB::getInstance();
 		//$oModuleModel = &getModel('module');
diff --git a/modules/trash/trash.controller.php b/modules/trash/trash.controller.php
index ab78afa50..f7490a983 100644
--- a/modules/trash/trash.controller.php
+++ b/modules/trash/trash.controller.php
@@ -1,9 +1,12 @@
 <?php
 /**
- * @class  documentController
+ * trashController
+ * trash the module's controller class
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief document the module's controller class
- **/
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashController extends trash
 {
 }
diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php
index eb26d5f2e..dc870eb5c 100644
--- a/modules/trash/trash.model.php
+++ b/modules/trash/trash.model.php
@@ -1,10 +1,20 @@
 <?php
-
+/**
+ * trashModel class
+ * trash the module's model class
+ *
+ * @author NHN (developers@xpressengine.com)
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashModel extends trash
 {
 	/**
-	 * @brief get one trash object
-	 **/
+	 * Get one trash object
+	 * @param int $trashSrl
+	 * @pram array $columnList
+	 * @return TrashVO
+	 */
 	function getTrash($trashSrl, $columnList = array())
 	{
 		$oTrashVO = new TrashVO();
@@ -20,8 +30,11 @@ class trashModel extends trash
 	}
 
 	/**
-	 * @brief get trash object list
-	 **/
+	 * Get TrashVO list
+	 * @param object $args
+	 * @param array $columnList
+	 * @return object
+	 */
 	function getTrashList($args, $columnList = array())
 	{
 		$output = executeQueryArray('trash.getTrashList', $args, $columnList);
@@ -39,8 +52,11 @@ class trashModel extends trash
 	}
 
 	/**
-	 * @brief set trash object from std object
-	 **/
+	 * Set trash object from std object
+	 * @param TrashVO $oTrashVO
+	 * @param object $stdObject
+	 * @return void
+	 */
 	function _setTrashObject(&$oTrashVO, $stdObject)
 	{
 		$oTrashVO->setTrashSrl($stdObject->trash_srl);
diff --git a/modules/trash/trash.view.php b/modules/trash/trash.view.php
index 7536c6294..3aae3b294 100644
--- a/modules/trash/trash.view.php
+++ b/modules/trash/trash.view.php
@@ -1,15 +1,17 @@
 <?php
 /**
- * @class  trashView
+ * trashView class
+ * View class of the module trash
+ *
  * @author NHN (developers@xpressengine.com)
- * @brief View class of the module trash
- **/
-
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashView extends trash {
-
 	/**
-	 * @brief Initialization
-	 **/
+	 * Initialization
+	 * @return void
+	 */
 	function init() {
 	}
 }
diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js
index 17a47f5c3..2502bf609 100644
--- a/modules/widget/tpl/js/generate_code.js
+++ b/modules/widget/tpl/js/generate_code.js
@@ -87,14 +87,20 @@ function doFillWidgetVars() {
 
     // 위젯 스타일 유지를 위한 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);
-    }
+	//  IE7에서 발생하는 jQuery 용 attribute를 걸러내기 위해 추가
+	var attrFilters = ['style', 'sizset', 'draggable', 'class'];
+
+	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) continue;
+		if(name.indexOf('sizcache')  == 0) continue;
+		if(jQuery.inArray(name, attrFilters) > -1) continue;
+
+		var dummy = jQuery('<input type="hidden" name="'+name+'" />').val(value).appendTo("#fo_widget").get(0);
+	}
 
     // 위젯의 속성 설정
     var obj_list = new Array();
@@ -106,6 +112,8 @@ function doFillWidgetVars() {
         var node = obj_list[j];
         if(node.name.indexOf('_')==0) continue;
         if(node.name == 'widgetstyle') continue;
+        if(node.type == 'button') continue;
+        if(node.name == '') continue;
 
         var length = node.length;
         var type = node.type;
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 1336760b5..7a5020993 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -53,9 +53,9 @@ function doStartPageModify(zoneID, module_srl) {
     doFitBorderSize();
 
     // 드래그와 리사이즈와 관련된 이벤트 리스너 생성
-    xAddEventListener(document,"click",doCheckWidget);
-    xAddEventListener(document,"mousedown",doCheckWidgetDrag);
-    xAddEventListener(document,'mouseover',widgetSetup);
+	xAddEventListener(document.getElementById('zonePageContent'), "click",doCheckWidget);
+	xAddEventListener(document.getElementById('zonePageContent'), "mousedown",doCheckWidgetDrag);
+	xAddEventListener(document.getElementById('zonePageContent'), 'mouseover',widgetSetup);
 }
 
 
@@ -63,7 +63,7 @@ function doStartPageModify(zoneID, module_srl) {
 function removeAllWidget() {
     if(!confirm(confirm_delete_msg)) return;
 	restoreWidgetButtons();
-	xInnerHtml(zonePageObj,'');
+	jQuery(zonePageObj).html('');
 }
 
 /**
diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html
index f85ea8a6c..d921c5ca7 100644
--- a/modules/widget/tpl/widget_generate_code.include.html
+++ b/modules/widget/tpl/widget_generate_code.include.html
@@ -67,8 +67,12 @@
 				<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
 			</select>
 			<block cond="$var->type == 'select-multi-order'">
+				<!--@if($var->init_options && is_array($var->init_options))-->
 				{@$inits = array_keys($var->init_options)}
 				<input type="hidden" name="{$id}" value="{implode(',', $inits)}" />
+				<!--@else-->
+				<input type="hidden" name="{$id}" value="" />
+				<!--@end-->
 				<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>
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 6b54f25bc..000bfb739 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -230,10 +230,10 @@
         /**
          * @breif By converting the specific content of the widget tag return
          **/
-        function transWidgetCode($content, $javascript_mode = false) {
+        function transWidgetCode($content, $javascript_mode = false, $isReplaceLangCode = true) {
             // Changing user-defined language
             $oModuleController = &getController('module');
-            $oModuleController->replaceDefinedLangCode($content);
+            $oModuleController->replaceDefinedLangCode($content, $isReplaceLangCode);
             // Check whether to include information about editing
             $this->javascript_mode = $javascript_mode;
             // Widget code box change
diff --git a/phpDoc/phpdoc.dist.xml b/phpDoc/phpdoc.dist.xml
new file mode 100644
index 000000000..c15470e5b
--- /dev/null
+++ b/phpDoc/phpdoc.dist.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+	<title><![CDATA[XpressEngine]]></title>
+	<parser>
+		<default-package-name>XE</default-package-name>
+		<target>.</target>
+	</parser>
+	<transformer>
+		<target>output</target>
+	</transformer>
+	<transformations>
+		<template name="new-black" />
+	</transformations>
+	<files>
+		<file>../index.php</file>
+		<directory>../classes</directory>
+		<directory>../config</directory>
+		<directory>../modules</directory>
+		<ignore>config/config.user.inc.php</ignore>
+		<ignore>config/package.inc.php</ignore>
+		<ignore>classes/security/htmlpurifier/*</ignore>
+		<ignore>modules/member/php-openid-1.2.3/*</ignore>
+	</files>
+</phpdoc>
diff --git a/tests/classes/db/db/xml_query/cubrid/data/doc_subquery.xml b/tests/classes/db/db/xml_query/cubrid/data/doc_subquery.xml
new file mode 100644
index 000000000..5709c7a17
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/doc_subquery.xml
@@ -0,0 +1,21 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+	        <query operation="equal" column="regdate" notnull="notnull" alias="documentMaxRegdate">
+	        	<tables>
+	        		<table name="documents" alias="documents" />
+	        	</tables>
+	        	<columns>
+	        		<column name="max(regdate)" alias="maxregdate" />
+	        	</columns>
+			    <conditions>
+			        <condition operation="equal" column="documents.user_id" var="member.user_id" notnull="notnull" />
+			    </conditions>        		        	
+	        </query>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php b/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php
index 99dfd7950..d4bbdce97 100644
--- a/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php
+++ b/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php
@@ -21,7 +21,7 @@ class MysqlInsertTest extends MysqlTest
 	{
 		$this->_testQuery($xml_file, $argsString, $expected, 'getInsertSql', $columnList);
 	}
-	
+
 	function testInsertIntoNumericColumnConvertsValue()
 	{
 		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/member_insert_injection.xml";
@@ -35,5 +35,41 @@ class MysqlInsertTest extends MysqlTest
 
 }
 
+/* End of file MysqlInsertTest.php */
+/* Location: ./tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php */
+	/**
+	 * @brief testInsertSelectStatement - checks that when query action is 'insert-selct' an 'INSERT INTO .. SELECT ...' statement is properly generated
+	 * @developer Corina Udrescu (xe_dev@arnia.ro)
+	 * @access public
+	 * @return void
+	 */
+	function testInsertSelectStatement()
+	{
+		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/insert_select.xml";
+		$argsString = '$args->condition_value = 7;';
+		$expected = 'insert into `xe_table1` (`column1`, `column2`, `column3`) 
+						select `column4`, `column5`, `column6` 
+							from `xe_table2` as `table2` 
+							where `column4` >= 7';
+		$this->_test($xml_file, $argsString, $expected);
+	}
+	
+	function testInsertSelectStatement2()
+	{
+		$xml_file = _XE_PATH_ . "modules/wiki/queries/insertLinkedDocuments.xml";
+		$argsString = '$args->document_srl = 7;
+						$args->module_srl = 10;
+						$args->alias_list = array("unu", "doi");
+			';
+		$expected = 'insert into `xe_wiki_links` 
+							(`cur_doc_srl`, `link_doc_srl`) 
+						select 7, `document_srl` 
+							from `xe_document_aliases` as `document_aliases` 
+							where `module_srl` = 10 
+								and `alias_title` in (\'unu\',\'doi\')';
+		$this->_test($xml_file, $argsString, $expected);
+	}	
+}
+
 /* End of file MysqlInsertTest.php */
 /* Location: ./tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php */
diff --git a/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php
index 576587822..eaee29382 100644
--- a/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php
+++ b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php
@@ -2,7 +2,7 @@
 
 class MysqlSelectTest extends MysqlTest {
 
-	function _test($xml_file, $argsString, $expected, $columnList = null) {
+	function _test($xml_file, $argsString, $expected, $columnList = NULL) {
 		$this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql', $columnList);
 	}
 
@@ -262,4 +262,71 @@ class MysqlSelectTest extends MysqlTest {
 		$this->_test($xml_file, $argsString, $expected);
 	}
 
+	/**
+	 * Issue 2064
+	 * Queries should support both notin and not_in as valid operations
+	 */
+	function test_not_in() {
+		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/document.getNewestDocuments.xml";
+		$argsString = '$args->module_srl = "345709,345710,345711,345728,345707,345670,345667,49113,16551,345679,50394,350665,345680,381846,381852,381917,345708,349028,345666,17173,49117,345671,345714,345665,349893,345696,345713,351967,330919,345685,16754,349027,348787,345672,350239,345697,345674,291882,345678,345729,345675,345721,345676,381867,294605,381864,345673,355113,353624,345681,345683,345668,345677,12424,158716,47498,101835,273679,142558,13818,12311,8723,78670,18919,365075,13833,14293,15891,27823,14291,177818,81000,11788,18918,13859,14102,14136,255783,134367,385619,317170,330312";
+										$args->sort_index = "documents.list_order";
+										$args->order_type = "asc";
+										$args->list_count = 10;
+										';
+		$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` not in (0) and `documents`.`module_srl` in (345709,345710,345711,345728,345707,345670,345667,49113,16551,345679,50394,350665,345680,381846,381852,381917,345708,349028,345666,17173,49117,345671,345714,345665,349893,345696,345713,351967,330919,345685,16754,349027,348787,345672,350239,345697,345674,291882,345678,345729,345675,345721,345676,381867,294605,381864,345673,355113,353624,345681,345683,345668,345677,12424,158716,47498,101835,273679,142558,13818,12311,8723,78670,18919,365075,13833,14293,15891,27823,14291,177818,81000,11788,18918,13859,14102,14136,255783,134367,385619,317170,330312) and `modules`.`module_srl` = `documents`.`module_srl`) and `documents`.`list_order` <= 2100000000 order by `documents`.`list_order` asc limit 10';
+		$this->_test($xml_file, $argsString, $expected);
+	}
+
+	/**
+	 * Issue 2064
+	 * Query condition should be ignored if operation is invalid
+	 */
+	function test_invalid_condition_operation() {
+		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/document.getNewestDocumentsInvalid.xml";
+		$argsString = '$args->module_srl = "345709,345710,345711,345728,345707,345670,345667,49113,16551,345679,50394,350665,345680,381846,381852,381917,345708,349028,345666,17173,49117,345671,345714,345665,349893,345696,345713,351967,330919,345685,16754,349027,348787,345672,350239,345697,345674,291882,345678,345729,345675,345721,345676,381867,294605,381864,345673,355113,353624,345681,345683,345668,345677,12424,158716,47498,101835,273679,142558,13818,12311,8723,78670,18919,365075,13833,14293,15891,27823,14291,177818,81000,11788,18918,13859,14102,14136,255783,134367,385619,317170,330312";
+										$args->sort_index = "documents.list_order";
+										$args->order_type = "asc";
+										$args->list_count = 10;
+										';
+		$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 (345709,345710,345711,345728,345707,345670,345667,49113,16551,345679,50394,350665,345680,381846,381852,381917,345708,349028,345666,17173,49117,345671,345714,345665,349893,345696,345713,351967,330919,345685,16754,349027,348787,345672,350239,345697,345674,291882,345678,345729,345675,345721,345676,381867,294605,381864,345673,355113,353624,345681,345683,345668,345677,12424,158716,47498,101835,273679,142558,13818,12311,8723,78670,18919,365075,13833,14293,15891,27823,14291,177818,81000,11788,18918,13859,14102,14136,255783,134367,385619,317170,330312) and `modules`.`module_srl` = `documents`.`module_srl`) and `documents`.`list_order` <= 2100000000 order by `documents`.`list_order` asc limit 10';
+		$this->_test($xml_file, $argsString, $expected);
+	}
+
+	/**
+	 * Issue 2114
+	 * 'Null' operation is ignored
+	 */
+	function test_null()
+	{
+		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/page.pageTypeNullCheck.xml";
+		$argsString = '	';
+		$expected = 'select `m`.`module_srl`, `m`.`mid`, `ev`.`value`
+						from `xe_modules` as `m`
+							left join `xe_module_extra_vars` as `ev`
+											on `ev`.`name` = \'page_type\'
+											and `m`.`module_srl` = `ev`.`module_srl`
+						where `m`.`module` = \'page\'
+							and `ev`.`value` is null
+						';
+		$this->_test($xml_file, $argsString, $expected);
+	}
+
+	/**
+	 * Issue 2114
+	 * 'Notnull' operation is ignored
+	 */
+	function test_notnull()
+	{
+		$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/page.pageTypeNotNullCheck.xml";
+		$argsString = '	';
+		$expected = 'select `m`.`module_srl`, `m`.`mid`, `ev`.`value`
+						from `xe_modules` as `m`
+							left join `xe_module_extra_vars` as `ev`
+											on `ev`.`name` = \'page_type\'
+											and `m`.`module_srl` = `ev`.`module_srl`
+						where `m`.`module` = \'page\'
+							and `ev`.`value` is not null
+						';
+		$this->_test($xml_file, $argsString, $expected);
+	}
 }
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/document.getNewestDocuments.xml b/tests/classes/db/db/xml_query/mysql/data/document.getNewestDocuments.xml
new file mode 100644
index 000000000..e6e7ac7e4
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/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="not_in" 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>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/document.getNewestDocumentsInvalid.xml b/tests/classes/db/db/xml_query/mysql/data/document.getNewestDocumentsInvalid.xml
new file mode 100644
index 000000000..5a3ad2aad
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/document.getNewestDocumentsInvalid.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="random_stuff" 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>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/insert_select.xml b/tests/classes/db/db/xml_query/mysql/data/insert_select.xml
new file mode 100644
index 000000000..4abfd3754
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/insert_select.xml
@@ -0,0 +1,23 @@
+<query id="QUERY_ID" action="insert-select">
+    <tables>
+            <table name="table1" />
+    </tables>
+    <columns>
+            <column name="column1" />
+            <column name="column2" />
+            <column name="column3" />
+    </columns>
+	<query>
+			<tables>
+					<table name="table2" />
+			</tables>
+			<columns>
+					<column name="column4" />
+					<column name="column5" />
+					<column name="column6" />
+			</columns>
+			<conditions>
+					<condition operation="more" column="column4" default="100" var="condition_value" />
+			</conditions>
+	</query>		
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/page.pageTypeNotNullCheck.xml b/tests/classes/db/db/xml_query/mysql/data/page.pageTypeNotNullCheck.xml
new file mode 100644
index 000000000..bff829baa
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/page.pageTypeNotNullCheck.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="notnull" column="ev.value" default="NULL" pipe="and" />
+    </conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/page.pageTypeNullCheck.xml b/tests/classes/db/db/xml_query/mysql/data/page.pageTypeNullCheck.xml
new file mode 100644
index 000000000..0fefc0f27
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/page.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/tests/classes/validator/ValidatorTest.php b/tests/classes/validator/ValidatorTest.php
index af0aa861b..4b1f176fe 100644
--- a/tests/classes/validator/ValidatorTest.php
+++ b/tests/classes/validator/ValidatorTest.php
@@ -114,6 +114,63 @@ class ValidatorTest extends PHPUnit_Framework_TestCase
 	}
 
 	public function testCustomRule() {
+		// regex
+		$vd = new Validator();
+		$customRules['regex_rule']['type'] = 'regex';
+		$customRules['regex_rule']['test'] = '/^[a-z]+$/';
+		$vd->addRule($customRules);
+		$vd->addFilter('regex_field', array('rule' => 'regex_rule'));
+
+		$this->assertTrue($vd->validate(array('regex_field' => 'abc')));
+		$this->assertFalse($vd->validate(array('regex_field' => 'ABC')));
+
+		// enum
+		$vd = new Validator();
+		$customRules['enum_rule']['type'] = 'enum';
+		$customRules['enum_rule']['test'] = 'a,b,c';
+		$vd->addRule($customRules);
+		$vd->addFilter('enum_field', array('rule' => 'enum_rule'));
+
+		$this->assertTrue($vd->validate(array('enum_field' => 'a')));
+		$this->assertFalse($vd->validate(array('enum_field' => 'd')));
+
+		// enum with custom delimiter
+		$vd = new Validator();
+		$customRules['enum_rule2']['type'] = 'enum';
+		$customRules['enum_rule2']['test'] = 'a@b@c';
+		$customRules['enum_rule2']['delim'] = '@';
+		$vd->addRule($customRules);
+		$vd->addFilter('enum_field2', array('rule' => 'enum_rule2'));
+
+		$this->assertTrue($vd->validate(array('enum_field2' => 'a')));
+		$this->assertFalse($vd->validate(array('enum_field2' => 'd')));
+
+		// expr
+		$vd = new Validator();
+		$customRules['expr_rule']['type'] = 'expr';
+		$customRules['expr_rule']['test'] = '$$ &lt; 10';
+		$vd->addRule($customRules);
+		$vd->addFilter('expr_field', array('rule' => 'expr_rule'));
+
+		$this->assertTrue($vd->validate(array('expr_field' => '5')));
+		$this->assertFalse($vd->validate(array('expr_field' => '15')));
+	}
+
+	public function testCustomRuleXml()
+	{
+		$vd = new Validator(dirname(__FILE__).'/customrule.xml');
+
+		$this->assertTrue($vd->validate(array('regex_field' => 'abc')));
+		$this->assertFalse($vd->validate(array('regex_field' => 'ABC')));
+
+		$this->assertTrue($vd->validate(array('enum_field' => 'a')));
+		$this->assertFalse($vd->validate(array('enum_field' => 'd')));
+
+		$this->assertTrue($vd->validate(array('enum_field2' => 'a')));
+		$this->assertFalse($vd->validate(array('enum_field2' => 'd')));
+
+		$this->assertTrue($vd->validate(array('expr_field' => '5')));
+		$this->assertFalse($vd->validate(array('expr_field' => '15')));
 	}
 
 	public function testCondition() {
diff --git a/tests/classes/validator/customrule.xml b/tests/classes/validator/customrule.xml
new file mode 100644
index 000000000..8da1a1e87
--- /dev/null
+++ b/tests/classes/validator/customrule.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+	<customrules>
+		<rule name="regex_rule" type="regex" test="/^[a-z]+$/" />
+		<rule name="enum_rule" type="enum" test="a,b,c" />
+		<rule name="enum_rule2" type="enum" test="a@b@c" delim="@" />
+		<rule name="expr_rule" type="expr" test="$$ &lt; 10" />
+	</customrules>
+	<fields>
+		<field name="regex_field" rule="regex_rule" />
+		<field name="enum_field" rule="enum_rule" />
+		<field name="enum_field2" rule="enum_rule2" />
+		<field name="expr_field" rule="expr_rule" />
+	</fields>
+</ruleset>
diff --git a/themes/xe_greystone/layouts/xe_greystone/css/default.css b/themes/xe_greystone/layouts/xe_greystone/css/default.css
index 9bf06bdc0..1edfa765e 100644
--- a/themes/xe_greystone/layouts/xe_greystone/css/default.css
+++ b/themes/xe_greystone/layouts/xe_greystone/css/default.css
@@ -8,7 +8,7 @@ body { margin:0;padding:0; font-size:.75em;}
 #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}
+html{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}
diff --git a/themes/xe_greystone/layouts/xe_greystone/layout.html b/themes/xe_greystone/layouts/xe_greystone/layout.html
index 5fd07e210..90cd36bcb 100644
--- a/themes/xe_greystone/layouts/xe_greystone/layout.html
+++ b/themes/xe_greystone/layouts/xe_greystone/layout.html
@@ -8,7 +8,7 @@
 
 <!--@if($layout_info->background_image)-->
 <style type="text/css">
-    body {  background:#FFFFFF url({$layout_info->background_image}) repeat-x left top; }
+    html {  background:#FFFFFF url({$layout_info->background_image}) repeat-x left top; }
 </style>
 <!--@end-->
 
diff --git a/themes/xe_greystone/modules/message/system_message.html b/themes/xe_greystone/modules/message/system_message.html
index 86f43058f..70b9c8996 100644
--- a/themes/xe_greystone/modules/message/system_message.html
+++ b/themes/xe_greystone/modules/message/system_message.html
@@ -12,7 +12,7 @@
 	<!--%import("./filter/openid_login.xml")-->
 	<!--%import("./message.js")-->
 	<div class="mLogin" id="gLogin">
-		<form action="./" method="post" ruleset="@login" id="gForm">
+		<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm">
 			<input type="hidden" name="act" value="procMemberLogin" />
 			<fieldset>
 				<ul class="idpw">
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/css/default.css b/themes/xe_sapphire/layouts/xe_sapphire/css/default.css
index 8181c3013..559d9871c 100644
--- a/themes/xe_sapphire/layouts/xe_sapphire/css/default.css
+++ b/themes/xe_sapphire/layouts/xe_sapphire/css/default.css
@@ -8,7 +8,7 @@ body { margin:0;padding:0; font-size:.75em;}
 #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}
+html{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}
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/layout.html b/themes/xe_sapphire/layouts/xe_sapphire/layout.html
index 9f8b1f814..51004f5bc 100644
--- a/themes/xe_sapphire/layouts/xe_sapphire/layout.html
+++ b/themes/xe_sapphire/layouts/xe_sapphire/layout.html
@@ -5,7 +5,7 @@
 <!--%import("css/default.css")-->
 <!--@if($layout_info->background_image)-->
 <style type="text/css">
-    body {  background:#FFFFFF url({$layout_info->background_image}) repeat-x left top; }
+    html {  background:#FFFFFF url({$layout_info->background_image}) repeat-x left top; }
 </style>
 <!--@end-->
 <!--@if(!$layout_info->colorset)-->
diff --git a/themes/xe_sapphire/modules/message/system_message.html b/themes/xe_sapphire/modules/message/system_message.html
index 86f43058f..70b9c8996 100644
--- a/themes/xe_sapphire/modules/message/system_message.html
+++ b/themes/xe_sapphire/modules/message/system_message.html
@@ -12,7 +12,7 @@
 	<!--%import("./filter/openid_login.xml")-->
 	<!--%import("./message.js")-->
 	<div class="mLogin" id="gLogin">
-		<form action="./" method="post" ruleset="@login" id="gForm">
+		<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm">
 			<input type="hidden" name="act" value="procMemberLogin" />
 			<fieldset>
 				<ul class="idpw">
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
index 1a301a876..47cca388d 100644
--- a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/banner.css
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/banner.css
@@ -1,54 +1,43 @@
 @charset "utf-8";
-.xeBanner { position:relative; z-index:100;}
-.xeBanner .section{ position:static; height:100%;width:100%; padding-top:1px; margin:0 !important; }
+.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.v3 #v3{display:block}
+.xeBanner #v1{background-position:0 0}
 .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);}
-
+.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{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
+#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}
+.pagingli{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}
+.pagingli span{visibility:hidden}
+.paginga{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
index 93fd3fe58..74a17ac40 100644
--- a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css
@@ -1,77 +1,62 @@
 @charset "utf-8";
 /* CSS Document */
-
-body {font-size: 12px;font-family:sans-serif; margin: 0; padding: 0;}
-img{border:none;}
+body{font-size:12px;font-family:sans-serif;margin:0;padding:0}
+img{border:none}
 /* 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 .iText	{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;}
-
-
+#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 .iText{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;}
-
-
-
+.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;}
+#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}
+.pagingli{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}
+.pagingli span{visibility:hidden}
+.paginga{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}
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/modules/member/login_form.html b/themes/xe_solid_enterprise/modules/member/login_form.html
index a86975ee6..d388dc569 100644
--- a/themes/xe_solid_enterprise/modules/member/login_form.html
+++ b/themes/xe_solid_enterprise/modules/member/login_form.html
@@ -15,7 +15,7 @@
 	<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">
+    <form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="fo_member_login">
 	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
         <fieldset class="login">
             <dl>
diff --git a/themes/xe_solid_enterprise/modules/member/modify_info.html b/themes/xe_solid_enterprise/modules/member/modify_info.html
index 4ac642f93..1b24657ce 100644
--- a/themes/xe_solid_enterprise/modules/member/modify_info.html
+++ b/themes/xe_solid_enterprise/modules/member/modify_info.html
@@ -24,7 +24,7 @@
     <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>
+        <th><div>{$identifierForm->title} <em style="color:red">*</em></div></th>
         <td class="wide">
 			{$identifierForm->value}
 			<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
diff --git a/themes/xe_solid_enterprise/modules/message/system_message.html b/themes/xe_solid_enterprise/modules/message/system_message.html
index bd894c801..40aa0229a 100644
--- a/themes/xe_solid_enterprise/modules/message/system_message.html
+++ b/themes/xe_solid_enterprise/modules/message/system_message.html
@@ -9,7 +9,7 @@
 	<!--%import("./filter/openid_login.xml")-->
 	<!--%import("./message.js")-->
 	<div class="mLogin" id="gLogin">
-		<form action="./" method="post" ruleset="@login" id="gForm">
+		<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm">
 		<input type="hidden" name="act" value="procMemberLogin" />
 		<fieldset>
 		<div class="signPanel">
diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php
index 65b7d3bf0..b8d009bd5 100644
--- a/widgets/content/content.class.php
+++ b/widgets/content/content.class.php
@@ -253,7 +253,7 @@
             }
 
 			$oSecurity = new Security($content_items);
-			$oSecurity->encodeHTML('..variables.title', '..variables.content', '..variables.user_name', '..variables.nick_name');
+			$oSecurity->encodeHTML('..variables.content', '..variables.user_name', '..variables.nick_name');
 
             return $content_items;
         }
diff --git a/widgets/content/skins/default/js/content_widget.js b/widgets/content/skins/default/js/content_widget.js
index 3387cd8ec..d78a6aba3 100644
--- a/widgets/content/skins/default/js/content_widget.js
+++ b/widgets/content/skins/default/js/content_widget.js
@@ -9,7 +9,7 @@ function content_widget_next(obj,list_per_page){
     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;
+            page = parseInt(i/list_per_page,10) + 1;
             return false;
         }
     });
@@ -34,7 +34,7 @@ function content_widget_prev(obj,list_per_page){
     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;
+            page = parseInt(i/list_per_page,10)+1;
             return false;
         }
     });
diff --git a/widgets/login_info/skins/xe_global/login_form.html b/widgets/login_info/skins/xe_global/login_form.html
index 9c646861a..704437d13 100644
--- a/widgets/login_info/skins/xe_global/login_form.html
+++ b/widgets/login_info/skins/xe_global/login_form.html
@@ -16,16 +16,16 @@
     xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
 </script>
 
-<form action="./" method="post" ruleset="@login" id="fo_login_widget">
+<form action="{getUrl('','act','procMemberLogin')}" 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()}" />
+	<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
     <div class="idpwWrap">
         <div class="idpw">
-            <input name="user_id" type="text" title="user id" />
-            <input name="password" type="password" title="password" />
+            <input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+            <input name="password" type="password" title="{$lang->password}" />
         </div>
 		<p class="save">
         <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html
index ea220ef4d..8c0651fa3 100644
--- a/widgets/login_info/skins/xe_globalTwo/login_form.html
+++ b/widgets/login_info/skins/xe_globalTwo/login_form.html
@@ -17,16 +17,16 @@
 </script>
 
 
-<form action="./" method="post" ruleset="@login" id="fo_login_widget" class="fo_login_widget">
+<form action="{getUrl('','act','procMemberLogin')}" 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()}" />
+	<input type="hidden" name="success_return_url" value="{htmlspecialchars(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" />
+            <input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+            <input name="password" type="password" title="{$lang->password}" />
         </div>
 		<p class="save">
         <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index d8f4a4ef8..e81eee0b5 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -14,14 +14,14 @@
 <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}">
+<form id="fo_login_widget" action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="login_{$colorset}">
 	<fieldset>
 		<input type="hidden" name="act" value="procMemberLogin" />
-		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+		<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
 		<div class="idpwWrap">
 			<div class="idpw">
-				<input name="user_id" type="text" title="user id" />
-				<input name="password" type="password" title="password" />
+				<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+				<input name="password" type="password" title="{$lang->password}" />
 				<p class="keep">
 					<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
 					<label for="keep_signed">{$lang->keep_signed}</label>
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
index b24c74bee..fb3b72607 100644
--- a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
@@ -10,11 +10,11 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
 
 </script>
 
-<form action="./" method="post" ruleset="@login" id="fo_login_widget">
+<form action="{getUrl('','act','procMemberLogin')}" 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()}" />
+<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
 <div id="sign_box">
 	<div class="txt sign_state1"><span class="label">Sign in</span></div>
 	<div class="signin_window" style="display:none;">
@@ -22,8 +22,8 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
 		<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>
+					<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" /></div>
+					<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password" type="password" title="{$lang->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-->">
diff --git a/widgets/mcontent/skins/default/normal.html b/widgets/mcontent/skins/default/normal.html
index bd48d45b2..ef5448bd8 100644
--- a/widgets/mcontent/skins/default/normal.html
+++ b/widgets/mcontent/skins/default/normal.html
@@ -16,26 +16,26 @@
 					<!--@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 class="time">{$item->getRegdate("Y-m-d H:i")}</span>
 				</span>
 				<!--@end-->
 			<!--@end-->