From 08022a1ddb0539014d7ebd05ec31da149c52555c Mon Sep 17 00:00:00 2001 From: khongchi Date: Thu, 7 Nov 2013 02:29:45 +0000 Subject: [PATCH 001/473] block 'phar' file upload git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13179 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/file.controller.php | 2 +- modules/importer/importer.admin.controller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index f8c072c52..0fc4bf5e8 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -636,7 +636,7 @@ class fileController extends file if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name'])) { // Immediately remove the direct file if it has any kind of extensions for hacking - $file_info['name'] = preg_replace('/\.(php|phtm|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']); + $file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']); $file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']); $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3)); diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 6eb554a21..c47b20aea 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -1056,7 +1056,7 @@ class importerAdminController extends importer if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename)) { // Immediately remove the direct file if it has any kind of extensions for hacking - $file_obj->source_filename = preg_replace('/\.(php|phtm|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_obj->source_filename); + $file_obj->source_filename = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_obj->source_filename); $file_obj->source_filename = str_replace(array('<', '>'), array('%3C', '%3E'), $file_obj->source_filename); $path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3)); From dbc18a4f99885eabb635475669707f9c556c96e4 Mon Sep 17 00:00:00 2001 From: ngleader Date: Thu, 7 Nov 2013 02:42:42 +0000 Subject: [PATCH 002/473] change author git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13180 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/adminlogging/adminlogging.addon.php | 2 +- addons/adminlogging/conf/info.xml | 18 ++++----- addons/autolink/autolink.addon.php | 2 +- addons/autolink/autolink.js | 2 +- addons/autolink/conf/info.xml | 18 ++++----- addons/blogapi/blogapi.addon.php | 2 +- addons/blogapi/blogapi.func.php | 2 +- addons/blogapi/conf/info.xml | 18 ++++----- addons/captcha/captcha.addon.php | 2 +- addons/captcha/conf/info.xml | 14 +++---- addons/counter/conf/info.xml | 18 ++++----- addons/counter/counter.addon.php | 2 +- addons/member_communication/conf/info.xml | 18 ++++----- .../member_communication.addon.php | 2 +- addons/member_extra_info/conf/info.xml | 18 ++++----- .../member_extra_info.addon.php | 2 +- addons/mobile/classes/hdml.class.php | 2 +- addons/mobile/classes/mhtml.class.php | 2 +- addons/mobile/classes/mobile.class.php | 2 +- addons/mobile/classes/wml.class.php | 2 +- addons/mobile/conf/info.xml | 14 +++---- addons/mobile/mobile.addon.php | 2 +- addons/openid_delegation_id/conf/info.xml | 18 ++++----- .../openid_delegation_id.addon.php | 2 +- addons/point_level_icon/conf/info.xml | 18 ++++----- .../point_level_icon.addon.php | 2 +- addons/resize_image/conf/info.xml | 18 ++++----- addons/resize_image/resize_image.addon.php | 2 +- classes/cache/CacheApc.class.php | 2 +- classes/cache/CacheHandler.class.php | 4 +- classes/cache/CacheMemcache.class.php | 2 +- classes/context/Context.class.php | 2 +- classes/db/DB.class.php | 2 +- classes/db/DBCubrid.class.php | 2 +- classes/db/DBMssql.class.php | 2 +- classes/db/DBMysql.class.php | 2 +- classes/db/DBMysql_innodb.class.php | 2 +- classes/db/DBMysqli.class.php | 2 +- classes/db/queryparts/Query.class.php | 2 +- classes/db/queryparts/Subquery.class.php | 2 +- .../queryparts/condition/Condition.class.php | 2 +- .../condition/ConditionGroup.class.php | 2 +- .../condition/ConditionSubquery.class.php | 2 +- .../condition/ConditionWithArgument.class.php | 2 +- .../ConditionWithoutArgument.class.php | 2 +- classes/db/queryparts/limit/Limit.class.php | 2 +- .../queryparts/order/OrderByColumn.class.php | 2 +- .../table/CubridTableWithHint.class.php | 2 +- .../db/queryparts/table/IndexHint.class.php | 2 +- .../table/MssqlTableWithHint.class.php | 2 +- .../table/MysqlTableWithHint.class.php | 2 +- classes/db/queryparts/table/Table.class.php | 2 +- classes/display/DisplayHandler.class.php | 2 +- classes/editor/EditorHandler.class.php | 2 +- classes/extravar/Extravar.class.php | 4 +- classes/file/FileHandler.class.php | 2 +- classes/file/FileObject.class.php | 2 +- .../FrontEndFileHandler.class.php | 2 +- classes/handler/Handler.class.php | 2 +- classes/httprequest/XEHttpRequest.class.php | 2 +- classes/mail/Mail.class.php | 2 +- classes/mobile/Mobile.class.php | 2 +- classes/module/ModuleHandler.class.php | 2 +- classes/module/ModuleObject.class.php | 2 +- classes/object/Object.class.php | 2 +- classes/page/PageHandler.class.php | 2 +- classes/security/Security.class.php | 2 +- classes/security/conf/embedWhiteUrl.xml | 8 ++-- classes/template/TemplateHandler.class.php | 2 +- classes/validator/Validator.class.php | 2 +- classes/widget/WidgetHandler.class.php | 2 +- classes/xml/GeneralXmlParser.class.php | 2 +- classes/xml/XmlGenerator.class.php | 2 +- classes/xml/XmlJsFilter.class.php | 2 +- classes/xml/XmlLangParser.class.php | 2 +- classes/xml/XmlParser.class.php | 4 +- classes/xml/XmlQueryParser.class.php | 2 +- .../xml/xmlquery/argument/Argument.class.php | 2 +- .../argument/ConditionArgument.class.php | 2 +- .../xmlquery/argument/SortArgument.class.php | 2 +- .../queryargument/DefaultValue.class.php | 2 +- .../queryargument/QueryArgument.class.php | 2 +- .../queryargument/SortQueryArgument.class.php | 2 +- .../QueryArgumentValidator.class.php | 2 +- common/css/xe.css | 2 +- common/js/common.js | 2 +- common/js/js_app.js | 2 +- common/js/plugins/ui.calendar/ui.calendar.js | 2 +- .../plugins/ui.colorpicker/xe_colorpicker.js | 2 +- .../plugins/watchinput/jquery.watchinput.js | 2 +- common/js/xe.header.js | 2 +- common/js/xe.js | 10 ++--- common/js/xml_handler.js | 2 +- common/js/xml_js_filter.js | 2 +- config/config.inc.php | 2 +- config/func.inc.php | 2 +- index.php | 2 +- layouts/default/conf/info.xml | 4 +- layouts/xe_official/conf/info.xml | 40 +++++++++---------- layouts/xe_official/css/black.css | 2 +- layouts/xe_official/css/default.css | 2 +- layouts/xe_official/css/white.css | 2 +- libs/ftp.class.php | 2 +- m.layouts/colorCode/conf/info.xml | 18 ++++----- m.layouts/default/conf/info.xml | 20 +++++----- m.layouts/simpleGray/conf/info.xml | 10 ++--- modules/addon/addon.admin.controller.php | 2 +- modules/addon/addon.admin.model.php | 2 +- modules/addon/addon.admin.view.php | 2 +- modules/addon/addon.class.php | 2 +- modules/addon/addon.controller.php | 2 +- modules/addon/conf/info.xml | 20 +++++----- modules/admin/admin.admin.controller.php | 2 +- modules/admin/admin.admin.model.php | 2 +- modules/admin/admin.admin.view.php | 2 +- modules/admin/admin.class.php | 2 +- modules/admin/conf/info.xml | 18 ++++----- modules/admin/tpl/js/admin.js | 2 +- modules/admin/tpl/js/sitemap.js | 2 +- modules/adminlogging/adminlogging.class.php | 2 +- .../adminlogging/adminlogging.controller.php | 2 +- modules/adminlogging/adminlogging.model.php | 2 +- modules/adminlogging/conf/info.xml | 18 ++++----- .../autoinstall.admin.controller.php | 2 +- .../autoinstall/autoinstall.admin.model.php | 2 +- .../autoinstall/autoinstall.admin.view.php | 2 +- modules/autoinstall/autoinstall.class.php | 4 +- modules/autoinstall/autoinstall.lib.php | 8 ++-- modules/autoinstall/autoinstall.model.php | 2 +- modules/autoinstall/conf/info.xml | 14 +++---- modules/autoinstall/tpl/css/autoinstall.css | 2 +- modules/comment/comment.admin.controller.php | 2 +- modules/comment/comment.admin.view.php | 2 +- modules/comment/comment.class.php | 2 +- modules/comment/comment.controller.php | 2 +- modules/comment/comment.item.php | 2 +- modules/comment/comment.model.php | 2 +- modules/comment/comment.view.php | 2 +- modules/comment/conf/info.xml | 18 ++++----- .../communication.admin.controller.php | 2 +- .../communication.admin.model.php | 2 +- .../communication.admin.view.php | 2 +- modules/communication/communication.class.php | 2 +- .../communication.controller.php | 2 +- .../communication/communication.mobile.php | 2 +- modules/communication/communication.model.php | 2 +- modules/communication/communication.view.php | 2 +- modules/communication/conf/info.xml | 16 ++++---- .../communication/m.skins/default/skin.xml | 10 ++--- modules/communication/skins/default/skin.xml | 36 ++++++++--------- modules/counter/conf/info.xml | 18 ++++----- modules/counter/counter.admin.view.php | 2 +- modules/counter/counter.class.php | 2 +- modules/counter/counter.controller.php | 2 +- modules/counter/counter.model.php | 2 +- modules/document/conf/info.xml | 18 ++++----- .../document/document.admin.controller.php | 2 +- modules/document/document.admin.model.php | 2 +- modules/document/document.admin.view.php | 2 +- modules/document/document.class.php | 2 +- modules/document/document.controller.php | 2 +- modules/document/document.item.php | 2 +- modules/document/document.model.php | 2 +- modules/document/document.view.php | 2 +- modules/document/tpl/js/document_category.js | 2 +- .../components/emoticon/emoticon.class.php | 2 +- modules/editor/components/emoticon/info.xml | 18 ++++----- .../image_gallery/image_gallery.class.php | 2 +- .../editor/components/image_gallery/info.xml | 18 ++++----- .../image_gallery/tpl/list_gallery.js | 2 +- .../image_gallery/tpl/list_gallery.min.js | 2 +- .../image_gallery/tpl/popup.min.css | 2 +- .../image_gallery/tpl/slide_gallery.js | 2 +- .../image_gallery/tpl/slide_gallery.min.css | 2 +- .../image_gallery/tpl/slide_gallery.min.js | 2 +- .../image_link/image_link.class.php | 2 +- modules/editor/components/image_link/info.xml | 18 ++++----- .../components/multimedia_link/info.xml | 18 ++++----- .../multimedia_link/multimedia_link.class.php | 2 +- modules/editor/components/poll_maker/info.xml | 18 ++++----- .../poll_maker/poll_maker.class.php | 2 +- modules/editor/conf/info.xml | 18 ++++----- modules/editor/editor.admin.controller.php | 2 +- modules/editor/editor.admin.view.php | 2 +- modules/editor/editor.api.php | 2 +- modules/editor/editor.class.php | 2 +- modules/editor/editor.controller.php | 2 +- modules/editor/editor.model.php | 2 +- modules/editor/editor.view.php | 2 +- .../skins/dreditor/drcomponents/fold/info.xml | 10 ++--- .../dreditor/drcomponents/fold/tpl/fold.js | 2 +- modules/editor/skins/dreditor/js/DrEditor.js | 2 +- .../editor/skins/dreditor/js/Xpress_Editor.js | 2 +- .../editor/skins/dreditor/js/xe_interface.js | 2 +- modules/editor/skins/dreditor/skin.xml | 14 +++---- .../editor/skins/xpresseditor/css/default.css | 2 +- .../skins/xpresseditor/js/Xpress_Editor.js | 12 +++--- .../skins/xpresseditor/js/xpresseditor.js | 12 +++--- modules/editor/skins/xpresseditor/skin.xml | 30 +++++++------- modules/editor/styles/default/editor.css | 2 +- modules/editor/styles/default/skin.xml | 14 +++---- modules/editor/styles/default/style.css | 2 +- modules/editor/styles/dreditor/editor.css | 2 +- modules/editor/styles/dreditor/skin.xml | 6 +-- modules/editor/styles/dreditor/style.css | 2 +- modules/editor/styles/xeStyle/editor.css | 2 +- modules/editor/styles/xeStyle/skin.xml | 12 +++--- modules/editor/styles/xeStyle/style.css | 2 +- modules/editor/styles/xeStyleBlack/editor.css | 2 +- modules/editor/styles/xeStyleBlack/skin.xml | 12 +++--- modules/editor/styles/xeStyleBlack/style.css | 2 +- modules/editor/tpl/js/editor.js | 2 +- modules/editor/tpl/js/editor_admin.js | 2 +- modules/editor/tpl/js/uploader.js | 2 +- modules/file/conf/info.xml | 18 ++++----- modules/file/file.admin.controller.php | 2 +- modules/file/file.admin.model.php | 2 +- modules/file/file.admin.view.php | 2 +- modules/file/file.class.php | 2 +- modules/file/file.controller.php | 2 +- modules/file/file.model.php | 2 +- modules/file/file.view.php | 2 +- modules/importer/conf/info.xml | 18 ++++----- modules/importer/extract.class.php | 2 +- .../importer/importer.admin.controller.php | 2 +- modules/importer/importer.admin.view.php | 2 +- modules/importer/importer.class.php | 2 +- modules/importer/tpl/js/importer_admin.js | 2 +- modules/importer/tpl/js/importer_admin.min.js | 2 +- modules/importer/ttimport.class.php | 2 +- modules/install/conf/info.xml | 18 ++++----- modules/install/install.admin.controller.php | 2 +- modules/install/install.class.php | 2 +- modules/install/install.controller.php | 2 +- modules/install/install.view.php | 2 +- modules/install/tpl/css/install.css | 2 +- modules/integration_search/conf/info.xml | 18 ++++----- .../integration_search.admin.controller.php | 2 +- .../integration_search.admin.view.php | 2 +- .../integration_search.class.php | 2 +- .../integration_search.model.php | 2 +- .../integration_search.view.php | 2 +- .../integration_search/skins/default/skin.xml | 14 +++---- .../tpl/js/integration_search_admin.js | 2 +- modules/layout/conf/info.xml | 18 ++++----- modules/layout/faceoff/conf/info.xml | 20 +++++----- modules/layout/faceoff/css/layout.css | 2 +- modules/layout/layout.admin.controller.php | 2 +- modules/layout/layout.admin.model.php | 2 +- modules/layout/layout.admin.view.php | 2 +- modules/layout/layout.class.php | 2 +- modules/layout/layout.model.php | 2 +- modules/layout/layout.view.php | 2 +- modules/layout/tpl/css/faceoff_menu.css | 2 +- modules/layout/tpl/css/widget.css | 2 +- modules/layout/tpl/js/ui.hotkey.js | 2 +- modules/layout/tpl/js/ui.toolbar.js | 2 +- modules/member/conf/info.xml | 18 ++++----- modules/member/m.skins/default/skin.xml | 10 ++--- modules/member/member.admin.controller.php | 2 +- modules/member/member.admin.model.php | 2 +- modules/member/member.admin.view.php | 2 +- modules/member/member.api.php | 2 +- modules/member/member.class.php | 2 +- modules/member/member.controller.php | 2 +- modules/member/member.model.php | 2 +- modules/member/member.view.php | 2 +- modules/member/skins/default/skin.xml | 36 ++++++++--------- modules/member/tpl/js/signup_check.js | 2 +- modules/menu/conf/info.xml | 18 ++++----- modules/menu/menu.admin.controller.php | 2 +- modules/menu/menu.admin.model.php | 2 +- modules/menu/menu.admin.view.php | 2 +- modules/menu/menu.class.php | 2 +- modules/menu/menu.mobile.php | 2 +- modules/menu/tpl/js/sitemap.js | 2 +- modules/message/conf/info.xml | 18 ++++----- modules/message/message.admin.controller.php | 2 +- modules/message/message.admin.view.php | 2 +- modules/message/message.class.php | 2 +- modules/message/message.view.php | 2 +- modules/message/skins/default/message.css | 2 +- modules/module/conf/info.xml | 18 ++++----- modules/module/module.admin.controller.php | 2 +- modules/module/module.admin.model.php | 2 +- modules/module/module.admin.view.php | 2 +- modules/module/module.class.php | 2 +- modules/module/module.controller.php | 2 +- modules/module/module.model.php | 2 +- modules/module/module.view.php | 2 +- modules/module/tpl/js/module_admin.js | 2 +- modules/page/conf/info.xml | 18 ++++----- modules/page/m.skins/default/skin.xml | 16 ++++---- modules/page/page.admin.controller.php | 2 +- modules/page/page.admin.view.php | 2 +- modules/page/page.api.php | 2 +- modules/page/page.class.php | 2 +- modules/page/page.controller.php | 2 +- modules/page/page.view.php | 2 +- modules/page/page.wap.php | 2 +- modules/page/skins/default/skin.xml | 16 ++++---- modules/page/tpl/js/page_admin.js | 2 +- modules/point/conf/info.xml | 18 ++++----- modules/point/point.admin.controller.php | 2 +- modules/point/point.admin.view.php | 2 +- modules/point/point.class.php | 2 +- modules/point/point.controller.php | 2 +- modules/point/point.model.php | 2 +- modules/point/point.view.php | 2 +- modules/point/tpl/js/point_admin.js | 2 +- modules/poll/conf/info.xml | 18 ++++----- modules/poll/poll.admin.controller.php | 2 +- modules/poll/poll.admin.model.php | 2 +- modules/poll/poll.admin.view.php | 2 +- modules/poll/poll.class.php | 2 +- modules/poll/poll.controller.php | 2 +- modules/poll/poll.model.php | 2 +- modules/poll/skins/default/skin.xml | 14 +++---- modules/poll/skins/simple/skin.xml | 12 +++--- modules/poll/tpl/js/poll_admin.js | 2 +- modules/rss/conf/info.xml | 18 ++++----- modules/rss/rss.admin.controller.php | 2 +- modules/rss/rss.admin.view.php | 2 +- modules/rss/rss.class.php | 2 +- modules/rss/rss.controller.php | 2 +- modules/rss/rss.model.php | 2 +- modules/rss/rss.view.php | 2 +- modules/session/conf/info.xml | 14 +++---- modules/session/session.admin.controller.php | 2 +- modules/session/session.admin.view.php | 2 +- modules/session/session.class.php | 2 +- modules/session/session.controller.php | 2 +- modules/session/session.model.php | 2 +- modules/spamfilter/conf/info.xml | 18 ++++----- .../spamfilter.admin.controller.php | 2 +- modules/spamfilter/spamfilter.admin.view.php | 2 +- modules/spamfilter/spamfilter.class.php | 2 +- modules/spamfilter/spamfilter.controller.php | 2 +- modules/spamfilter/spamfilter.model.php | 2 +- modules/tag/conf/info.xml | 18 ++++----- modules/tag/tag.admin.controller.php | 2 +- modules/tag/tag.class.php | 2 +- modules/tag/tag.controller.php | 2 +- modules/tag/tag.model.php | 2 +- modules/trackback/conf/info.xml | 18 ++++----- .../trackback/trackback.admin.controller.php | 2 +- modules/trackback/trackback.admin.model.php | 2 +- modules/trackback/trackback.admin.view.php | 2 +- modules/trackback/trackback.class.php | 2 +- modules/trackback/trackback.controller.php | 2 +- modules/trackback/trackback.model.php | 2 +- modules/trackback/trackback.view.php | 2 +- modules/trash/conf/info.xml | 18 ++++----- modules/trash/tpl/js/trash_admin.js | 2 +- modules/trash/trash.admin.controller.php | 2 +- modules/trash/trash.admin.view.php | 2 +- modules/trash/trash.class.php | 2 +- modules/trash/trash.controller.php | 2 +- modules/trash/trash.model.php | 2 +- modules/trash/trash.view.php | 2 +- modules/widget/conf/info.xml | 18 ++++----- modules/widget/tpl/js/widget.js | 2 +- modules/widget/tpl/js/widget.min.js | 2 +- modules/widget/tpl/js/widget_admin.js | 2 +- modules/widget/widget.admin.view.php | 2 +- modules/widget/widget.class.php | 2 +- modules/widget/widget.controller.php | 2 +- modules/widget/widget.model.php | 2 +- modules/widget/widget.view.php | 2 +- .../xml/xmlquery/argument/data/en.lang.php | 2 +- tools/minify/minify.php | 2 +- widgets/content/conf/info.xml | 18 ++++----- widgets/content/content.class.php | 2 +- widgets/content/skins/default/skin.xml | 26 ++++++------ widgets/counter_status/conf/info.xml | 18 ++++----- .../counter_status/counter_status.class.php | 2 +- widgets/counter_status/skins/default/skin.xml | 14 +++---- widgets/language_select/conf/info.xml | 18 ++++----- .../language_select/language_select.class.php | 2 +- .../language_select/skins/default/skin.xml | 14 +++---- widgets/login_info/conf/info.xml | 18 ++++----- widgets/login_info/login_info.class.php | 2 +- widgets/login_info/skins/default/skin.xml | 4 +- widgets/login_info/skins/xe_global/skin.xml | 10 ++--- .../login_info/skins/xe_globalTwo/skin.xml | 10 ++--- widgets/login_info/skins/xe_official/skin.xml | 28 ++++++------- .../skins/xe_solid_enterprise_login/skin.xml | 16 ++++---- widgets/mcontent/conf/info.xml | 18 ++++----- widgets/mcontent/mcontent.class.php | 2 +- widgets/mcontent/skins/default/skin.xml | 6 +-- widgetstyles/simple/skin.xml | 14 +++---- 391 files changed, 1025 insertions(+), 1025 deletions(-) diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php index 6253d12fd..c18c47844 100644 --- a/addons/adminlogging/adminlogging.addon.php +++ b/addons/adminlogging/adminlogging.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file adminlogging.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Automatic link add-on */ $logged_info = Context::get('logged_info'); diff --git a/addons/adminlogging/conf/info.xml b/addons/adminlogging/conf/info.xml index b27e706ab..e1f196b9c 100644 --- a/addons/adminlogging/conf/info.xml +++ b/addons/adminlogging/conf/info.xml @@ -17,14 +17,14 @@ 2011-09-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php index 7d1a38743..9b0212c77 100644 --- a/addons/autolink/autolink.addon.php +++ b/addons/autolink/autolink.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file autolink.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Automatic link add-on */ if($called_position == 'after_module_proc' && Context::getResponseMethod() != "XMLRPC") diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js index ad2dcecf6..8b9973c82 100644 --- a/addons/autolink/autolink.js +++ b/addons/autolink/autolink.js @@ -1,7 +1,7 @@ /** * @file autolink.js * @brief javascript code for autolink addon - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ (function($){ var protocol_re = '(https?|ftp|news|telnet|irc|mms)://'; diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml index 62bad172d..f68dee081 100644 --- a/addons/autolink/conf/info.xml +++ b/addons/autolink/conf/info.xml @@ -40,14 +40,14 @@ 2008-04-22 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php index e1126450d..584437608 100644 --- a/addons/blogapi/blogapi.addon.php +++ b/addons/blogapi/blogapi.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file blogapicounter.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Add blogAPI * * It enables to write a post by using an external tool such as ms live writer, firefox performancing, zoundry and so on. diff --git a/addons/blogapi/blogapi.func.php b/addons/blogapi/blogapi.func.php index 338282a8e..eee750b39 100644 --- a/addons/blogapi/blogapi.func.php +++ b/addons/blogapi/blogapi.func.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file ./addons/blogapi/blogapi.func.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Function collections for the implementation of blogapi * */ // Error messages diff --git a/addons/blogapi/conf/info.xml b/addons/blogapi/conf/info.xml index 631184856..de1ce1a59 100644 --- a/addons/blogapi/conf/info.xml +++ b/addons/blogapi/conf/info.xml @@ -67,14 +67,14 @@ 2012-02-22 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php index f061488bd..9c8aae6f1 100644 --- a/addons/captcha/captcha.addon.php +++ b/addons/captcha/captcha.addon.php @@ -3,7 +3,7 @@ if(!defined("__XE__")) exit(); /** * @file captcha.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Captcha for a particular action * English alphabets and voice verification added * */ diff --git a/addons/captcha/conf/info.xml b/addons/captcha/conf/info.xml index bc8bd86ba..b740f34c1 100644 --- a/addons/captcha/conf/info.xml +++ b/addons/captcha/conf/info.xml @@ -37,13 +37,13 @@ 2010-08-19 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/counter/conf/info.xml b/addons/counter/conf/info.xml index afcd04ec0..a1de042c1 100644 --- a/addons/counter/conf/info.xml +++ b/addons/counter/conf/info.xml @@ -49,14 +49,14 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php index aa4952d6d..5208d0482 100644 --- a/addons/counter/counter.addon.php +++ b/addons/counter/counter.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file counter.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Counter add-on */ // Execute if called_position is before_display_content diff --git a/addons/member_communication/conf/info.xml b/addons/member_communication/conf/info.xml index 6b45e674e..ec4b150a9 100644 --- a/addons/member_communication/conf/info.xml +++ b/addons/member_communication/conf/info.xml @@ -45,15 +45,15 @@ 2008-05-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php index c2ce562b7..c3fe92f73 100644 --- a/addons/member_communication/member_communication.addon.php +++ b/addons/member_communication/member_communication.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file member_communication.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Promote user communication * * - Pop-up the message if new message comes in diff --git a/addons/member_extra_info/conf/info.xml b/addons/member_extra_info/conf/info.xml index f75c6d929..813553378 100644 --- a/addons/member_extra_info/conf/info.xml +++ b/addons/member_extra_info/conf/info.xml @@ -40,14 +40,14 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php index 20dca76fe..d7aa42ab3 100644 --- a/addons/member_extra_info/member_extra_info.addon.php +++ b/addons/member_extra_info/member_extra_info.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file image_name.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Display user image name/image mark * * Find member_srl in the part with
....
diff --git a/addons/mobile/classes/hdml.class.php b/addons/mobile/classes/hdml.class.php index a51eb79bc..868df7faa 100644 --- a/addons/mobile/classes/hdml.class.php +++ b/addons/mobile/classes/hdml.class.php @@ -1,7 +1,7 @@ 2009-05-23 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/mobile/mobile.addon.php b/addons/mobile/mobile.addon.php index 8539c64bd..5e9197f0d 100644 --- a/addons/mobile/mobile.addon.php +++ b/addons/mobile/mobile.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file mobile.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Mobile XE add-on * * If a mobile connection is made (see the header information), display contents with WAP tags diff --git a/addons/openid_delegation_id/conf/info.xml b/addons/openid_delegation_id/conf/info.xml index 9adf737f8..9e708f644 100644 --- a/addons/openid_delegation_id/conf/info.xml +++ b/addons/openid_delegation_id/conf/info.xml @@ -49,15 +49,15 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/openid_delegation_id/openid_delegation_id.addon.php b/addons/openid_delegation_id/openid_delegation_id.addon.php index 42c9a8a2d..ede67b7cd 100644 --- a/addons/openid_delegation_id/openid_delegation_id.addon.php +++ b/addons/openid_delegation_id/openid_delegation_id.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file openid_delegation_id.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief OpenID Delegation ID Add-on * * This enables to use openID as user's homepage or blog url. diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml index 2399143d3..546b24e51 100644 --- a/addons/point_level_icon/conf/info.xml +++ b/addons/point_level_icon/conf/info.xml @@ -49,14 +49,14 @@ 2007-07-26 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php index be46a3eb8..d02cfaa60 100644 --- a/addons/point_level_icon/point_level_icon.addon.php +++ b/addons/point_level_icon/point_level_icon.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file point.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Icon-on-point level * * Display point level icon before user name when point system is enabled. diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml index e50589268..571e56740 100644 --- a/addons/resize_image/conf/info.xml +++ b/addons/resize_image/conf/info.xml @@ -40,14 +40,14 @@ 2008-04-22 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php index 29ee1b319..7c72cc600 100644 --- a/addons/resize_image/resize_image.addon.php +++ b/addons/resize_image/resize_image.addon.php @@ -5,7 +5,7 @@ if(!defined('__XE__')) /** * @file resize_image.addon.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Add-on to resize images in the body */ if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML") diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php index 64a7d3d45..bfea1eba9 100644 --- a/classes/cache/CacheApc.class.php +++ b/classes/cache/CacheApc.class.php @@ -3,7 +3,7 @@ /** * Cache class for APC * - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) * */ class CacheApc extends CacheBase { diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php index dc574b6e3..b8b68181e 100644 --- a/classes/cache/CacheHandler.class.php +++ b/classes/cache/CacheHandler.class.php @@ -3,7 +3,7 @@ /** * CacheHandler * - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ class CacheHandler extends Handler { @@ -254,7 +254,7 @@ class CacheHandler extends Handler /** * Base class of Cache * - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ class CacheBase { diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php index 1ba319ef2..2432f2816 100644 --- a/classes/cache/CacheMemcache.class.php +++ b/classes/cache/CacheMemcache.class.php @@ -3,7 +3,7 @@ /** * Cache class for memcache * - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ class CacheMemcache extends CacheBase { diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 6fc4792dc..538a736a1 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -8,7 +8,7 @@ define('RELEASE_SSL', 2); * Manages Context such as request arguments/environment variables * It has dual method structure, easy-to use methods which can be called as Context::methodname(),and methods called with static object. * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class Context { diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 8ac6079ba..6b1d12e71 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -42,7 +42,7 @@ if(!defined('__XE_LOADED_DB_CLASS__')) * - query xml has unique query id, and will be created in module * - queryid = module_name.query_name * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index 4a4b26f53..aff375397 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -5,7 +5,7 @@ * - Cubrid DBMS to use the class * - Works with CUBRID up to 8.4.1 * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index 9f9e6d13a..88633609b 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -4,7 +4,7 @@ * - DBMSSQL * - Modified to use MSSQL driver by sol (sol@ngleader.com) * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 1e845a368..45bf30155 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -6,7 +6,7 @@ * * Does not use prepared statements, since mysql driver does not support them * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php index 039c62305..2c8cf1389 100644 --- a/classes/db/DBMysql_innodb.class.php +++ b/classes/db/DBMysql_innodb.class.php @@ -8,7 +8,7 @@ require_once('DBMysql.class.php'); * * Does not use prepared statements, since mysql driver does not support them * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/DBMysqli.class.php b/classes/db/DBMysqli.class.php index 2f4f4f723..e80f6e3f4 100644 --- a/classes/db/DBMysqli.class.php +++ b/classes/db/DBMysqli.class.php @@ -8,7 +8,7 @@ require_once('DBMysql.class.php'); * * Does not use prepared statements, since mysql driver does not support them * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/db * @version 0.1 */ diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php index 5d7448f02..251aad53d 100644 --- a/classes/db/queryparts/Query.class.php +++ b/classes/db/queryparts/Query.class.php @@ -1,7 +1,7 @@ - + http://serviceapi.nmv.naver.com/ http://scrap.ad.naver.com/ http://event.dn.naver.com/sbsplayer/vmplayer.xap - + http://test-player.naver.com/naverPlayer/posting/ http://alpha-player.naver.com/naverPlayer/posting/ http://beta-player.naver.com/naverPlayer/posting/ @@ -20,7 +20,7 @@ http://beta.player.music.naver.com/ http://stage.player.music.naver.com/ - + http://dev-idogame.hangame.com/idogame/ClientBin/iDoGamePlayer.xap http://idogame.hangame.com/idogame/ClientBin/iDoGamePlayer.xap @@ -191,7 +191,7 @@ http://dotsub.com/static/players/portalplayer.swf - + http://static.campaign.naver.com/0/campaign/2010/10/socialsearch/swf/ diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index ac33e3d4d..6f120d609 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -2,7 +2,7 @@ /** * @class TemplateHandler - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * template compiler * @version 0.1 * @remarks It compiles template file by using regular expression into php diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index 1c1ab55fb..b62570462 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -2,7 +2,7 @@ /** * Validator class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/validator * @version 0.1 */ diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 455f17157..397aebab5 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -2,7 +2,7 @@ /** * @class WidgetHandler - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief Handler class for widget execution * @remark it is empty for now, it would be removed in the future */ diff --git a/classes/xml/GeneralXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php index dfba383c2..3b6b4cfb0 100644 --- a/classes/xml/GeneralXmlParser.class.php +++ b/classes/xml/GeneralXmlParser.class.php @@ -3,7 +3,7 @@ /** * GeneralXmlParser class * Generic XML parser for XE - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.1 */ diff --git a/classes/xml/XmlGenerator.class.php b/classes/xml/XmlGenerator.class.php index 32714c2f2..220b1acd6 100644 --- a/classes/xml/XmlGenerator.class.php +++ b/classes/xml/XmlGenerator.class.php @@ -2,7 +2,7 @@ /** * XmlGenerator class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.1 */ diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index ef0274d43..48c72442b 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -41,7 +41,7 @@ * tag = key : name of variable that will contain the result of the execution * } * @class XmlJsFilter - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.2 */ diff --git a/classes/xml/XmlLangParser.class.php b/classes/xml/XmlLangParser.class.php index a4143b4a2..7767907c5 100644 --- a/classes/xml/XmlLangParser.class.php +++ b/classes/xml/XmlLangParser.class.php @@ -3,7 +3,7 @@ /** * XmlLangParser class * Change to lang php file from xml. - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.1 */ diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php index 035f791e3..54a978721 100644 --- a/classes/xml/XmlParser.class.php +++ b/classes/xml/XmlParser.class.php @@ -3,7 +3,7 @@ /** * Xml_Node_ class * Element node or attribute node. - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.1 */ @@ -30,7 +30,7 @@ class Xml_Node_ * attributes when kor is only supported language. It seems to work fine now but we did not scrutinze any potential side effects, * } * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml * @version 0.1 */ diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php index 67bab74d5..d4a7b2b6d 100644 --- a/classes/xml/XmlQueryParser.class.php +++ b/classes/xml/XmlQueryParser.class.php @@ -4,7 +4,7 @@ * XmlQueryParser * Case to parse XE xml query * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @version 0.1 * @todo need to support extend query such as subquery, union */ diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php index 32d027a28..e836839ae 100644 --- a/classes/xml/xmlquery/argument/Argument.class.php +++ b/classes/xml/xmlquery/argument/Argument.class.php @@ -2,7 +2,7 @@ /** * Argument class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/argument * @version 0.1 */ diff --git a/classes/xml/xmlquery/argument/ConditionArgument.class.php b/classes/xml/xmlquery/argument/ConditionArgument.class.php index b0302e458..c31acd704 100644 --- a/classes/xml/xmlquery/argument/ConditionArgument.class.php +++ b/classes/xml/xmlquery/argument/ConditionArgument.class.php @@ -2,7 +2,7 @@ /** * ConditionArgument class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/argument * @version 0.1 */ diff --git a/classes/xml/xmlquery/argument/SortArgument.class.php b/classes/xml/xmlquery/argument/SortArgument.class.php index 38320581f..c2623a1e1 100644 --- a/classes/xml/xmlquery/argument/SortArgument.class.php +++ b/classes/xml/xmlquery/argument/SortArgument.class.php @@ -2,7 +2,7 @@ /** * SortArgument class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/argument * @version 0.1 */ diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php index 0159eb64d..16e13a96b 100644 --- a/classes/xml/xmlquery/queryargument/DefaultValue.class.php +++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php @@ -2,7 +2,7 @@ /** * DefaultValue class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/queryargument * @version 0.1 */ diff --git a/classes/xml/xmlquery/queryargument/QueryArgument.class.php b/classes/xml/xmlquery/queryargument/QueryArgument.class.php index a38765927..f2f2725bf 100644 --- a/classes/xml/xmlquery/queryargument/QueryArgument.class.php +++ b/classes/xml/xmlquery/queryargument/QueryArgument.class.php @@ -2,7 +2,7 @@ /** * QueryArgument class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/queryargument * @version 0.1 */ diff --git a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php index 61a3b5f7f..dc17ce1c1 100644 --- a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php +++ b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php @@ -2,7 +2,7 @@ /** * SortQueryArgument class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/queryargument * @version 0.1 */ diff --git a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php index c077516ae..943d6e278 100644 --- a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php +++ b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php @@ -2,7 +2,7 @@ /** * QueryArgumentValidator class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /classes/xml/xmlquery/queryargument/validator * @version 0.1 */ diff --git a/common/css/xe.css b/common/css/xe.css index 8263038b5..5d2d53a19 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* Element Reset */ body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block} diff --git a/common/js/common.js b/common/js/common.js index d3779a297..d72b1293d 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -1,6 +1,6 @@ /** * @file common.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음 **/ diff --git a/common/js/js_app.js b/common/js/js_app.js index 9c115fa8d..5f2f1e9ad 100644 --- a/common/js/js_app.js +++ b/common/js/js_app.js @@ -1,6 +1,6 @@ /** * @file js_app.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief XE JavaScript Application Framework (JAF) * @namespace xe * @update 20100701 diff --git a/common/js/plugins/ui.calendar/ui.calendar.js b/common/js/plugins/ui.calendar/ui.calendar.js index f59d4d814..35b654c1f 100644 --- a/common/js/plugins/ui.calendar/ui.calendar.js +++ b/common/js/plugins/ui.calendar/ui.calendar.js @@ -1,6 +1,6 @@ /** * @brief XE Calendar - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * * 사용법 * diff --git a/common/js/plugins/ui.colorpicker/xe_colorpicker.js b/common/js/plugins/ui.colorpicker/xe_colorpicker.js index 6930a7db3..70e8426da 100644 --- a/common/js/plugins/ui.colorpicker/xe_colorpicker.js +++ b/common/js/plugins/ui.colorpicker/xe_colorpicker.js @@ -1,6 +1,6 @@ /** * @brief XE Colorpicker - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ jQuery(function($){ diff --git a/common/js/plugins/watchinput/jquery.watchinput.js b/common/js/plugins/watchinput/jquery.watchinput.js index 1654ac33c..535555de7 100644 --- a/common/js/plugins/watchinput/jquery.watchinput.js +++ b/common/js/plugins/watchinput/jquery.watchinput.js @@ -1,6 +1,6 @@ /** * @brief Watch Input box - * @author NHN (developers@xpresseingine.com) + * @author NAVER (developers@xpresseingine.com) **/ (function($){ diff --git a/common/js/xe.header.js b/common/js/xe.header.js index 9a29487a0..9455dd3a0 100644 --- a/common/js/xe.header.js +++ b/common/js/xe.header.js @@ -1,5 +1,5 @@ /** * @file common/js/xe.min.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief XE Common JavaScript **/ diff --git a/common/js/xe.js b/common/js/xe.js index cb3ad6567..0589a30d7 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -1,11 +1,11 @@ /** * @file common/js/xe.min.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief XE Common JavaScript **/ /** * @file js_app.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief XE JavaScript Application Framework (JAF) * @namespace xe * @update 20100701 @@ -284,7 +284,7 @@ $(window).load(function(){ xe.broadcast('ONLOAD'); }); })(jQuery); /** * @file common.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음 **/ @@ -1428,7 +1428,7 @@ function xml2json(xml, tab, ignoreAttrib) { (function($){ /** * @brief exec_xml - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) { var xml_path = request_uri+"index.php" @@ -1701,7 +1701,7 @@ $(function($){ })(jQuery); /** * @file common/js/xml_js_filter.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief xml filter (validator) plugin * * A rule is a method validate one field. diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index d1e57148b..9ce8e2173 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -177,7 +177,7 @@ function xml2json(xml, tab, ignoreAttrib) { (function($){ /** * @brief exec_xml - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) { var xml_path = request_uri+"index.php" diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index 4a93a2b09..5e2a8b40f 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -1,6 +1,6 @@ /** * @file common/js/xml_js_filter.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief xml filter (validator) plugin * * A rule is a method validate one field. diff --git a/config/config.inc.php b/config/config.inc.php index 5d0daeba1..66d923cd6 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -4,7 +4,7 @@ * set the include of the class file and other environment configurations * * @file config/config.inc.php - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ if(version_compare(PHP_VERSION, '5.4.0', '<')) { diff --git a/config/func.inc.php b/config/func.inc.php index 04a3fd86c..875871651 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -3,7 +3,7 @@ /** * function library files for convenience * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ if(!defined('__XE__')) { diff --git a/index.php b/index.php index 6dcc6ad47..690b6a22d 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@ 1.0 2013-02-28 - NHN - NHN + NAVER + NAVER diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml index 1355aedce..33d20afff 100644 --- a/layouts/xe_official/conf/info.xml +++ b/layouts/xe_official/conf/info.xml @@ -12,59 +12,59 @@ XE Resmi Websitesi Yerleşim Düzeni XE 공식 사이트 레이아웃입니다. - 제작 : NHN + 제작 : NAVER XEの公式サイトのレイアウトです。 - 제작 : NHN + 제작 : NAVER This layout is the Official website layout for XE. - 제작 : NHN + 제작 : NAVER Dieses Layout ist das XE Offizielle Website-Layout. - 제작 : NHN + 제작 : NAVER Этот формат является XE Официальный сайт компоновку. - 제작 : NHN + 제작 : NAVER Este diseño is el diseño oficial de la página web de Zerobard XE. - 제작 : NHN + 제작 : NAVER XE官方网站布局。 - 제작 : NHN + 제작 : NAVER XE官方網站版面。 - 제작 : NHN + 제작 : NAVER Đây là giao diện chính thức của XE. - 제작 : NHN + 제작 : NAVER Bu yerleşim düzeni, XE'nin resmi website yerleşim düzenidir. - 제작 : NHN + 제작 : NAVER 0.1 2007-08-01 http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/layouts/xe_official/css/black.css b/layouts/xe_official/css/black.css index 8813fea6d..4912d3702 100644 --- a/layouts/xe_official/css/black.css +++ b/layouts/xe_official/css/black.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* Site Layout - Body Wrap */ body{background:#000} .xe{position:relative;width:960px;margin:0 auto;padding:1.5em 0 0 0;font-family:Tahoma, Geneva, sans-serif} diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css index e3794dfd3..762c9bfab 100644 --- a/layouts/xe_official/css/default.css +++ b/layouts/xe_official/css/default.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* Default Skin - Start */ .selectLang{margin:0;padding:0} /* Site Layout - Body Wrap */ diff --git a/layouts/xe_official/css/white.css b/layouts/xe_official/css/white.css index d4850085d..7b60801ee 100644 --- a/layouts/xe_official/css/white.css +++ b/layouts/xe_official/css/white.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* Site Layout - Body Wrap */ body{background:#fff} .xe{position:relative;width:960px;margin:0 auto;padding:1.5em 0 0 0;font-family:Tahoma, Geneva, sans-serif} diff --git a/libs/ftp.class.php b/libs/ftp.class.php index c716bda90..1494a96c2 100644 --- a/libs/ftp.class.php +++ b/libs/ftp.class.php @@ -2,7 +2,7 @@ /********************************************************************* * * PHP FTP Client Class By TOMO ( groove@spencernetwork.org ) - * Modified By NHN ( developers@xpressengine.com ) + * Modified By NAVER ( developers@xpressengine.com ) * * - Version 0.13 (2010/09/29) * diff --git a/m.layouts/colorCode/conf/info.xml b/m.layouts/colorCode/conf/info.xml index d9b0cfa44..c952da22c 100644 --- a/m.layouts/colorCode/conf/info.xml +++ b/m.layouts/colorCode/conf/info.xml @@ -7,33 +7,33 @@ XE Color Code 移动布局 XE Color Code 모바일 레이아웃입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) XEの Color Code レイアウトです。 - 제작 : NHN + 제작 : NAVER This layout is the XE Color Code Mobile layout for XE. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) XE Color Code 移动布局 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) XE Color Code 官方網站版面。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2012-03-14 http://xpressengine.com/ - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER diff --git a/m.layouts/default/conf/info.xml b/m.layouts/default/conf/info.xml index bffa955ba..8ce012b9d 100644 --- a/m.layouts/default/conf/info.xml +++ b/m.layouts/default/conf/info.xml @@ -7,34 +7,34 @@ XE Resmi Hareketli Yerleşim Düzeni XE 공식 모바일 레이아웃입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) This layout is the Official website layout for XE. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 官方移动版布局。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) XE Mobile 官方網站版面。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Bu yerleşim düzeni, XE Resmi website yerleşim düzenidir. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2010-08-20 http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/m.layouts/simpleGray/conf/info.xml b/m.layouts/simpleGray/conf/info.xml index eee95afd3..137f037b6 100644 --- a/m.layouts/simpleGray/conf/info.xml +++ b/m.layouts/simpleGray/conf/info.xml @@ -35,11 +35,11 @@ http://xpressengine.com - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php index e156e882d..24a333063 100644 --- a/modules/addon/addon.admin.controller.php +++ b/modules/addon/addon.admin.controller.php @@ -4,7 +4,7 @@ require_once(_XE_PATH_ . 'modules/addon/addon.controller.php'); /** * Admin controller class of addon modules - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class addonAdminController extends addonController { diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index 4e943277f..2bcaec5f4 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -2,7 +2,7 @@ /** * Admin model class of addon module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class addonAdminModel extends addon { diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php index 3d4342c17..8bdfa0d9f 100644 --- a/modules/addon/addon.admin.view.php +++ b/modules/addon/addon.admin.view.php @@ -2,7 +2,7 @@ /** * Admin view class of addon modules - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class addonAdminView extends addon { diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php index db18ea60a..0b238262e 100644 --- a/modules/addon/addon.class.php +++ b/modules/addon/addon.class.php @@ -2,7 +2,7 @@ /** * High class of addon modules - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class addon extends ModuleObject { diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index d57d9f147..894936497 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -2,7 +2,7 @@ /** * Addon module's controller class - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class addonController extends addon { diff --git a/modules/addon/conf/info.xml b/modules/addon/conf/info.xml index d3efe5005..efd0955d8 100644 --- a/modules/addon/conf/info.xml +++ b/modules/addon/conf/info.xml @@ -25,15 +25,15 @@ utility - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index bc9023d01..f268a39ac 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -3,7 +3,7 @@ /** * adminAdminController class * admin controller class of admin module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/admin * @version 0.1 */ diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index d61db110a..91dad5667 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -3,7 +3,7 @@ /** * adminAdminModel class * admin model class of admin module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/admin * @version 0.1 */ diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index b68031fc6..abb26dff1 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -4,7 +4,7 @@ * adminAdminView class * Admin view class of admin module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/admin * @version 0.1 */ diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index d74e09608..962accdfd 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -4,7 +4,7 @@ * admin class * Base class of admin module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/admin * @version 0.1 */ diff --git a/modules/admin/conf/info.xml b/modules/admin/conf/info.xml index c89621d83..1d5f9163b 100644 --- a/modules/admin/conf/info.xml +++ b/modules/admin/conf/info.xml @@ -23,14 +23,14 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 2675a5458..4f549e18e 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -1,4 +1,4 @@ -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ // install module function doInstallModule(module) { var params = new Array(); diff --git a/modules/admin/tpl/js/sitemap.js b/modules/admin/tpl/js/sitemap.js index c4207f859..3027f48f7 100644 --- a/modules/admin/tpl/js/sitemap.js +++ b/modules/admin/tpl/js/sitemap.js @@ -1,4 +1,4 @@ -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ jQuery(function($){ var diff --git a/modules/adminlogging/adminlogging.class.php b/modules/adminlogging/adminlogging.class.php index 93c28c617..6ec6ed3aa 100644 --- a/modules/adminlogging/adminlogging.class.php +++ b/modules/adminlogging/adminlogging.class.php @@ -4,7 +4,7 @@ * adminlogging class * Base class of adminlogging module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/adminlogging * @version 0.1 */ diff --git a/modules/adminlogging/adminlogging.controller.php b/modules/adminlogging/adminlogging.controller.php index 62eb68d51..e1da018a9 100644 --- a/modules/adminlogging/adminlogging.controller.php +++ b/modules/adminlogging/adminlogging.controller.php @@ -4,7 +4,7 @@ * adminloggingController class * controller class of adminlogging module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/adminlogging * @version 0.1 */ diff --git a/modules/adminlogging/adminlogging.model.php b/modules/adminlogging/adminlogging.model.php index f4499de92..f9638d7ef 100644 --- a/modules/adminlogging/adminlogging.model.php +++ b/modules/adminlogging/adminlogging.model.php @@ -4,7 +4,7 @@ * adminloggingModel class * model class of adminlogging module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/adminlogging * @version 0.1 */ diff --git a/modules/adminlogging/conf/info.xml b/modules/adminlogging/conf/info.xml index 866d49e04..571790707 100644 --- a/modules/adminlogging/conf/info.xml +++ b/modules/adminlogging/conf/info.xml @@ -7,14 +7,14 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index ad16760fe..f4e530586 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -5,7 +5,7 @@ require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php'); /** * autoinstall module admin controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class autoinstallAdminController extends autoinstall { diff --git a/modules/autoinstall/autoinstall.admin.model.php b/modules/autoinstall/autoinstall.admin.model.php index b4d814dfd..113a1540a 100644 --- a/modules/autoinstall/autoinstall.admin.model.php +++ b/modules/autoinstall/autoinstall.admin.model.php @@ -2,7 +2,7 @@ /** * Model class of the autoinstall module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class autoinstallAdminModel extends autoinstall { diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 2fa4aa811..40fc1dfc0 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -2,7 +2,7 @@ /** * Admin view class in the autoinstall module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class autoinstallAdminView extends autoinstall { diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php index 5128ca002..aaa64eff9 100644 --- a/modules/autoinstall/autoinstall.class.php +++ b/modules/autoinstall/autoinstall.class.php @@ -2,7 +2,7 @@ /** * XML Generater - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class XmlGenerater { @@ -54,7 +54,7 @@ class XmlGenerater /** * High class of the autoinstall module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class autoinstall extends ModuleObject { diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 851e8c169..1d8bab883 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -4,7 +4,7 @@ require_once(_XE_PATH_ . 'libs/ftp.class.php'); /** * Module installer - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class ModuleInstaller { @@ -314,7 +314,7 @@ class ModuleInstaller /** * Module installer for SFTP - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class SFTPModuleInstaller extends ModuleInstaller { @@ -483,7 +483,7 @@ class SFTPModuleInstaller extends ModuleInstaller /** * Module installer for PHP FTP - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class PHPFTPModuleInstaller extends ModuleInstaller { @@ -697,7 +697,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller /** * Module installer for FTP - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class FTPModuleInstaller extends ModuleInstaller { diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index 3a6e018da..89f2ebf75 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -2,7 +2,7 @@ /** * Model class of the autoinstall module - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class autoinstallModel extends autoinstall { diff --git a/modules/autoinstall/conf/info.xml b/modules/autoinstall/conf/info.xml index d57e03849..bb57e2c34 100644 --- a/modules/autoinstall/conf/info.xml +++ b/modules/autoinstall/conf/info.xml @@ -19,12 +19,12 @@ 2009-11-11 system - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/autoinstall/tpl/css/autoinstall.css b/modules/autoinstall/tpl/css/autoinstall.css index 41694ddb0..6c5090a10 100644 --- a/modules/autoinstall/tpl/css/autoinstall.css +++ b/modules/autoinstall/tpl/css/autoinstall.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ a>i{opacity:.5;filter:alpha(opacity=50)} .x_label, .x_badge{font-weight:normal} diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index 10050d3d8..4b4d40060 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -4,7 +4,7 @@ * commentAdminController class * admin controller class of the comment module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php index 03bc81597..26af7f9e2 100644 --- a/modules/comment/comment.admin.view.php +++ b/modules/comment/comment.admin.view.php @@ -4,7 +4,7 @@ * commentAdminView class * admin view class of the comment module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php index fae2f3708..495728597 100644 --- a/modules/comment/comment.class.php +++ b/modules/comment/comment.class.php @@ -6,7 +6,7 @@ require_once(_XE_PATH_ . 'modules/comment/comment.item.php'); * comment * comment module's high class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index b787ef218..b078fae33 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -4,7 +4,7 @@ * commentController class * controller class of the comment module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 628d8f40f..1a8d436ad 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -4,7 +4,7 @@ * commentItem class * comment Object * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 2c9f8a83c..726b8286b 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -4,7 +4,7 @@ * commentModel class * model class of the comment module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php index 8f0221530..262ea8ce4 100644 --- a/modules/comment/comment.view.php +++ b/modules/comment/comment.view.php @@ -4,7 +4,7 @@ * commentView class * comment module's view class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/comment * @version 0.1 */ diff --git a/modules/comment/conf/info.xml b/modules/comment/conf/info.xml index e1393920f..2342a5034 100644 --- a/modules/comment/conf/info.xml +++ b/modules/comment/conf/info.xml @@ -23,14 +23,14 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index 43ad84679..1329e388a 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -2,7 +2,7 @@ /** * @class communicationAdminController - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief communication module of the admin controller class */ class communicationAdminController extends communication diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php index 38d318cdf..3fad20f4e 100644 --- a/modules/communication/communication.admin.model.php +++ b/modules/communication/communication.admin.model.php @@ -2,7 +2,7 @@ /** * @class communicationAdminModel - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief communication module of the admin model class */ class communicationAdminModel extends communication diff --git a/modules/communication/communication.admin.view.php b/modules/communication/communication.admin.view.php index d34c8eb6e..6e80048dc 100644 --- a/modules/communication/communication.admin.view.php +++ b/modules/communication/communication.admin.view.php @@ -2,7 +2,7 @@ /** * @class communicationAdminView - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * communication module of the admin view class */ class communicationAdminView extends communication diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php index d9438d6c8..2551833ed 100644 --- a/modules/communication/communication.class.php +++ b/modules/communication/communication.class.php @@ -2,7 +2,7 @@ /** * @class communication - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * communication module of the high class */ class communication extends ModuleObject diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index d72c8252b..1f8e5bb43 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -2,7 +2,7 @@ /** * @class communicationController - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * communication module of the Controller class */ class communicationController extends communication diff --git a/modules/communication/communication.mobile.php b/modules/communication/communication.mobile.php index c7337234d..427870b23 100644 --- a/modules/communication/communication.mobile.php +++ b/modules/communication/communication.mobile.php @@ -4,7 +4,7 @@ require_once(_XE_PATH_ . 'modules/communication/communication.view.php'); /** * @class communicationMobile - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * Mobile class of communication module */ class communicationMobile extends communicationView diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index b96c2c052..37415a2a5 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -2,7 +2,7 @@ /** * @class communicationModel - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * communication module of the Model class */ class communicationModel extends communication diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 23a9b2ae5..41c941a8d 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -2,7 +2,7 @@ /** * @class communicationView - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * View class of communication module */ class communicationView extends communication diff --git a/modules/communication/conf/info.xml b/modules/communication/conf/info.xml index 76ba64468..3ec988633 100644 --- a/modules/communication/conf/info.xml +++ b/modules/communication/conf/info.xml @@ -21,13 +21,13 @@ member - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/communication/m.skins/default/skin.xml b/modules/communication/m.skins/default/skin.xml index 6dbcff553..fa8169aea 100644 --- a/modules/communication/m.skins/default/skin.xml +++ b/modules/communication/m.skins/default/skin.xml @@ -3,14 +3,14 @@ XE 커뮤니케이션 모바일 기본 스킨 XE 커뮤니케이션 모바일 기본 스킨입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2012-08-07 - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER diff --git a/modules/communication/skins/default/skin.xml b/modules/communication/skins/default/skin.xml index 0bfc15498..7cc5d5217 100644 --- a/modules/communication/skins/default/skin.xml +++ b/modules/communication/skins/default/skin.xml @@ -10,44 +10,44 @@ 預設面板 Varsayılan Dış Görünüm - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2008-05-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/counter/conf/info.xml b/modules/counter/conf/info.xml index 2b610bf04..ffe760e24 100644 --- a/modules/counter/conf/info.xml +++ b/modules/counter/conf/info.xml @@ -23,14 +23,14 @@ statistics - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/counter/counter.admin.view.php b/modules/counter/counter.admin.view.php index 5e6bf8299..a0050052d 100644 --- a/modules/counter/counter.admin.view.php +++ b/modules/counter/counter.admin.view.php @@ -3,7 +3,7 @@ /** * Admin view class of counter module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class counterAdminView extends counter { diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php index a5924168a..887f70070 100644 --- a/modules/counter/counter.class.php +++ b/modules/counter/counter.class.php @@ -3,7 +3,7 @@ /** * High class of counter module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class counter extends ModuleObject { diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php index 17bdd626b..6d65a87f8 100644 --- a/modules/counter/counter.controller.php +++ b/modules/counter/counter.controller.php @@ -3,7 +3,7 @@ /** * Counter module's controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class counterController extends counter { diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php index d6117452b..9baff0991 100644 --- a/modules/counter/counter.model.php +++ b/modules/counter/counter.model.php @@ -3,7 +3,7 @@ /** * Model class of counter module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class counterModel extends counter { diff --git a/modules/document/conf/info.xml b/modules/document/conf/info.xml index 0c2f9118a..6507b3dec 100644 --- a/modules/document/conf/info.xml +++ b/modules/document/conf/info.xml @@ -23,14 +23,14 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index e401fd42d..597012365 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -3,7 +3,7 @@ * documentAdminController class * Document the module's admin controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.admin.model.php b/modules/document/document.admin.model.php index 614bcf172..77b3d38dd 100644 --- a/modules/document/document.admin.model.php +++ b/modules/document/document.admin.model.php @@ -3,7 +3,7 @@ * documentAdminModel class * Document the module's admin model class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 6e4685dfb..cb343756b 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -3,7 +3,7 @@ * documentAdminView class * Document admin view of the module class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.class.php b/modules/document/document.class.php index 4a648ea35..bc065ce33 100644 --- a/modules/document/document.class.php +++ b/modules/document/document.class.php @@ -6,7 +6,7 @@ require_once(_XE_PATH_.'modules/document/document.item.php'); * @brief document the module's high class * {@internal Silently adds one extra Foo to compensate for lack of Foo } * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index a4677133f..21c6674e0 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -3,7 +3,7 @@ * documentController class * document the module's controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 1137d7a76..b1f4c18b9 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -3,7 +3,7 @@ * documentItem class * document object * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 3e66483f3..dcf5ed0bf 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -3,7 +3,7 @@ * documentModel class * model class of the module document * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/document.view.php b/modules/document/document.view.php index 17bcc9caa..462b81784 100644 --- a/modules/document/document.view.php +++ b/modules/document/document.view.php @@ -3,7 +3,7 @@ * documentView class * View class of the module document * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/document * @version 0.1 */ diff --git a/modules/document/tpl/js/document_category.js b/modules/document/tpl/js/document_category.js index 77c2b77c5..3a9344c63 100644 --- a/modules/document/tpl/js/document_category.js +++ b/modules/document/tpl/js/document_category.js @@ -1,6 +1,6 @@ /** * @file modules/document/tpl/js/document_category.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief document 모듈의 category tree javascript **/ diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php index d810a114a..36816474f 100644 --- a/modules/editor/components/emoticon/emoticon.class.php +++ b/modules/editor/components/emoticon/emoticon.class.php @@ -1,7 +1,7 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/components/image_gallery/image_gallery.class.php b/modules/editor/components/image_gallery/image_gallery.class.php index 54a250356..487ac9226 100644 --- a/modules/editor/components/image_gallery/image_gallery.class.php +++ b/modules/editor/components/image_gallery/image_gallery.class.php @@ -1,7 +1,7 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.js b/modules/editor/components/image_gallery/tpl/list_gallery.js index 41acf3b4b..64ff3b163 100644 --- a/modules/editor/components/image_gallery/tpl/list_gallery.js +++ b/modules/editor/components/image_gallery/tpl/list_gallery.js @@ -1,7 +1,7 @@ /** * @file list_gallery.js * @brief List-type image gallery - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ (function($){ diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.min.js b/modules/editor/components/image_gallery/tpl/list_gallery.min.js index 3d9a37584..6f05edaf9 100644 --- a/modules/editor/components/image_gallery/tpl/list_gallery.min.js +++ b/modules/editor/components/image_gallery/tpl/list_gallery.min.js @@ -1,7 +1,7 @@ /** * @file list_gallery.js * @brief List-type image gallery - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ (function(l){var h=xe.createPlugin("list",{API_SHOW_LIST:function(j,h){var d=h[0],e,f,k,b,a,g,c;e=this.cast("GET_IMAGES",[d]);if(e.length){d=l("#zone_list_gallery_"+d).empty();width=d.innerWidth();f=0;for(k=e.length;fwidth-25&&(g=width-25,a=g/a,c=Math.floor(c*a),a=g,b.$obj.attr("rel","xe_gallery")),d.append(b.$obj),b.$obj.css({width:a+"px",height:c,margin:"0 10px",display:"block"})}}}), j=xe.getApp("Gallery")[0];j&&j.registerPlugin(new h)})(jQuery); diff --git a/modules/editor/components/image_gallery/tpl/popup.min.css b/modules/editor/components/image_gallery/tpl/popup.min.css index 128196c55..a902492c0 100644 --- a/modules/editor/components/image_gallery/tpl/popup.min.css +++ b/modules/editor/components/image_gallery/tpl/popup.min.css @@ -1,6 +1,6 @@ /** * @file slide_gallery.js * @brief Slideshow type image gallery plugin - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ @charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";@import "../../../../../common/css/bootstrap.min.css"; \ No newline at end of file diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.js b/modules/editor/components/image_gallery/tpl/slide_gallery.js index b2aa90358..5d5bd5163 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.js +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.js @@ -1,7 +1,7 @@ /** * @file slide_gallery.js * @brief Slideshow type image gallery plugin - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ (function($){ diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.min.css b/modules/editor/components/image_gallery/tpl/slide_gallery.min.css index ccf996add..79cc3cdec 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.min.css +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.min.css @@ -1,6 +1,6 @@ /** * @file slide_gallery.js * @brief Slideshow type image gallery plugin - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ @charset "utf-8";.slide_gallery_loading_text{color:#555555;font-size:8pt;font-family:tahoma;font-weight:bold;margin:20px 0px 20px 0px;text-align:center}.slide_gallery_navigator_box{font-size:9pt;text-align:center;margin:5px 0px 5px 0px}.zone_gallery_navigator_status{color:#444444;font-family:verdana;font-size:8pt;cursor:pointer}.slide_gallery_navigator_box img{vertical-align:bottom}.slide_gallery_main_image_box{border:3px solid #EEEEEE;margin:10px}.slide_gallery_thumbnail_image_box{margin:10px;text-align:center}.slide_gallery_thumbnail_image_box img{border:1px solid #555555;padding:1px;margin:4px}.slide_gallery_filename{margin:5px 0px 10px 0px}.slide_gallery_filename A{color:#000000;text-decoration:none} \ No newline at end of file diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.min.js b/modules/editor/components/image_gallery/tpl/slide_gallery.min.js index ccf3489c3..a143813f5 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.min.js +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.min.js @@ -1,7 +1,7 @@ /** * @file slide_gallery.js * @brief Slideshow type image gallery plugin - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) **/ (function(l){var n=xe.createPlugin("slideShow",{_holders:{},_thumbs:{},_current:{},init:function(){this._holders={};this._thumbs={};this._current={}},API_SHOW_SLIDE:function(h,f){var b=this,a=f[0],d="@"+a,c,e,k,j,g,m;c=this.cast("GET_IMAGES",[a]);if(c.length){g=0;for(e=c.length;g2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/components/multimedia_link/info.xml b/modules/editor/components/multimedia_link/info.xml index 3ea53ca3f..12a1719c5 100644 --- a/modules/editor/components/multimedia_link/info.xml +++ b/modules/editor/components/multimedia_link/info.xml @@ -22,14 +22,14 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php index 13885d10d..537da6a19 100644 --- a/modules/editor/components/multimedia_link/multimedia_link.class.php +++ b/modules/editor/components/multimedia_link/multimedia_link.class.php @@ -1,7 +1,7 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index 3bc470a8b..000f8096c 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -1,7 +1,7 @@ utility - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php index 35f14ff0d..1cf30669d 100644 --- a/modules/editor/editor.admin.controller.php +++ b/modules/editor/editor.admin.controller.php @@ -1,7 +1,7 @@ 0.2 - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js index cd1182e21..e1fcaa792 100644 --- a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js +++ b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js @@ -1,6 +1,6 @@ /** * Fold component - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ jQuery(function($){ diff --git a/modules/editor/skins/dreditor/js/DrEditor.js b/modules/editor/skins/dreditor/js/DrEditor.js index 56e37fbee..71eec4bf1 100644 --- a/modules/editor/skins/dreditor/js/DrEditor.js +++ b/modules/editor/skins/dreditor/js/DrEditor.js @@ -1,6 +1,6 @@ /** * 단락에디터 Paragraph Editor - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ (function($){ diff --git a/modules/editor/skins/dreditor/js/Xpress_Editor.js b/modules/editor/skins/dreditor/js/Xpress_Editor.js index 9f57f3bb7..645003795 100644 --- a/modules/editor/skins/dreditor/js/Xpress_Editor.js +++ b/modules/editor/skins/dreditor/js/Xpress_Editor.js @@ -5619,7 +5619,7 @@ xe.XE_FormatWithSelectUI = jQuery.Class({ (function($){ /** * Enhanced Table Fetures - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ // 표 편집 확장 기능 diff --git a/modules/editor/skins/dreditor/js/xe_interface.js b/modules/editor/skins/dreditor/js/xe_interface.js index 27ed52426..115ad1997 100644 --- a/modules/editor/skins/dreditor/js/xe_interface.js +++ b/modules/editor/skins/dreditor/js/xe_interface.js @@ -1,7 +1,7 @@ /** * @file xe_interface.js * @brief XE Editor Standard Interface - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ (function($){ diff --git a/modules/editor/skins/dreditor/skin.xml b/modules/editor/skins/dreditor/skin.xml index 98a737303..900e4105a 100644 --- a/modules/editor/skins/dreditor/skin.xml +++ b/modules/editor/skins/dreditor/skin.xml @@ -31,13 +31,13 @@ 1.3.0 2010-04-30 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 43c2387f0..0f07b0706 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* TextEditor */ .xeTextEditor {margin:0 12px 0 0} .xeTextEditor textarea {display:block;margin:0;padding:5px} diff --git a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js index ffe43da58..d92d287ac 100644 --- a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js +++ b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js @@ -2816,7 +2816,7 @@ var TextRange = function(oEl) { /** * Selection for textfield - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ TextRange.prototype.getSelection = function() { var obj = this._o; @@ -5102,7 +5102,7 @@ var oMessageMap = { xe.XpressCore.oMessageMap = oMessageMap; /** * XHTML Formatter - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ var regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig, @@ -5265,7 +5265,7 @@ xe.XE_XHTMLFormatter = $.Class({ /** * Support XE extensions - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_Extension = $.Class({ name : "XE_Extension", @@ -5352,7 +5352,7 @@ xe.XE_Extension = $.Class({ }); /** * Auto saving - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_AutoSave = $.Class({ name : "XE_AutoSave", @@ -5399,7 +5399,7 @@ xe.XE_AutoSave = $.Class({ }); /** * Format Block plugin - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_FormatWithSelectUI = $.Class({ name : "XE_FormatWithSelectUI", @@ -5439,7 +5439,7 @@ xe.XE_FormatWithSelectUI = $.Class({ }); /** * Enhanced Table Fetures - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ // 표 편집 확장 기능 diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js index c9b9b0b9a..767f7f176 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js @@ -2816,7 +2816,7 @@ var TextRange = function(oEl) { /** * Selection for textfield - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ TextRange.prototype.getSelection = function() { var obj = this._o; @@ -5102,7 +5102,7 @@ var oMessageMap = { xe.XpressCore.oMessageMap = oMessageMap; /** * XHTML Formatter - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ var regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig, @@ -5265,7 +5265,7 @@ xe.XE_XHTMLFormatter = $.Class({ /** * Support XE extensions - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_Extension = $.Class({ name : "XE_Extension", @@ -5352,7 +5352,7 @@ xe.XE_Extension = $.Class({ }); /** * Auto saving - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_AutoSave = $.Class({ name : "XE_AutoSave", @@ -5399,7 +5399,7 @@ xe.XE_AutoSave = $.Class({ }); /** * Format Block plugin - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ xe.XE_FormatWithSelectUI = $.Class({ name : "XE_FormatWithSelectUI", @@ -5439,7 +5439,7 @@ xe.XE_FormatWithSelectUI = $.Class({ }); /** * Enhanced Table Fetures - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ // 표 편집 확장 기능 diff --git a/modules/editor/skins/xpresseditor/skin.xml b/modules/editor/skins/xpresseditor/skin.xml index 30a4017ed..f0c714350 100644 --- a/modules/editor/skins/xpresseditor/skin.xml +++ b/modules/editor/skins/xpresseditor/skin.xml @@ -9,25 +9,25 @@ XpressEditor面板 XpressEditor Dış Görünümü - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER - XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi NHN + XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi NAVER - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER - XpressEditor based on SmartEditor Basic by NHN + XpressEditor based on SmartEditor Basic by NAVER XpressEditor, SmartEditor 'e dayanmaktadır. @@ -35,14 +35,14 @@ 0.3.16 2009-03-22 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css index 059364e94..b6b7abf7f 100644 --- a/modules/editor/styles/default/editor.css +++ b/modules/editor/styles/default/editor.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ html,body{height:100%} body{margin:0;padding:0} .xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word} diff --git a/modules/editor/styles/default/skin.xml b/modules/editor/styles/default/skin.xml index 7b79a9e34..de273ee6c 100644 --- a/modules/editor/styles/default/skin.xml +++ b/modules/editor/styles/default/skin.xml @@ -38,12 +38,12 @@ 0.0.1 2009-05-23 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/styles/default/style.css b/modules/editor/styles/default/style.css index d48a19630..28b5adbf0 100755 --- a/modules/editor/styles/default/style.css +++ b/modules/editor/styles/default/style.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ .xe_content{color:#000;font-size:12px;line-height:1.5} .xe_content blockquote.q1, .xe_content blockquote.q2, diff --git a/modules/editor/styles/dreditor/editor.css b/modules/editor/styles/dreditor/editor.css index a4979f436..d72206f77 100644 --- a/modules/editor/styles/dreditor/editor.css +++ b/modules/editor/styles/dreditor/editor.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ html, body{height:100%;background-color:transparent;padding:0;margin:0} .xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word} .xe_content blockquote.q1, diff --git a/modules/editor/styles/dreditor/skin.xml b/modules/editor/styles/dreditor/skin.xml index b8656ced6..9cbaaf697 100644 --- a/modules/editor/styles/dreditor/skin.xml +++ b/modules/editor/styles/dreditor/skin.xml @@ -18,8 +18,8 @@ 0.1 2010-05-25 - NHN - NHN - NHN + NAVER + NAVER + NAVER diff --git a/modules/editor/styles/dreditor/style.css b/modules/editor/styles/dreditor/style.css index 6ea7f053b..809d7c3a4 100644 --- a/modules/editor/styles/dreditor/style.css +++ b/modules/editor/styles/dreditor/style.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ .xe_content{font-size:12px;line-height:1.6;clear:both} .xe_content h1{font-size:24px} .xe_content h2{font-size:20px} diff --git a/modules/editor/styles/xeStyle/editor.css b/modules/editor/styles/xeStyle/editor.css index bd6faccb7..ea716b3f5 100755 --- a/modules/editor/styles/xeStyle/editor.css +++ b/modules/editor/styles/xeStyle/editor.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ html, body{height:100%;background-color:transparent;padding:0;margin:0} .xe_content.editable {margin-right:8px;word-break:break-all;word-wrap:break-word} .xe_content.editable h1, diff --git a/modules/editor/styles/xeStyle/skin.xml b/modules/editor/styles/xeStyle/skin.xml index f5b3f9bde..18cb1caa0 100644 --- a/modules/editor/styles/xeStyle/skin.xml +++ b/modules/editor/styles/xeStyle/skin.xml @@ -35,11 +35,11 @@ 0.0.1 2009-04-17 - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/styles/xeStyle/style.css b/modules/editor/styles/xeStyle/style.css index 5f7d778a5..590cda33d 100755 --- a/modules/editor/styles/xeStyle/style.css +++ b/modules/editor/styles/xeStyle/style.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ .xe_content{color:#000;font-size:12px} .xe_content blockquote.q1, .xe_content blockquote.q2, diff --git a/modules/editor/styles/xeStyleBlack/editor.css b/modules/editor/styles/xeStyleBlack/editor.css index bb0253bce..d0e49bd13 100644 --- a/modules/editor/styles/xeStyleBlack/editor.css +++ b/modules/editor/styles/xeStyleBlack/editor.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ html, body{height:100%;background-color:transparent;padding:0;margin:0} .xe_content.editable{margin-right:8px;word-break:break-all;word-wrap:break-word} .xe_content.editable h1, diff --git a/modules/editor/styles/xeStyleBlack/skin.xml b/modules/editor/styles/xeStyleBlack/skin.xml index 26238c13a..84823641d 100644 --- a/modules/editor/styles/xeStyleBlack/skin.xml +++ b/modules/editor/styles/xeStyleBlack/skin.xml @@ -36,11 +36,11 @@ 0.0.1 2009-04-17 - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/editor/styles/xeStyleBlack/style.css b/modules/editor/styles/xeStyleBlack/style.css index 48bd9ea6d..ce4b31234 100755 --- a/modules/editor/styles/xeStyleBlack/style.css +++ b/modules/editor/styles/xeStyleBlack/style.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ .xe_content{color:#fff;font-size:12px} .xe_content blockquote.q1, .xe_content blockquote.q2, diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 805ef409d..592a7165b 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -1,5 +1,5 @@ /** - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @version 0.1 * @brief 에디터 관련 스크립트 */ diff --git a/modules/editor/tpl/js/editor_admin.js b/modules/editor/tpl/js/editor_admin.js index 1c8966f7a..a3e5fd349 100644 --- a/modules/editor/tpl/js/editor_admin.js +++ b/modules/editor/tpl/js/editor_admin.js @@ -1,5 +1,5 @@ /** - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @version 0.1 * @brief 에디터 관리자 페이지용 스크립트 **/ diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js index 51a835164..a86f52ac3 100755 --- a/modules/editor/tpl/js/uploader.js +++ b/modules/editor/tpl/js/uploader.js @@ -1,5 +1,5 @@ /** - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @version 0.1.1 * @brief 파일 업로드 관련 **/ diff --git a/modules/file/conf/info.xml b/modules/file/conf/info.xml index 92266fba1..66aef6bd3 100644 --- a/modules/file/conf/info.xml +++ b/modules/file/conf/info.xml @@ -23,14 +23,14 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php index 5b1605ec5..2fd2196d0 100644 --- a/modules/file/file.admin.controller.php +++ b/modules/file/file.admin.controller.php @@ -1,7 +1,7 @@ migration - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php index c20d4e341..7c6b7842e 100644 --- a/modules/importer/extract.class.php +++ b/modules/importer/extract.class.php @@ -3,7 +3,7 @@ * extract class * Class to save each file by using tags in the large xml * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/importer * @version 0.1 */ diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index c47b20aea..dee930ebc 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -6,7 +6,7 @@ require_once('./modules/importer/extract.class.php'); * importerAdminController class * admin controller class of importer module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/importer * @version 0.1 */ diff --git a/modules/importer/importer.admin.view.php b/modules/importer/importer.admin.view.php index 0067a580b..1bc20df0b 100644 --- a/modules/importer/importer.admin.view.php +++ b/modules/importer/importer.admin.view.php @@ -3,7 +3,7 @@ * importerAdminView class * admin view class of the importer module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/importer * @version 0.1 */ diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php index 8bd420e54..268eaf968 100644 --- a/modules/importer/importer.class.php +++ b/modules/importer/importer.class.php @@ -3,7 +3,7 @@ * importer * high class of importer module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/importer * @version 0.1 */ diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js index bc5e0f201..3d95b12d4 100644 --- a/modules/importer/tpl/js/importer_admin.js +++ b/modules/importer/tpl/js/importer_admin.js @@ -1,6 +1,6 @@ /** * @file modules/importer/js/importer_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief importer에서 사용하는 javascript **/ jQuery(function($){ diff --git a/modules/importer/tpl/js/importer_admin.min.js b/modules/importer/tpl/js/importer_admin.min.js index 14d97a873..b372fea29 100644 --- a/modules/importer/tpl/js/importer_admin.min.js +++ b/modules/importer/tpl/js/importer_admin.min.js @@ -1,6 +1,6 @@ /** * @file modules/importer/js/importer_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief importer에서 사용하는 javascript **/ jQuery(function($){$('.checkxml').find('input:text').change(function(){$(this).closest('.checkxml').find('.x_help-inline').hide()}).end().find('button').click(function(){var $this,$container,$input,$messages,$loading,$form,$syncmember,count;$this=$(this).prop('disabled',true);$form=$this.closest('form');$container=$this.closest('.checkxml');$input=$container.find('input').prop('disabled',true).addClass('loading');$message=$container.find('.x_help-inline').hide() diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index bb38934c2..a0a253359 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -6,7 +6,7 @@ * ttimport class * ttxml import class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/importer * @version 0.1 */ diff --git a/modules/install/conf/info.xml b/modules/install/conf/info.xml index dfa9eb5d9..3f09ebf9c 100644 --- a/modules/install/conf/info.xml +++ b/modules/install/conf/info.xml @@ -23,14 +23,14 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index af75d2519..00425f8c8 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -1,7 +1,7 @@ service - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php index d8cf34293..3f259d4d0 100644 --- a/modules/integration_search/integration_search.admin.controller.php +++ b/modules/integration_search/integration_search.admin.controller.php @@ -2,7 +2,7 @@ /** * The admin view class of the integration_search module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class integration_searchAdminController extends integration_search { diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php index c3d2fc815..420ba20fd 100644 --- a/modules/integration_search/integration_search.admin.view.php +++ b/modules/integration_search/integration_search.admin.view.php @@ -2,7 +2,7 @@ /** * The admin view class of the integration_search module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class integration_searchAdminView extends integration_search { diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php index 03c2a0001..482a42e29 100644 --- a/modules/integration_search/integration_search.class.php +++ b/modules/integration_search/integration_search.class.php @@ -2,7 +2,7 @@ /** * The view class of the integration_search module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class integration_search extends ModuleObject { diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index 8a5e11710..ae8e54437 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -2,7 +2,7 @@ /** * The model class of integration module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class integration_searchModel extends module { diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index f9cd03eac..cec782e15 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -2,7 +2,7 @@ /** * The view class of the integration_search module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class integration_searchView extends integration_search { diff --git a/modules/integration_search/skins/default/skin.xml b/modules/integration_search/skins/default/skin.xml index 2dc18a181..d6199e25d 100644 --- a/modules/integration_search/skins/default/skin.xml +++ b/modules/integration_search/skins/default/skin.xml @@ -18,13 +18,13 @@ 2007-07-24 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/integration_search/tpl/js/integration_search_admin.js b/modules/integration_search/tpl/js/integration_search_admin.js index 0ffa05049..c9e7bd5b3 100644 --- a/modules/integration_search/tpl/js/integration_search_admin.js +++ b/modules/integration_search/tpl/js/integration_search_admin.js @@ -1,5 +1,5 @@ /** * @file modules/board/js/board_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief integration_search 모듈의 관리자용 javascript **/ diff --git a/modules/layout/conf/info.xml b/modules/layout/conf/info.xml index a21d38b85..dcae2b02c 100644 --- a/modules/layout/conf/info.xml +++ b/modules/layout/conf/info.xml @@ -23,14 +23,14 @@ construction - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/layout/faceoff/conf/info.xml b/modules/layout/faceoff/conf/info.xml index ad7ae81ff..70b3303f4 100644 --- a/modules/layout/faceoff/conf/info.xml +++ b/modules/layout/faceoff/conf/info.xml @@ -15,16 +15,16 @@ 0.1 2009-01-02 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/layout/faceoff/css/layout.css b/modules/layout/faceoff/css/layout.css index 5585d797b..4a3dc91bf 100644 --- a/modules/layout/faceoff/css/layout.css +++ b/modules/layout/faceoff/css/layout.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* html{ overflow:auto;} */ diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index c7f8281db..c671fe4ea 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -1,7 +1,7 @@ UIT Center > Open UI Technology Team > Kim Taegon(gonom9@nhncorp.com) */ +/* NAVER > UIT Center > Open UI Technology Team > Kim Taegon(gonom9@nhncorp.com) */ /* toolbar */ #toolbar { position:relative; z-index:1000; background:url(../images/bgMenu.gif) repeat-x 0 0; font-size:12px; height:35px; clear:both; } diff --git a/modules/layout/tpl/css/widget.css b/modules/layout/tpl/css/widget.css index c3283cd11..78b1bba8c 100755 --- a/modules/layout/tpl/css/widget.css +++ b/modules/layout/tpl/css/widget.css @@ -1,5 +1,5 @@ @charset "utf-8"; -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ /* common */ .open{ display:block !important;} diff --git a/modules/layout/tpl/js/ui.hotkey.js b/modules/layout/tpl/js/ui.hotkey.js index f0fe5b336..7da9f15f6 100644 --- a/modules/layout/tpl/js/ui.hotkey.js +++ b/modules/layout/tpl/js/ui.hotkey.js @@ -1,6 +1,6 @@ /* * jQuery Hotkey Plug-in - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ (function($){ diff --git a/modules/layout/tpl/js/ui.toolbar.js b/modules/layout/tpl/js/ui.toolbar.js index 871503387..1de87cc03 100644 --- a/modules/layout/tpl/js/ui.toolbar.js +++ b/modules/layout/tpl/js/ui.toolbar.js @@ -1,6 +1,6 @@ /* * jQuery Toolbar Plug-in - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) */ (function($){ diff --git a/modules/member/conf/info.xml b/modules/member/conf/info.xml index 8bdd20638..edef6ff2a 100644 --- a/modules/member/conf/info.xml +++ b/modules/member/conf/info.xml @@ -23,14 +23,14 @@ member - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/member/m.skins/default/skin.xml b/modules/member/m.skins/default/skin.xml index 180a09ff4..68478332d 100644 --- a/modules/member/m.skins/default/skin.xml +++ b/modules/member/m.skins/default/skin.xml @@ -4,14 +4,14 @@ XE Basic Member Mobile Skin XE 기본 모바일 스킨 입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2012-09-21 - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 41739bdfb..28bbf0bc4 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -1,7 +1,7 @@ Varsayılan Kullanıcı Dış Görünümü 회원 기본 스킨 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 会员模块的默认皮肤。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 会員モジュールのデフォルトスキン - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) The default skin of the member - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Giao diện mặc định của Module Thành viên - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Por defecto de la piel miembro módulo - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) умолчанию кожу члена модуль - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 會員模組預設面板。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Üye modülünün varsayılan dış görünümü - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/member/tpl/js/signup_check.js b/modules/member/tpl/js/signup_check.js index 312eaa710..e267c09da 100644 --- a/modules/member/tpl/js/signup_check.js +++ b/modules/member/tpl/js/signup_check.js @@ -1,6 +1,6 @@ /** * @brief 회원 가입시나 정보 수정시 각 항목의 중복 검사등을 하는 기능을 구현 - * @author NHN (developer@xpressengine.com) + * @author NAVER (developer@xpressengine.com) **/ // 입력이 시작된 것과 입력후 정해진 시간동안 내용이 변하였을 경우 서버에 ajax로 체크를 하기 위한 변수 설정 diff --git a/modules/menu/conf/info.xml b/modules/menu/conf/info.xml index 9fe1754c2..77a83284f 100644 --- a/modules/menu/conf/info.xml +++ b/modules/menu/conf/info.xml @@ -23,14 +23,14 @@ construction - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 8f19bf4b4..c7d8348d7 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -3,7 +3,7 @@ * menuAdminController class * admin controller class of the menu module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/menu * @version 0.1 */ diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 1a9250646..6cd1c038d 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -3,7 +3,7 @@ * @class menuAdminModel * @brief admin model class of the menu module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/menu * @version 0.1 */ diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index b51b5efd3..14277317c 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -3,7 +3,7 @@ * menuAdminView class * admin view class of the menu module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/menu * @version 0.1 */ diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php index 2e36ae900..3fd50bf0b 100644 --- a/modules/menu/menu.class.php +++ b/modules/menu/menu.class.php @@ -3,7 +3,7 @@ * menu class * high class of the menu module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/menu * @version 0.1 */ diff --git a/modules/menu/menu.mobile.php b/modules/menu/menu.mobile.php index 4945818f2..862ff76cc 100644 --- a/modules/menu/menu.mobile.php +++ b/modules/menu/menu.mobile.php @@ -3,7 +3,7 @@ * menuMobile class * mobile class of the menu module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/menu * @version 0.1 */ diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js index b4ae216c8..fd44c7ed8 100644 --- a/modules/menu/tpl/js/sitemap.js +++ b/modules/menu/tpl/js/sitemap.js @@ -1,4 +1,4 @@ -/* NHN (developers@xpressengine.com) */ +/* NAVER (developers@xpressengine.com) */ jQuery(function($){ // get add/edit menu title diff --git a/modules/message/conf/info.xml b/modules/message/conf/info.xml index dcc951bb5..916e8aa99 100644 --- a/modules/message/conf/info.xml +++ b/modules/message/conf/info.xml @@ -23,14 +23,14 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/message/message.admin.controller.php b/modules/message/message.admin.controller.php index c286fe3e2..a6dd4d4d2 100644 --- a/modules/message/message.admin.controller.php +++ b/modules/message/message.admin.controller.php @@ -1,7 +1,7 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 39eedb423..d3691f583 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -1,7 +1,7 @@ service - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/page/m.skins/default/skin.xml b/modules/page/m.skins/default/skin.xml index dec89bdff..cac8ae394 100644 --- a/modules/page/m.skins/default/skin.xml +++ b/modules/page/m.skins/default/skin.xml @@ -9,14 +9,14 @@ 2012-08-30 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index ec8ee5d1f..d16a2a342 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -1,7 +1,7 @@ 2012-08-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js index 7ac0bc7ea..122544b66 100644 --- a/modules/page/tpl/js/page_admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -1,6 +1,6 @@ /** * @file modules/page/js/page_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief page모듈의 관리자용 javascript **/ diff --git a/modules/point/conf/info.xml b/modules/point/conf/info.xml index 2ef3dff79..537e6a680 100644 --- a/modules/point/conf/info.xml +++ b/modules/point/conf/info.xml @@ -59,14 +59,14 @@ member - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index c618933a0..b42c46376 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -1,7 +1,7 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php index fde28db90..5c46c0c06 100644 --- a/modules/poll/poll.admin.controller.php +++ b/modules/poll/poll.admin.controller.php @@ -1,7 +1,7 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/poll/skins/simple/skin.xml b/modules/poll/skins/simple/skin.xml index 1cc968eab..03896b383 100644 --- a/modules/poll/skins/simple/skin.xml +++ b/modules/poll/skins/simple/skin.xml @@ -16,12 +16,12 @@ 2008-04-16 - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/poll/tpl/js/poll_admin.js b/modules/poll/tpl/js/poll_admin.js index 3c87c4acb..55d796024 100644 --- a/modules/poll/tpl/js/poll_admin.js +++ b/modules/poll/tpl/js/poll_admin.js @@ -1,6 +1,6 @@ /** * @file modules/poll/js/poll_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief poll 모듈의 관리자용 javascript **/ diff --git a/modules/rss/conf/info.xml b/modules/rss/conf/info.xml index 705b1f0f6..fd6cc05d9 100644 --- a/modules/rss/conf/info.xml +++ b/modules/rss/conf/info.xml @@ -23,14 +23,14 @@ utility - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index d7282f14c..b1cf8ab36 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -2,7 +2,7 @@ /** * The admin controller class of the rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rssAdminController extends rss { diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php index 88fc0e311..c11967f85 100644 --- a/modules/rss/rss.admin.view.php +++ b/modules/rss/rss.admin.view.php @@ -2,7 +2,7 @@ /** * The admin view class of the rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rssAdminView extends rss { diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php index 72824f2f6..ac40f9c68 100644 --- a/modules/rss/rss.class.php +++ b/modules/rss/rss.class.php @@ -2,7 +2,7 @@ /** * High class of rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rss extends ModuleObject { diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php index 8ad364365..f33428f2c 100644 --- a/modules/rss/rss.controller.php +++ b/modules/rss/rss.controller.php @@ -2,7 +2,7 @@ /** * The controller class of rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rssController extends rss { diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php index b4663a0cc..25466790f 100644 --- a/modules/rss/rss.model.php +++ b/modules/rss/rss.model.php @@ -2,7 +2,7 @@ /** * The model class of the rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rssModel extends rss { diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php index 216c7c489..85ca77f29 100644 --- a/modules/rss/rss.view.php +++ b/modules/rss/rss.view.php @@ -2,7 +2,7 @@ /** * The view class of the rss module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) */ class rssView extends rss { diff --git a/modules/session/conf/info.xml b/modules/session/conf/info.xml index 8386403b3..95601549c 100644 --- a/modules/session/conf/info.xml +++ b/modules/session/conf/info.xml @@ -39,12 +39,12 @@ system - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/session/session.admin.controller.php b/modules/session/session.admin.controller.php index 581707b2b..62c42027c 100644 --- a/modules/session/session.admin.controller.php +++ b/modules/session/session.admin.controller.php @@ -1,7 +1,7 @@ accessory - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 0ca7dfe10..02c696ecb 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -1,7 +1,7 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/tag/tag.admin.controller.php b/modules/tag/tag.admin.controller.php index 249ef37aa..839c7a0bb 100644 --- a/modules/tag/tag.admin.controller.php +++ b/modules/tag/tag.admin.controller.php @@ -1,7 +1,7 @@ content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php index 78a67c5ff..18e94cae8 100644 --- a/modules/trackback/trackback.admin.controller.php +++ b/modules/trackback/trackback.admin.controller.php @@ -3,7 +3,7 @@ * trackbackAdminController class * trackback module admin controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php index 28e08377b..20db5873a 100644 --- a/modules/trackback/trackback.admin.model.php +++ b/modules/trackback/trackback.admin.model.php @@ -3,7 +3,7 @@ * @class trackbackAdminModel * @brief trackback module admin model class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php index ad136c15c..2f520d290 100644 --- a/modules/trackback/trackback.admin.view.php +++ b/modules/trackback/trackback.admin.view.php @@ -3,7 +3,7 @@ * trackbackAdminView class * trackback module admin view class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php index 40d81affd..99121b487 100644 --- a/modules/trackback/trackback.class.php +++ b/modules/trackback/trackback.class.php @@ -3,7 +3,7 @@ * trackback class * trackback module's high class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php index 51fb8f49d..ece0fae24 100644 --- a/modules/trackback/trackback.controller.php +++ b/modules/trackback/trackback.controller.php @@ -3,7 +3,7 @@ * trackbackController class * trackback module's Controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php index dfb5390ac..f9b4bfa85 100644 --- a/modules/trackback/trackback.model.php +++ b/modules/trackback/trackback.model.php @@ -3,7 +3,7 @@ * trackbackModel class * trackback module model class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php index b17c5667a..faea62bc8 100644 --- a/modules/trackback/trackback.view.php +++ b/modules/trackback/trackback.view.php @@ -3,7 +3,7 @@ * @class trackbackView * @brief trackback module's view class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trackback * @version 0.1 */ diff --git a/modules/trash/conf/info.xml b/modules/trash/conf/info.xml index 941e2e22c..b614da989 100644 --- a/modules/trash/conf/info.xml +++ b/modules/trash/conf/info.xml @@ -8,14 +8,14 @@ 2011-05-12 content - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/trash/tpl/js/trash_admin.js b/modules/trash/tpl/js/trash_admin.js index 46ca7de79..2c9204adf 100644 --- a/modules/trash/tpl/js/trash_admin.js +++ b/modules/trash/tpl/js/trash_admin.js @@ -1,6 +1,6 @@ /** * @file modules/trash/js/trash_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief trash 모듈의 관리자용 javascript **/ diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index d5bbb54de..abb918af0 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -3,7 +3,7 @@ * trashAdminController class * trash admin the module's controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index 3022ae0f2..5080bf8ec 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -3,7 +3,7 @@ * trashAdminView class * Admin view class of the trash module * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php index 07399bd1d..5e495719d 100644 --- a/modules/trash/trash.class.php +++ b/modules/trash/trash.class.php @@ -5,7 +5,7 @@ require_once(_XE_PATH_.'modules/trash/model/TrashVO.php'); * trash class * trash the module's high class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/trash/trash.controller.php b/modules/trash/trash.controller.php index f7490a983..876657213 100644 --- a/modules/trash/trash.controller.php +++ b/modules/trash/trash.controller.php @@ -3,7 +3,7 @@ * trashController * trash the module's controller class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php index 85e24c89a..cd8a13a3d 100644 --- a/modules/trash/trash.model.php +++ b/modules/trash/trash.model.php @@ -3,7 +3,7 @@ * trashModel class * trash the module's model class * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/trash/trash.view.php b/modules/trash/trash.view.php index 7ed577603..c1e7ff88a 100644 --- a/modules/trash/trash.view.php +++ b/modules/trash/trash.view.php @@ -3,7 +3,7 @@ * trashView class * View class of the module trash * - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @package /modules/trash * @version 0.1 */ diff --git a/modules/widget/conf/info.xml b/modules/widget/conf/info.xml index 4bdcf0365..c40935978 100644 --- a/modules/widget/conf/info.xml +++ b/modules/widget/conf/info.xml @@ -23,14 +23,14 @@ construction - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index 91d03a272..121714082 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -1,6 +1,6 @@ /** * @file modules/widget/js/widget.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief 위젯 관리용 자바스크립트 **/ diff --git a/modules/widget/tpl/js/widget.min.js b/modules/widget/tpl/js/widget.min.js index b9ea94d3c..89eacc1a0 100644 --- a/modules/widget/tpl/js/widget.min.js +++ b/modules/widget/tpl/js/widget.min.js @@ -1,6 +1,6 @@ /** * @file modules/widget/js/widget.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief 위젯 관리용 자바스크립트 **/ function getStyle(obj){var style=obj.getAttribute("style");if(!style)style=obj.style;if(typeof (style)=="object")style=style.cssText;style=style.replace(/\burl\s*\(\s*"(.*?)"\s*\)/i,"url('$1')");return style} diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js index 1b565376b..bb2f6ec26 100644 --- a/modules/widget/tpl/js/widget_admin.js +++ b/modules/widget/tpl/js/widget_admin.js @@ -1,6 +1,6 @@ /** * @file modules/widget/js/widget_admin.js - * @author NHN (developers@xpressengine.com) + * @author NAVER (developers@xpressengine.com) * @brief widget 모듈의 관리자용 javascript **/ diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php index 933a9e3b4..9c6542c51 100644 --- a/modules/widget/widget.admin.view.php +++ b/modules/widget/widget.admin.view.php @@ -1,7 +1,7 @@ 0.1 2009-03-16 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 789315259..f1923e54b 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -1,7 +1,7 @@ コンテンツウィジェットのデフォルトスキン Genel içerik durumunda varsayılan dış görünüm. Content 위젯 기본 스킨 입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Skin mặc định Widget Nội dung. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 全局内容控件默认皮肤。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 内容預設面板。 - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) コンテンツウィジェットのデフォルトスキン - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) Genel içerik durumunda varsayılan dış görünüm. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) 0.1 2009-02-10 http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/counter_status/conf/info.xml b/widgets/counter_status/conf/info.xml index 00a64ce30..6d98e9296 100644 --- a/widgets/counter_status/conf/info.xml +++ b/widgets/counter_status/conf/info.xml @@ -54,14 +54,14 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/counter_status/counter_status.class.php b/widgets/counter_status/counter_status.class.php index 3c235f947..c4ff67123 100644 --- a/widgets/counter_status/counter_status.class.php +++ b/widgets/counter_status/counter_status.class.php @@ -1,7 +1,7 @@ 2007-02-28 http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/language_select/conf/info.xml b/widgets/language_select/conf/info.xml index dee0e528f..f1af6d236 100644 --- a/widgets/language_select/conf/info.xml +++ b/widgets/language_select/conf/info.xml @@ -22,15 +22,15 @@ 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/language_select/language_select.class.php b/widgets/language_select/language_select.class.php index 1bab435f7..7715bc46a 100644 --- a/widgets/language_select/language_select.class.php +++ b/widgets/language_select/language_select.class.php @@ -1,7 +1,7 @@ http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/login_info/conf/info.xml b/widgets/login_info/conf/info.xml index aaccfe933..40e2a50bf 100644 --- a/widgets/login_info/conf/info.xml +++ b/widgets/login_info/conf/info.xml @@ -21,14 +21,14 @@ 0.1 2007-02-28 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php index b206f5b53..37118b8fe 100644 --- a/widgets/login_info/login_info.class.php +++ b/widgets/login_info/login_info.class.php @@ -1,7 +1,7 @@ 1.0 2013-02-28 - NHN - NHN + NAVER + NAVER \ No newline at end of file diff --git a/widgets/login_info/skins/xe_global/skin.xml b/widgets/login_info/skins/xe_global/skin.xml index 8ebbdf666..c17bb8af4 100644 --- a/widgets/login_info/skins/xe_global/skin.xml +++ b/widgets/login_info/skins/xe_global/skin.xml @@ -15,11 +15,11 @@ http://www.xpressengine.com - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/login_info/skins/xe_globalTwo/skin.xml b/widgets/login_info/skins/xe_globalTwo/skin.xml index 11a426612..0f4e17619 100644 --- a/widgets/login_info/skins/xe_globalTwo/skin.xml +++ b/widgets/login_info/skins/xe_globalTwo/skin.xml @@ -15,11 +15,11 @@ http://www.xpressengine.com - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/login_info/skins/xe_official/skin.xml b/widgets/login_info/skins/xe_official/skin.xml index 4607e4514..4930c645b 100644 --- a/widgets/login_info/skins/xe_official/skin.xml +++ b/widgets/login_info/skins/xe_official/skin.xml @@ -9,44 +9,44 @@ XE Resmi Giriş Bilgilerini Görüntüle. XE 공식 레이아웃에 적합한 로그인 정보 출력 위젯입니다. - 제작 : NHN + 제작 : NAVER XE公式レイアウトに適したログイン情報表示用のウィジェットです。 - 제작 : NHN + 제작 : NAVER This widget displays the login information for the Official layout of XE. - 제작 : NHN + 제작 : NAVER Widget hiển thị thông tin đăng nhập với giao diện chính thức của XE. - 제작 : NHN + 제작 : NAVER 适合XE 官房网站布局的登陆表单控件。 - 제작 : NHN + 제작 : NAVER 適合XE 官方網站登入面板。 - 제작 : NHN + 제작 : NAVER Bu görsel bileşen, XE Resmi yerleşim düzeni için uygun giriş bilgisidir. - 제작 : NHN + 제작 : NAVER 0.1 2007-02-28 http://xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml b/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml index 8a52b7dcf..511dc6470 100644 --- a/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml +++ b/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml @@ -9,7 +9,7 @@ XE Solid Enterprise Login Skin XE 기업용 레이아웃과 조합하여 쓰이도록 디자인 된 로그인 위젯스킨입니다. - NHN (developers@xpressengine.com) + NAVER (developers@xpressengine.com) The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently. @@ -40,13 +40,13 @@ http://www.xpressengine.com/ - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/mcontent/conf/info.xml b/widgets/mcontent/conf/info.xml index 25454791b..81ba42070 100644 --- a/widgets/mcontent/conf/info.xml +++ b/widgets/mcontent/conf/info.xml @@ -18,15 +18,15 @@ 2009-03-16 - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php index 4563b4da4..3e9c3eb24 100644 --- a/widgets/mcontent/mcontent.class.php +++ b/widgets/mcontent/mcontent.class.php @@ -1,7 +1,7 @@ 0.1 2009-08-20 - NHN - NHN - NHN + NAVER + NAVER + NAVER diff --git a/widgetstyles/simple/skin.xml b/widgetstyles/simple/skin.xml index a6a65b847..8ec2b37da 100644 --- a/widgetstyles/simple/skin.xml +++ b/widgetstyles/simple/skin.xml @@ -19,13 +19,13 @@ preview.gif - NHN - NHN - NHN - NHN - NHN - NHN - NHN + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER From f010a2ce7f7e55bfaf5b13f9f4852de09bbab285 Mon Sep 17 00:00:00 2001 From: ngleader Date: Thu, 7 Nov 2013 05:20:44 +0000 Subject: [PATCH 003/473] adding COPYING file for NAVER git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13181 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- COPYING | 1 + 1 file changed, 1 insertion(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..0809f3778 --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +Copyright (C) 2013 NAVER From acd89ccd9a07420fcc943e77910910fe3768cf29 Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 8 Nov 2013 03:44:04 +0000 Subject: [PATCH 004/473] issue 3633, protect from file upload hacking git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13182 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/security/UploadFileFilter.class.php | 40 +++++++++++++++++++ config/func.inc.php | 12 ++++++ modules/file/file.controller.php | 4 ++ .../integration_search.admin.controller.php | 4 +- modules/layout/layout.admin.controller.php | 7 +++- modules/member/member.controller.php | 10 +++++ modules/menu/menu.admin.controller.php | 35 ++++++++++++---- modules/module/module.admin.controller.php | 2 +- modules/module/module.controller.php | 9 ++++- modules/rss/rss.admin.controller.php | 3 +- 10 files changed, 111 insertions(+), 15 deletions(-) create mode 100644 classes/security/UploadFileFilter.class.php diff --git a/classes/security/UploadFileFilter.class.php b/classes/security/UploadFileFilter.class.php new file mode 100644 index 000000000..47e55f765 --- /dev/null +++ b/classes/security/UploadFileFilter.class.php @@ -0,0 +1,40 @@ +{$vars->name} = $module_info->{$vars->name}; continue; } - // Ignore if the file is not successfully uploaded - if(!is_uploaded_file($image_obj['tmp_name'])) + // Ignore if the file is not successfully uploaded, and check uploaded file + if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name'])) { unset($obj->{$vars->name}); continue; diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index c671fe4ea..02e074b1c 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -440,6 +440,9 @@ class layoutAdminController extends layout $filename = sprintf('%s.%s', md5($filename), $ext); } + // Check uploaded file + if(!checkUploadedFile($source['tmp_name'])) return false; + if(file_exists($path .'/'. $filename)) @unlink($path . $filename); if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false; return true; @@ -692,7 +695,7 @@ class layoutAdminController extends layout // check upload if(!Context::isUploaded()) exit(); $file = Context::get('file'); - if(!is_uploaded_file($file['tmp_name'])) exit(); + if(!is_uploaded_file($file['tmp_name']) || !checkUploadedFile($file['tmp_name'])) exit(); if(!preg_match('/\.(tar)$/i', $file['name'])) exit(); $layout_srl = Context::get('layout_srl'); @@ -927,7 +930,7 @@ class layoutAdminController extends layout $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile("after_upload_config_image.html"); - if(!$img['tmp_name'] || !is_uploaded_file($img['tmp_name'])) + if(!$img['tmp_name'] || !is_uploaded_file($img['tmp_name']) || !checkUploadedFile($img['tmp_name'])) { Context::set('msg', Context::getLang('upload failed')); return; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 2ea73a10f..a2c15a429 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -645,6 +645,10 @@ class memberController extends member */ function insertProfileImage($member_srl, $target_file) { + + // Check uploaded file + if(!checkUploadedFile($target_file)) return; + $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); // Get an image size @@ -706,6 +710,9 @@ class memberController extends member */ function insertImageName($member_srl, $target_file) { + // Check uploaded file + if(!checkUploadedFile($target_file)) return; + $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); // Get an image size @@ -812,6 +819,9 @@ class memberController extends member */ function insertImageMark($member_srl, $target_file) { + // Check uploaded file + if(!checkUploadedFile($target_file)) return; + $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); // Get an image size diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index c7d8348d7..b84191839 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1361,11 +1361,17 @@ class menuAdminController extends menu $target = Context::get('target'); $target_file = Context::get($target); // Error occurs when the target is neither a uploaded file nor a valid file - if(!$menu_srl || !$menu_item_srl || !$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)/i',$target_file['name'])) + if(!$menu_srl || !$menu_item_srl) { Context::set('error_messge', Context::getLang('msg_invalid_request')); - // Move the file to a specific director if the uploaded file meets requirement + } + else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name'])) + { + Context::set('error_messge', Context::getLang('msg_invalid_request')); + } + + // Move the file to a specific director if the uploaded file meets requirement else { $tmp_arr = explode('.',$target_file['name']); @@ -1977,8 +1983,12 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_normal_btn', $ext); - move_uploaded_file($args->menu_normal_btn['tmp_name'], $filename); - $returnArray['normal_btn'] = $filename; + + if(checkUploadedFile($args->menu_normal_btn['tmp_name'])) + { + move_uploaded_file ( $args->menu_normal_btn ['tmp_name'], $filename ); + $returnArray ['normal_btn'] = $filename; + } } // hover button @@ -1988,8 +1998,12 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext); - move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename); - $returnArray['hover_btn'] = $filename; + + if(checkUploadedFile($args->menu_hover_btn['tmp_name'])) + { + move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename); + $returnArray['hover_btn'] = $filename; + } } // active button @@ -1999,8 +2013,13 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext); - move_uploaded_file($args->menu_active_btn['tmp_name'], $filename); - $returnArray['active_btn'] = $filename; + + if(checkUploadedFile($args->menu_active_btn['tmp_name'])) + { + move_uploaded_file($args->menu_active_btn['tmp_name'], $filename); + $returnArray['active_btn'] = $filename; + } + } return $returnArray; } diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index d3691f583..752265c2b 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -436,7 +436,7 @@ class moduleAdminController extends module continue; } // Ignore if the file is not successfully uploaded - if(!is_uploaded_file($image_obj['tmp_name'])) + if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name'])) { unset($obj->{$vars->name}); continue; diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 35a40611e..8bd46c4a2 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -1134,7 +1134,8 @@ class moduleController extends module } else { - $this->add('save_filename', $output->get('save_filename')); + if($output) $this->add('save_filename', $output->get('save_filename')); + else $this->add('save_filename', ''); } } @@ -1156,6 +1157,9 @@ class moduleController extends module $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext); $tmp = $vars->addfile['tmp_name']; + // Check uploaded file + if(!checkUploadedFile($tmp)) return false; + if(!@move_uploaded_file($tmp, $save_filename)) { return false; @@ -1188,6 +1192,9 @@ class moduleController extends module $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext); $tmp = $vars->addfile['tmp_name']; + // Check uploaded file + if(!checkUploadedFile($tmp)) return false; + // upload if(!@move_uploaded_file($tmp, $save_filename)) { diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index b1cf8ab36..a1c2a165a 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -44,7 +44,7 @@ class rssAdminController extends rss $total_config->image = ''; } // Ignore if the file is not the one which has been successfully uploaded - if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name'])) + if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name']) && checkUploadedFile($image_obj['tmp_name'])) { // Ignore if the file is not an image (swf is accepted ~) $image_obj['name'] = Context::convertEncodingStr($image_obj['name']); @@ -59,6 +59,7 @@ class rssAdminController extends rss else { $filename = $path.$image_obj['name']; + // Move the file if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured'; else From 2ac48d1a3bd79eaa9656f6cb9c617b913e205aa4 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 8 Nov 2013 03:44:27 +0000 Subject: [PATCH 005/473] =?UTF-8?q?Issue=203634=20=EB=8C=93=EA=B8=80=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=8B=9C=20=20checkCSRF()=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13183 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/comment.controller.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index b078fae33..45f649d57 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -185,6 +185,11 @@ class commentController extends comment */ function insertComment($obj, $manual_inserted = FALSE) { + if(!$manual_inserted && !checkCSRF()) + { + return new Object(-1, 'msg_invalid_request'); + } + if(!is_object($obj)) { $obj = new stdClass(); From e0879ea45cdc36663a51d1603947e4019a84688b Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 8 Nov 2013 04:27:55 +0000 Subject: [PATCH 006/473] remove debugPrint git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13184 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/security/UploadFileFilter.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/security/UploadFileFilter.class.php b/classes/security/UploadFileFilter.class.php index 47e55f765..f49573e27 100644 --- a/classes/security/UploadFileFilter.class.php +++ b/classes/security/UploadFileFilter.class.php @@ -23,7 +23,6 @@ class UploadFileFilter if (FALSE !== $has_php_tag && FALSE !== strpos($content, $v)) { fclose($fp); - debugPrint('unvalid file'); return FALSE; } } @@ -31,7 +30,6 @@ class UploadFileFilter fclose($fp); - debugPrint('valid file'); return TRUE; } } From bce0a0b6d4db9ea26c68e4c37eca24e761318a10 Mon Sep 17 00:00:00 2001 From: akasima Date: Fri, 8 Nov 2013 05:52:51 +0000 Subject: [PATCH 007/473] copyright add to php files git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13186 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/adminlogging/adminlogging.addon.php | 1 + addons/autolink/autolink.addon.php | 1 + addons/blogapi/blogapi.addon.php | 1 + addons/blogapi/blogapi.func.php | 1 + addons/captcha/captcha.addon.php | 2 ++ addons/counter/counter.addon.php | 1 + addons/member_communication/member_communication.addon.php | 1 + addons/member_extra_info/member_extra_info.addon.php | 1 + addons/member_extra_info/member_extra_info.lib.php | 1 + addons/mobile/mobile.addon.php | 1 + addons/openid_delegation_id/openid_delegation_id.addon.php | 1 + addons/point_level_icon/point_level_icon.addon.php | 1 + addons/point_level_icon/point_level_icon.lib.php | 1 + addons/resize_image/resize_image.addon.php | 1 + admin/index.php | 2 ++ classes/cache/CacheApc.class.php | 1 + classes/cache/CacheFile.class.php | 1 + classes/cache/CacheHandler.class.php | 1 + classes/cache/CacheMemcache.class.php | 1 + classes/cache/CacheWincache.class.php | 1 + classes/context/Context.class.php | 1 + classes/db/DB.class.php | 1 + classes/db/DBCubrid.class.php | 1 + classes/db/DBMssql.class.php | 1 + classes/db/DBMysql.class.php | 1 + classes/db/DBMysql_innodb.class.php | 1 + classes/db/DBMysqli.class.php | 1 + classes/db/queryparts/Query.class.php | 1 + classes/db/queryparts/Subquery.class.php | 1 + classes/db/queryparts/condition/Condition.class.php | 1 + classes/db/queryparts/condition/ConditionGroup.class.php | 1 + classes/db/queryparts/condition/ConditionSubquery.class.php | 1 + .../db/queryparts/condition/ConditionWithArgument.class.php | 1 + .../queryparts/condition/ConditionWithoutArgument.class.php | 1 + .../db/queryparts/expression/ClickCountExpression.class.php | 1 + classes/db/queryparts/expression/DeleteExpression.class.php | 1 + classes/db/queryparts/expression/Expression.class.php | 1 + classes/db/queryparts/expression/InsertExpression.class.php | 1 + classes/db/queryparts/expression/SelectExpression.class.php | 1 + classes/db/queryparts/expression/StarExpression.class.php | 1 + classes/db/queryparts/expression/UpdateExpression.class.php | 1 + .../expression/UpdateExpressionWithoutArgument.class.php | 1 + classes/db/queryparts/limit/Limit.class.php | 1 + classes/db/queryparts/order/OrderByColumn.class.php | 1 + classes/db/queryparts/table/CubridTableWithHint.class.php | 1 + classes/db/queryparts/table/IndexHint.class.php | 1 + classes/db/queryparts/table/JoinTable.class.php | 1 + classes/db/queryparts/table/MssqlTableWithHint.class.php | 1 + classes/db/queryparts/table/MysqlTableWithHint.class.php | 1 + classes/db/queryparts/table/Table.class.php | 1 + classes/display/DisplayHandler.class.php | 1 + classes/display/HTMLDisplayHandler.php | 1 + classes/display/JSCallbackDisplayHandler.php | 1 + classes/display/JSONDisplayHandler.php | 1 + classes/display/VirtualXMLDisplayHandler.php | 1 + classes/display/XMLDisplayHandler.php | 1 + classes/editor/EditorHandler.class.php | 1 + classes/extravar/Extravar.class.php | 1 + classes/file/FileHandler.class.php | 1 + classes/file/FileObject.class.php | 1 + classes/frontendfile/FrontEndFileHandler.class.php | 1 + classes/handler/Handler.class.php | 1 + classes/httprequest/XEHttpRequest.class.php | 1 + classes/mail/Mail.class.php | 1 + classes/mobile/Mobile.class.php | 1 + classes/module/ModuleHandler.class.php | 1 + classes/module/ModuleObject.class.php | 1 + classes/object/Object.class.php | 1 + classes/page/PageHandler.class.php | 1 + classes/security/EmbedFilter.class.php | 1 + classes/security/Purifier.class.php | 1 + classes/security/Security.class.php | 1 + classes/security/UploadFileFilter.class.php | 1 + classes/template/TemplateHandler.class.php | 1 + classes/validator/Validator.class.php | 1 + classes/widget/WidgetHandler.class.php | 1 + classes/xml/GeneralXmlParser.class.php | 1 + classes/xml/XmlGenerator.class.php | 1 + classes/xml/XmlJsFilter.class.php | 1 + classes/xml/XmlLangParser.class.php | 1 + classes/xml/XmlParser.class.php | 1 + classes/xml/XmlQueryParser.150.class.php | 1 + classes/xml/XmlQueryParser.class.php | 1 + classes/xml/xmlquery/DBParser.class.php | 1 + classes/xml/xmlquery/QueryParser.class.php | 1 + classes/xml/xmlquery/argument/Argument.class.php | 1 + classes/xml/xmlquery/argument/ConditionArgument.class.php | 1 + classes/xml/xmlquery/argument/SortArgument.class.php | 1 + classes/xml/xmlquery/queryargument/DefaultValue.class.php | 1 + classes/xml/xmlquery/queryargument/QueryArgument.class.php | 1 + .../xml/xmlquery/queryargument/SortQueryArgument.class.php | 1 + .../queryargument/validator/QueryArgumentValidator.class.php | 1 + classes/xml/xmlquery/tags/column/ColumnTag.class.php | 1 + classes/xml/xmlquery/tags/column/InsertColumnTag.class.php | 1 + .../tags/column/InsertColumnTagWithoutArgument.class.php | 1 + classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php | 1 + classes/xml/xmlquery/tags/column/SelectColumnTag.class.php | 1 + classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php | 1 + classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php | 1 + classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php | 1 + .../xml/xmlquery/tags/condition/ConditionGroupTag.class.php | 1 + classes/xml/xmlquery/tags/condition/ConditionTag.class.php | 1 + classes/xml/xmlquery/tags/condition/ConditionsTag.class.php | 1 + .../xml/xmlquery/tags/condition/JoinConditionsTag.class.php | 1 + classes/xml/xmlquery/tags/group/GroupsTag.class.php | 1 + classes/xml/xmlquery/tags/navigation/IndexTag.class.php | 1 + classes/xml/xmlquery/tags/navigation/LimitTag.class.php | 1 + classes/xml/xmlquery/tags/navigation/NavigationTag.class.php | 1 + classes/xml/xmlquery/tags/query/QueryTag.class.php | 1 + classes/xml/xmlquery/tags/table/HintTableTag.class.php | 1 + classes/xml/xmlquery/tags/table/TableTag.class.php | 1 + classes/xml/xmlquery/tags/table/TablesTag.class.php | 1 + common/css/xe.css | 1 + common/css/xe.min.css | 2 +- common/js/foggyLayer.js | 2 +- common/js/html5.js | 2 +- common/js/plugins/filebox/filebox.js | 3 +-- common/js/plugins/ui.calendar/ui.calendar.js | 2 +- common/js/x.js | 2 +- config/config.inc.php | 1 + config/func.inc.php | 1 + config/package.inc.php | 1 + index.php | 1 + layouts/default/default.layout.css | 2 +- layouts/default/default.layout.ie7.css | 2 +- layouts/default/default.layout.ie78.css | 2 +- layouts/default/default.layout.webfont.css | 2 +- layouts/user_layout/user_layout.css | 2 +- layouts/xe_official/css/black.css | 2 +- layouts/xe_official/css/default.css | 2 +- layouts/xe_official/css/white.css | 2 +- m.layouts/colorCode/css/Blue/layout.css | 2 +- m.layouts/colorCode/css/Gray/layout.css | 2 +- m.layouts/colorCode/css/Orange/layout.css | 2 +- m.layouts/colorCode/css/Red/layout.css | 2 +- m.layouts/colorCode/css/nGreenA/layout.css | 2 +- m.layouts/colorCode/css/nGreenB/layout.css | 2 +- m.layouts/default/mx.css | 2 +- modules/addon/addon.admin.controller.php | 1 + modules/addon/addon.admin.model.php | 1 + modules/addon/addon.admin.view.php | 1 + modules/addon/addon.class.php | 1 + modules/addon/addon.controller.php | 1 + modules/admin/admin.admin.controller.php | 1 + modules/admin/admin.admin.model.php | 1 + modules/admin/admin.admin.view.php | 1 + modules/admin/admin.class.php | 1 + modules/adminlogging/adminlogging.class.php | 1 + modules/adminlogging/adminlogging.controller.php | 1 + modules/adminlogging/adminlogging.model.php | 1 + modules/autoinstall/autoinstall.admin.controller.php | 1 + modules/autoinstall/autoinstall.admin.model.php | 1 + modules/autoinstall/autoinstall.admin.view.php | 1 + modules/autoinstall/autoinstall.class.php | 1 + modules/autoinstall/autoinstall.lib.php | 1 + modules/autoinstall/autoinstall.model.php | 1 + modules/comment/comment.admin.controller.php | 1 + modules/comment/comment.admin.view.php | 1 + modules/comment/comment.class.php | 1 + modules/comment/comment.controller.php | 1 + modules/comment/comment.item.php | 1 + modules/comment/comment.model.php | 1 + modules/comment/comment.view.php | 1 + modules/communication/communication.admin.controller.php | 1 + modules/communication/communication.admin.model.php | 1 + modules/communication/communication.admin.view.php | 1 + modules/communication/communication.class.php | 1 + modules/communication/communication.controller.php | 1 + modules/communication/communication.mobile.php | 1 + modules/communication/communication.model.php | 1 + modules/communication/communication.view.php | 1 + modules/counter/counter.admin.view.php | 1 + modules/counter/counter.class.php | 1 + modules/counter/counter.controller.php | 1 + modules/counter/counter.model.php | 1 + modules/document/document.admin.controller.php | 2 ++ modules/document/document.admin.model.php | 2 ++ modules/document/document.admin.view.php | 1 + modules/document/document.class.php | 1 + modules/document/document.controller.php | 1 + modules/document/document.item.php | 1 + modules/document/document.model.php | 1 + modules/document/document.view.php | 1 + modules/editor/components/emoticon/emoticon.class.php | 1 + .../editor/components/image_gallery/image_gallery.class.php | 1 + modules/editor/components/image_link/image_link.class.php | 1 + .../components/multimedia_link/multimedia_link.class.php | 1 + modules/editor/components/poll_maker/poll_maker.class.php | 1 + modules/editor/editor.admin.controller.php | 1 + modules/editor/editor.admin.view.php | 1 + modules/editor/editor.api.php | 1 + modules/editor/editor.class.php | 1 + modules/editor/editor.controller.php | 1 + modules/editor/editor.model.php | 1 + modules/editor/editor.view.php | 2 ++ modules/file/file.admin.controller.php | 1 + modules/file/file.admin.model.php | 1 + modules/file/file.admin.view.php | 1 + modules/file/file.class.php | 1 + modules/file/file.controller.php | 1 + modules/file/file.model.php | 1 + modules/file/file.view.php | 1 + modules/importer/extract.class.php | 1 + modules/importer/importer.admin.controller.php | 1 + modules/importer/importer.admin.view.php | 1 + modules/importer/importer.class.php | 1 + modules/importer/ttimport.class.php | 1 + modules/install/install.admin.controller.php | 1 + modules/install/install.class.php | 1 + modules/install/install.controller.php | 1 + modules/install/install.model.php | 1 + modules/install/install.view.php | 1 + .../integration_search.admin.controller.php | 1 + modules/integration_search/integration_search.admin.view.php | 1 + modules/integration_search/integration_search.class.php | 1 + modules/integration_search/integration_search.model.php | 1 + modules/integration_search/integration_search.view.php | 1 + modules/layout/layout.admin.controller.php | 1 + modules/layout/layout.admin.model.php | 1 + modules/layout/layout.admin.view.php | 1 + modules/layout/layout.class.php | 1 + modules/layout/layout.model.php | 1 + modules/layout/layout.view.php | 1 + modules/member/member.admin.controller.php | 1 + modules/member/member.admin.model.php | 1 + modules/member/member.admin.view.php | 1 + modules/member/member.api.php | 1 + modules/member/member.class.php | 1 + modules/member/member.controller.php | 1 + modules/member/member.mobile.php | 1 + modules/member/member.model.php | 1 + modules/member/member.view.php | 1 + modules/menu/menu.admin.controller.php | 1 + modules/menu/menu.admin.model.php | 1 + modules/menu/menu.admin.view.php | 1 + modules/menu/menu.class.php | 1 + modules/menu/menu.mobile.php | 1 + modules/message/message.admin.controller.php | 1 + modules/message/message.admin.model.php | 3 ++- modules/message/message.admin.view.php | 1 + modules/message/message.class.php | 1 + modules/message/message.mobile.php | 1 + modules/message/message.view.php | 1 + modules/module/module.admin.controller.php | 1 + modules/module/module.admin.model.php | 1 + modules/module/module.admin.view.php | 1 + modules/module/module.class.php | 1 + modules/module/module.controller.php | 1 + modules/module/module.mobile.php | 1 + modules/module/module.model.php | 1 + modules/module/module.view.php | 1 + modules/page/page.admin.controller.php | 1 + modules/page/page.admin.view.php | 1 + modules/page/page.api.php | 1 + modules/page/page.class.php | 1 + modules/page/page.controller.php | 1 + modules/page/page.mobile.php | 1 + modules/page/page.view.php | 1 + modules/page/page.wap.php | 1 + modules/point/point.admin.controller.php | 1 + modules/point/point.admin.view.php | 1 + modules/point/point.class.php | 1 + modules/point/point.controller.php | 1 + modules/point/point.model.php | 1 + modules/point/point.view.php | 1 + modules/poll/poll.admin.controller.php | 1 + modules/poll/poll.admin.model.php | 1 + modules/poll/poll.admin.view.php | 1 + modules/poll/poll.class.php | 1 + modules/poll/poll.controller.php | 1 + modules/poll/poll.model.php | 1 + modules/rss/rss.admin.controller.php | 1 + modules/rss/rss.admin.view.php | 1 + modules/rss/rss.class.php | 1 + modules/rss/rss.controller.php | 1 + modules/rss/rss.model.php | 1 + modules/rss/rss.view.php | 1 + modules/session/session.admin.controller.php | 1 + modules/session/session.admin.view.php | 1 + modules/session/session.class.php | 1 + modules/session/session.controller.php | 1 + modules/session/session.model.php | 1 + modules/spamfilter/spamfilter.admin.controller.php | 1 + modules/spamfilter/spamfilter.admin.view.php | 1 + modules/spamfilter/spamfilter.class.php | 1 + modules/spamfilter/spamfilter.controller.php | 1 + modules/spamfilter/spamfilter.model.php | 1 + modules/tag/tag.admin.controller.php | 1 + modules/tag/tag.class.php | 1 + modules/tag/tag.controller.php | 1 + modules/tag/tag.model.php | 1 + modules/trackback/trackback.admin.controller.php | 1 + modules/trackback/trackback.admin.model.php | 1 + modules/trackback/trackback.admin.view.php | 1 + modules/trackback/trackback.class.php | 1 + modules/trackback/trackback.controller.php | 1 + modules/trackback/trackback.model.php | 1 + modules/trackback/trackback.view.php | 1 + modules/trash/trash.admin.controller.php | 1 + modules/trash/trash.admin.view.php | 1 + modules/trash/trash.class.php | 1 + modules/trash/trash.controller.php | 1 + modules/trash/trash.model.php | 1 + modules/trash/trash.view.php | 1 + modules/widget/widget.admin.view.php | 1 + modules/widget/widget.class.php | 1 + modules/widget/widget.controller.php | 1 + modules/widget/widget.model.php | 1 + modules/widget/widget.view.php | 1 + tests/Bootstrap.php | 1 + tests/FuncIncTest.class.php | 1 + tests/classes/context/Context.mock.php | 1 + tests/classes/context/ContextTest.php | 1 + tests/classes/db/Helper.class.php | 3 ++- tests/classes/db/QueryTester.class.php | 3 ++- .../db/queryparts/condition/ConditionWithArgumentTest.php | 1 + tests/classes/db/classes/db/queryparts/table/TableTest.php | 1 + .../db/classes/xml/xmlquery/argument/ArgumentTest.php | 1 + .../classes/xml/xmlquery/argument/ConditionArgumentTest.php | 1 + .../db/classes/xml/xmlquery/argument/data/en.lang.php | 3 ++- .../classes/xml/xmlquery/queryargument/QueryArgumentTest.php | 1 + .../classes/xml/xmlquery/tags/condition/ConditionTagTest.php | 1 + .../db/classes/xml/xmlquery/tags/table/TableTagTest.php | 3 ++- .../db/classes/xml/xmlquery/tags/table/TablesTagTest.php | 3 ++- tests/classes/db/config/config.inc.php | 3 ++- tests/classes/db/db/CubridOnlineTest.php | 1 + tests/classes/db/db/CubridTest.php | 1 + tests/classes/db/db/DBTest.php | 1 + tests/classes/db/db/ExpressionParserTest.php | 3 ++- tests/classes/db/db/MockDb.php | 3 ++- tests/classes/db/db/MssqlOnlineTest.php | 1 + tests/classes/db/db/MssqlTest.php | 1 + tests/classes/db/db/MysqlTest.php | 1 + tests/classes/db/db/SqliteTest.php | 1 + tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php | 3 ++- tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php | 1 + .../db/db/xml_query/cubrid/CubridInsertOnlineTest.php | 3 ++- tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php | 3 ++- .../db/db/xml_query/cubrid/CubridSelectOnlineTest.php | 1 + tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php | 3 ++- tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php | 1 + tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php | 3 ++- tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php | 1 + .../classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php | 3 ++- tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php | 3 ++- .../classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php | 3 ++- tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php | 3 ++- tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php | 1 + tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php | 1 + tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php | 1 + tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php | 3 ++- tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php | 3 ++- tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php | 3 ++- tests/classes/file/FileHandlerTest.php | 1 + tests/classes/frontendfile/FrontEndFileHandlerTest.php | 1 + tests/classes/security/SecurityTest.php | 1 + tests/classes/template/TemplateHandlerTest.php | 1 + tests/classes/validator/ValidatorTest.php | 1 + tests/modules/admin/admin.Test.php | 1 + tests/modules/document/document.Test.php | 1 + tools/dbxml_validator/connect_wrapper.php | 1 + tools/dbxml_validator/tests/xmlQueriesTest.php | 1 + tools/dbxml_validator/validate.php | 1 + tools/minify/cssmin/CSSmin.php | 1 + tools/minify/jsminplus/jsminplus.php | 3 ++- tools/minify/minify.php | 1 + widgets/content/content.class.php | 1 + widgets/counter_status/counter_status.class.php | 1 + widgets/language_select/language_select.class.php | 1 + widgets/login_info/login_info.class.php | 1 + widgets/login_info/skins/default/default.login.css | 5 +++-- .../login_info/skins/xe_solid_enterprise_login/css/style.css | 2 +- widgets/mcontent/mcontent.class.php | 1 + 373 files changed, 402 insertions(+), 47 deletions(-) diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php index c18c47844..3cc15cd02 100644 --- a/addons/adminlogging/adminlogging.addon.php +++ b/addons/adminlogging/adminlogging.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php index 9b0212c77..00674ff53 100644 --- a/addons/autolink/autolink.addon.php +++ b/addons/autolink/autolink.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php index 584437608..cbc3cf77e 100644 --- a/addons/blogapi/blogapi.addon.php +++ b/addons/blogapi/blogapi.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/blogapi/blogapi.func.php b/addons/blogapi/blogapi.func.php index eee750b39..5c6377728 100644 --- a/addons/blogapi/blogapi.func.php +++ b/addons/blogapi/blogapi.func.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php index 9c8aae6f1..40bf04b19 100644 --- a/addons/captcha/captcha.addon.php +++ b/addons/captcha/captcha.addon.php @@ -1,4 +1,6 @@ */ + if(!defined("__XE__")) exit(); /** diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php index 5208d0482..57a594565 100644 --- a/addons/counter/counter.addon.php +++ b/addons/counter/counter.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php index c3fe92f73..4f8f24088 100644 --- a/addons/member_communication/member_communication.addon.php +++ b/addons/member_communication/member_communication.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php index d7aa42ab3..57925e484 100644 --- a/addons/member_extra_info/member_extra_info.addon.php +++ b/addons/member_extra_info/member_extra_info.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php index 4a288e328..b6d641874 100644 --- a/addons/member_extra_info/member_extra_info.lib.php +++ b/addons/member_extra_info/member_extra_info.lib.php @@ -1,4 +1,5 @@ */ /** * @brief If member_srl exists in the div or span, replace to image name or nick image for each member_srl diff --git a/addons/mobile/mobile.addon.php b/addons/mobile/mobile.addon.php index 5e9197f0d..df8b408e3 100644 --- a/addons/mobile/mobile.addon.php +++ b/addons/mobile/mobile.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/openid_delegation_id/openid_delegation_id.addon.php b/addons/openid_delegation_id/openid_delegation_id.addon.php index ede67b7cd..7b9b9d6b0 100644 --- a/addons/openid_delegation_id/openid_delegation_id.addon.php +++ b/addons/openid_delegation_id/openid_delegation_id.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php index d02cfaa60..bddadad61 100644 --- a/addons/point_level_icon/point_level_icon.addon.php +++ b/addons/point_level_icon/point_level_icon.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php index 5caa1cd7c..999e1f021 100644 --- a/addons/point_level_icon/point_level_icon.lib.php +++ b/addons/point_level_icon/point_level_icon.lib.php @@ -1,4 +1,5 @@ */ /** * @brief Function to change point icon. diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php index 7c72cc600..357aa401c 100644 --- a/addons/resize_image/resize_image.addon.php +++ b/addons/resize_image/resize_image.addon.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) exit(); diff --git a/admin/index.php b/admin/index.php index 1a6d787e3..f29a4f98d 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,4 +1,6 @@ */ + header('Location: ../index.php?module=admin'); /* End of file index.php */ diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php index bfea1eba9..689382a34 100644 --- a/classes/cache/CacheApc.class.php +++ b/classes/cache/CacheApc.class.php @@ -1,4 +1,5 @@ */ /** * Cache class for APC diff --git a/classes/cache/CacheFile.class.php b/classes/cache/CacheFile.class.php index 5e8b31dd7..e0acbc6e4 100644 --- a/classes/cache/CacheFile.class.php +++ b/classes/cache/CacheFile.class.php @@ -1,4 +1,5 @@ */ /** * Cache class for file diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php index b8b68181e..8b0442638 100644 --- a/classes/cache/CacheHandler.class.php +++ b/classes/cache/CacheHandler.class.php @@ -1,4 +1,5 @@ */ /** * CacheHandler diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php index 2432f2816..fb741ea29 100644 --- a/classes/cache/CacheMemcache.class.php +++ b/classes/cache/CacheMemcache.class.php @@ -1,4 +1,5 @@ */ /** * Cache class for memcache diff --git a/classes/cache/CacheWincache.class.php b/classes/cache/CacheWincache.class.php index 3b86815ee..8c9c6b32a 100644 --- a/classes/cache/CacheWincache.class.php +++ b/classes/cache/CacheWincache.class.php @@ -1,4 +1,5 @@ */ /** * Cache class for Wincache diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 538a736a1..1426bfcba 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1,4 +1,5 @@ */ define('FOLLOW_REQUEST_SSL', 0); define('ENFORCE_SSL', 1); diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 6b1d12e71..fac85ff76 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -1,4 +1,5 @@ */ if(!defined('__XE_LOADED_DB_CLASS__')) { diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index aff375397..06ba24f9a 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -1,4 +1,5 @@ */ /** * - DB child class diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index 88633609b..619117b99 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -1,4 +1,5 @@ */ /** * - DBMSSQL diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 45bf30155..608afe640 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -1,4 +1,5 @@ */ /** * Class to use MySQL DBMS diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php index 2c8cf1389..143ef8a58 100644 --- a/classes/db/DBMysql_innodb.class.php +++ b/classes/db/DBMysql_innodb.class.php @@ -1,4 +1,5 @@ */ require_once('DBMysql.class.php'); diff --git a/classes/db/DBMysqli.class.php b/classes/db/DBMysqli.class.php index e80f6e3f4..77e07af85 100644 --- a/classes/db/DBMysqli.class.php +++ b/classes/db/DBMysqli.class.php @@ -1,4 +1,5 @@ */ require_once('DBMysql.class.php'); diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php index 251aad53d..bc16629ac 100644 --- a/classes/db/queryparts/Query.class.php +++ b/classes/db/queryparts/Query.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/Subquery.class.php b/classes/db/queryparts/Subquery.class.php index ff52df177..b9ff3b605 100644 --- a/classes/db/queryparts/Subquery.class.php +++ b/classes/db/queryparts/Subquery.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/condition/Condition.class.php b/classes/db/queryparts/condition/Condition.class.php index 0a6eabf66..10fd88e25 100644 --- a/classes/db/queryparts/condition/Condition.class.php +++ b/classes/db/queryparts/condition/Condition.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/condition/ConditionGroup.class.php b/classes/db/queryparts/condition/ConditionGroup.class.php index 4eec71394..5906e4a2e 100644 --- a/classes/db/queryparts/condition/ConditionGroup.class.php +++ b/classes/db/queryparts/condition/ConditionGroup.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/condition/ConditionSubquery.class.php b/classes/db/queryparts/condition/ConditionSubquery.class.php index ad282a663..b338663f7 100644 --- a/classes/db/queryparts/condition/ConditionSubquery.class.php +++ b/classes/db/queryparts/condition/ConditionSubquery.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/condition/ConditionWithArgument.class.php b/classes/db/queryparts/condition/ConditionWithArgument.class.php index e4a5de9d4..8c9919f92 100644 --- a/classes/db/queryparts/condition/ConditionWithArgument.class.php +++ b/classes/db/queryparts/condition/ConditionWithArgument.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/condition/ConditionWithoutArgument.class.php b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php index 19bf8491a..f4590475d 100644 --- a/classes/db/queryparts/condition/ConditionWithoutArgument.class.php +++ b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/expression/ClickCountExpression.class.php b/classes/db/queryparts/expression/ClickCountExpression.class.php index 50f48da5f..05ac92e16 100644 --- a/classes/db/queryparts/expression/ClickCountExpression.class.php +++ b/classes/db/queryparts/expression/ClickCountExpression.class.php @@ -1,4 +1,5 @@ */ /** * ClickCountExpression diff --git a/classes/db/queryparts/expression/DeleteExpression.class.php b/classes/db/queryparts/expression/DeleteExpression.class.php index c86a4d4fb..7342c7412 100644 --- a/classes/db/queryparts/expression/DeleteExpression.class.php +++ b/classes/db/queryparts/expression/DeleteExpression.class.php @@ -1,4 +1,5 @@ */ /** * DeleteExpression diff --git a/classes/db/queryparts/expression/Expression.class.php b/classes/db/queryparts/expression/Expression.class.php index 463f107ed..1436f8995 100644 --- a/classes/db/queryparts/expression/Expression.class.php +++ b/classes/db/queryparts/expression/Expression.class.php @@ -1,4 +1,5 @@ */ /** * Expression diff --git a/classes/db/queryparts/expression/InsertExpression.class.php b/classes/db/queryparts/expression/InsertExpression.class.php index efd0e58f8..16bd5e72f 100644 --- a/classes/db/queryparts/expression/InsertExpression.class.php +++ b/classes/db/queryparts/expression/InsertExpression.class.php @@ -1,4 +1,5 @@ */ /** * InsertExpression diff --git a/classes/db/queryparts/expression/SelectExpression.class.php b/classes/db/queryparts/expression/SelectExpression.class.php index 6ae36d52b..173a222c4 100644 --- a/classes/db/queryparts/expression/SelectExpression.class.php +++ b/classes/db/queryparts/expression/SelectExpression.class.php @@ -1,4 +1,5 @@ */ /** * SelectExpression diff --git a/classes/db/queryparts/expression/StarExpression.class.php b/classes/db/queryparts/expression/StarExpression.class.php index f010c8593..589f8f0b3 100644 --- a/classes/db/queryparts/expression/StarExpression.class.php +++ b/classes/db/queryparts/expression/StarExpression.class.php @@ -1,4 +1,5 @@ */ /** * StarExpression diff --git a/classes/db/queryparts/expression/UpdateExpression.class.php b/classes/db/queryparts/expression/UpdateExpression.class.php index a942a9f9c..c95b6324c 100644 --- a/classes/db/queryparts/expression/UpdateExpression.class.php +++ b/classes/db/queryparts/expression/UpdateExpression.class.php @@ -1,4 +1,5 @@ */ /** * UpdateExpression diff --git a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php index 38123f221..dd1831ede 100644 --- a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php +++ b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php @@ -1,4 +1,5 @@ */ /** * UpdateExpression diff --git a/classes/db/queryparts/limit/Limit.class.php b/classes/db/queryparts/limit/Limit.class.php index ac6579b21..5dfbf855d 100644 --- a/classes/db/queryparts/limit/Limit.class.php +++ b/classes/db/queryparts/limit/Limit.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/order/OrderByColumn.class.php b/classes/db/queryparts/order/OrderByColumn.class.php index 84af09def..c36a6fcf5 100644 --- a/classes/db/queryparts/order/OrderByColumn.class.php +++ b/classes/db/queryparts/order/OrderByColumn.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/table/CubridTableWithHint.class.php b/classes/db/queryparts/table/CubridTableWithHint.class.php index 2b3f72dc0..c43234066 100644 --- a/classes/db/queryparts/table/CubridTableWithHint.class.php +++ b/classes/db/queryparts/table/CubridTableWithHint.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/table/IndexHint.class.php b/classes/db/queryparts/table/IndexHint.class.php index 681e31ea4..665614902 100644 --- a/classes/db/queryparts/table/IndexHint.class.php +++ b/classes/db/queryparts/table/IndexHint.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/table/JoinTable.class.php b/classes/db/queryparts/table/JoinTable.class.php index da5f951ca..d216b4cad 100644 --- a/classes/db/queryparts/table/JoinTable.class.php +++ b/classes/db/queryparts/table/JoinTable.class.php @@ -1,4 +1,5 @@ */ /** * class JoinTable diff --git a/classes/db/queryparts/table/MssqlTableWithHint.class.php b/classes/db/queryparts/table/MssqlTableWithHint.class.php index 65b2fda52..ef880cfe6 100644 --- a/classes/db/queryparts/table/MssqlTableWithHint.class.php +++ b/classes/db/queryparts/table/MssqlTableWithHint.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/table/MysqlTableWithHint.class.php b/classes/db/queryparts/table/MysqlTableWithHint.class.php index fc782bfe0..f37193323 100644 --- a/classes/db/queryparts/table/MysqlTableWithHint.class.php +++ b/classes/db/queryparts/table/MysqlTableWithHint.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/db/queryparts/table/Table.class.php b/classes/db/queryparts/table/Table.class.php index 45cbf4ed7..ce667cd36 100644 --- a/classes/db/queryparts/table/Table.class.php +++ b/classes/db/queryparts/table/Table.class.php @@ -1,4 +1,5 @@ */ /** * @author NAVER (developers@xpressengine.com) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index ff9b0b638..0d59299f8 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -1,4 +1,5 @@ */ /** * @class DisplayHandler diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index d5c0b0942..8a36e8d06 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -1,4 +1,5 @@ */ class HTMLDisplayHandler { diff --git a/classes/display/JSCallbackDisplayHandler.php b/classes/display/JSCallbackDisplayHandler.php index e72d1a91c..c6cb78c24 100644 --- a/classes/display/JSCallbackDisplayHandler.php +++ b/classes/display/JSCallbackDisplayHandler.php @@ -1,4 +1,5 @@ */ class JSCallbackDisplayHandler { diff --git a/classes/display/JSONDisplayHandler.php b/classes/display/JSONDisplayHandler.php index 0a35c09cf..4befddc58 100644 --- a/classes/display/JSONDisplayHandler.php +++ b/classes/display/JSONDisplayHandler.php @@ -1,4 +1,5 @@ */ class JSONDisplayHandler { diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php index d43bbe6b8..6a07c3c3a 100644 --- a/classes/display/VirtualXMLDisplayHandler.php +++ b/classes/display/VirtualXMLDisplayHandler.php @@ -1,4 +1,5 @@ */ class VirtualXMLDisplayHandler { diff --git a/classes/display/XMLDisplayHandler.php b/classes/display/XMLDisplayHandler.php index 946d77981..9f65125e0 100644 --- a/classes/display/XMLDisplayHandler.php +++ b/classes/display/XMLDisplayHandler.php @@ -1,4 +1,5 @@ */ class XMLDisplayHandler { diff --git a/classes/editor/EditorHandler.class.php b/classes/editor/EditorHandler.class.php index 3d3ad5ba0..aaf867456 100644 --- a/classes/editor/EditorHandler.class.php +++ b/classes/editor/EditorHandler.class.php @@ -1,4 +1,5 @@ */ /** * Superclass of the edit component. diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index 4a716cf78..5c807f923 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -1,4 +1,5 @@ */ /** * A class to handle extra variables used in posts, member and others diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 6a71919dd..5078e9469 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -1,4 +1,5 @@ */ /** * Contains methods for accessing file system diff --git a/classes/file/FileObject.class.php b/classes/file/FileObject.class.php index e389853a7..f8134a43c 100644 --- a/classes/file/FileObject.class.php +++ b/classes/file/FileObject.class.php @@ -1,4 +1,5 @@ */ /** * File abstraction class diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 95034acbc..316946203 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -1,4 +1,5 @@ */ /** * Handle front end files diff --git a/classes/handler/Handler.class.php b/classes/handler/Handler.class.php index a629a4dd6..0dd62c8e7 100644 --- a/classes/handler/Handler.class.php +++ b/classes/handler/Handler.class.php @@ -1,4 +1,5 @@ */ /** * An abstract class of (*)Handler diff --git a/classes/httprequest/XEHttpRequest.class.php b/classes/httprequest/XEHttpRequest.class.php index 2eac377ca..0fe8514fc 100644 --- a/classes/httprequest/XEHttpRequest.class.php +++ b/classes/httprequest/XEHttpRequest.class.php @@ -1,4 +1,5 @@ */ /** * - HttpRequest class diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php index 3af7dc22b..7842db788 100644 --- a/classes/mail/Mail.class.php +++ b/classes/mail/Mail.class.php @@ -1,4 +1,5 @@ */ if(version_compare(PHP_VERSION, '5.0.0', '>=')) { diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php index 8c7de8265..79607c26e 100644 --- a/classes/mobile/Mobile.class.php +++ b/classes/mobile/Mobile.class.php @@ -1,4 +1,5 @@ */ /** * Mobile class diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index e46e76cba..3eaf13275 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -1,4 +1,5 @@ */ /** * @class ModuleHandler diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 5d61fca8e..4af9ec4d2 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -1,4 +1,5 @@ */ /** * @class ModuleObject diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index bf2b333a3..e6ca0331c 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -1,4 +1,5 @@ */ /** * Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose. diff --git a/classes/page/PageHandler.class.php b/classes/page/PageHandler.class.php index 777f6e2b6..9b2322b75 100644 --- a/classes/page/PageHandler.class.php +++ b/classes/page/PageHandler.class.php @@ -1,4 +1,5 @@ */ /** * @class PageHandler diff --git a/classes/security/EmbedFilter.class.php b/classes/security/EmbedFilter.class.php index 0b5d5dd4f..622f4d3fa 100644 --- a/classes/security/EmbedFilter.class.php +++ b/classes/security/EmbedFilter.class.php @@ -1,4 +1,5 @@ */ include _XE_PATH_ . 'classes/security/phphtmlparser/src/htmlparser.inc'; diff --git a/classes/security/Purifier.class.php b/classes/security/Purifier.class.php index 3d467ccd4..19f869936 100644 --- a/classes/security/Purifier.class.php +++ b/classes/security/Purifier.class.php @@ -1,4 +1,5 @@ */ class Purifier { diff --git a/classes/security/Security.class.php b/classes/security/Security.class.php index 12711ed95..17c229b55 100644 --- a/classes/security/Security.class.php +++ b/classes/security/Security.class.php @@ -1,4 +1,5 @@ */ /** * - Security class diff --git a/classes/security/UploadFileFilter.class.php b/classes/security/UploadFileFilter.class.php index f49573e27..3f345f743 100644 --- a/classes/security/UploadFileFilter.class.php +++ b/classes/security/UploadFileFilter.class.php @@ -1,4 +1,5 @@ */ class UploadFileFilter { diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 6f120d609..44e23bf2b 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -1,4 +1,5 @@ */ /** * @class TemplateHandler diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index b62570462..e00188998 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -1,4 +1,5 @@ */ /** * Validator class diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 397aebab5..94a9c2320 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -1,4 +1,5 @@ */ /** * @class WidgetHandler diff --git a/classes/xml/GeneralXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php index 3b6b4cfb0..f4d2378c9 100644 --- a/classes/xml/GeneralXmlParser.class.php +++ b/classes/xml/GeneralXmlParser.class.php @@ -1,4 +1,5 @@ */ /** * GeneralXmlParser class diff --git a/classes/xml/XmlGenerator.class.php b/classes/xml/XmlGenerator.class.php index 220b1acd6..130510ec3 100644 --- a/classes/xml/XmlGenerator.class.php +++ b/classes/xml/XmlGenerator.class.php @@ -1,4 +1,5 @@ */ /** * XmlGenerator class diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index 48c72442b..55dab10b7 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -1,4 +1,5 @@ */ /** * filter class traslate xml content into javascript code diff --git a/classes/xml/XmlLangParser.class.php b/classes/xml/XmlLangParser.class.php index 7767907c5..6804e68df 100644 --- a/classes/xml/XmlLangParser.class.php +++ b/classes/xml/XmlLangParser.class.php @@ -1,4 +1,5 @@ */ /** * XmlLangParser class diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php index 54a978721..8225aedad 100644 --- a/classes/xml/XmlParser.class.php +++ b/classes/xml/XmlParser.class.php @@ -1,4 +1,5 @@ */ /** * Xml_Node_ class diff --git a/classes/xml/XmlQueryParser.150.class.php b/classes/xml/XmlQueryParser.150.class.php index 31c389f79..4c9af5a23 100644 --- a/classes/xml/XmlQueryParser.150.class.php +++ b/classes/xml/XmlQueryParser.150.class.php @@ -1,4 +1,5 @@ */ /** * File containing the XE 1.5 XmlQueryParserClass diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php index d4a7b2b6d..ff7d2e312 100644 --- a/classes/xml/XmlQueryParser.class.php +++ b/classes/xml/XmlQueryParser.class.php @@ -1,4 +1,5 @@ */ /** * XmlQueryParser diff --git a/classes/xml/xmlquery/DBParser.class.php b/classes/xml/xmlquery/DBParser.class.php index 2e5c767f6..042ce6348 100644 --- a/classes/xml/xmlquery/DBParser.class.php +++ b/classes/xml/xmlquery/DBParser.class.php @@ -1,4 +1,5 @@ */ /** * File containing the DBParser class diff --git a/classes/xml/xmlquery/QueryParser.class.php b/classes/xml/xmlquery/QueryParser.class.php index 87dad67ec..80e9975b0 100644 --- a/classes/xml/xmlquery/QueryParser.class.php +++ b/classes/xml/xmlquery/QueryParser.class.php @@ -1,4 +1,5 @@ */ /** * File containing the QueryParser class diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php index e836839ae..3a6fb7382 100644 --- a/classes/xml/xmlquery/argument/Argument.class.php +++ b/classes/xml/xmlquery/argument/Argument.class.php @@ -1,4 +1,5 @@ */ /** * Argument class diff --git a/classes/xml/xmlquery/argument/ConditionArgument.class.php b/classes/xml/xmlquery/argument/ConditionArgument.class.php index c31acd704..956977432 100644 --- a/classes/xml/xmlquery/argument/ConditionArgument.class.php +++ b/classes/xml/xmlquery/argument/ConditionArgument.class.php @@ -1,4 +1,5 @@ */ /** * ConditionArgument class diff --git a/classes/xml/xmlquery/argument/SortArgument.class.php b/classes/xml/xmlquery/argument/SortArgument.class.php index c2623a1e1..a89c56bb5 100644 --- a/classes/xml/xmlquery/argument/SortArgument.class.php +++ b/classes/xml/xmlquery/argument/SortArgument.class.php @@ -1,4 +1,5 @@ */ /** * SortArgument class diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php index 16e13a96b..cf618cd0a 100644 --- a/classes/xml/xmlquery/queryargument/DefaultValue.class.php +++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php @@ -1,4 +1,5 @@ */ /** * DefaultValue class diff --git a/classes/xml/xmlquery/queryargument/QueryArgument.class.php b/classes/xml/xmlquery/queryargument/QueryArgument.class.php index f2f2725bf..d026cae89 100644 --- a/classes/xml/xmlquery/queryargument/QueryArgument.class.php +++ b/classes/xml/xmlquery/queryargument/QueryArgument.class.php @@ -1,4 +1,5 @@ */ /** * QueryArgument class diff --git a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php index dc17ce1c1..f757c3b9c 100644 --- a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php +++ b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php @@ -1,4 +1,5 @@ */ /** * SortQueryArgument class diff --git a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php index 943d6e278..d5fc37f2b 100644 --- a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php +++ b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php @@ -1,4 +1,5 @@ */ /** * QueryArgumentValidator class diff --git a/classes/xml/xmlquery/tags/column/ColumnTag.class.php b/classes/xml/xmlquery/tags/column/ColumnTag.class.php index cade38823..6d92caff2 100644 --- a/classes/xml/xmlquery/tags/column/ColumnTag.class.php +++ b/classes/xml/xmlquery/tags/column/ColumnTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <column> tag inside an XML Query file
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php index 604e9320f..26573f28c 100644 --- a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php +++ b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <column> tag inside an XML Query file whose action is 'insert' diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php index 1be669d37..9a7de0b5d 100644 --- a/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php +++ b/classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php @@ -1,4 +1,5 @@ */ /** * Models the <column> tag inside an XML Query file whose action is 'insert-select' diff --git a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php index 4b01d7b8c..f3fe110b4 100644 --- a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php +++ b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <columns> tag inside an XML Query file whose action is 'insert' diff --git a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php index a06d8fe58..a29192ea9 100644 --- a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php +++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <column> tag inside an XML Query file whose action is 'select' diff --git a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php index d0939450d..271cee8a5 100644 --- a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php +++ b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <columns> tag inside an XML Query file whose action is 'select' diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php index 405a35c97..462c31192 100644 --- a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php +++ b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <column> tag inside an XML Query file whose action is 'update' diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php index 3432623ad..765999db6 100644 --- a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php +++ b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php @@ -1,4 +1,5 @@ */ /** * Models the <columns> tag inside an XML Query file whose action is 'update' diff --git a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php index 069dfc605..dce3c825b 100644 --- a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php +++ b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php @@ -1,4 +1,5 @@ */ /** * ConditionGroupTag class diff --git a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php index 4383cb195..12f4323bb 100644 --- a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php +++ b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php @@ -1,4 +1,5 @@ */ /** * ConditionTag diff --git a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php index 7456761d6..661afa533 100644 --- a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php +++ b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php @@ -1,4 +1,5 @@ */ /** * ConditionsTag class diff --git a/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php index f263d5db3..c4c253032 100644 --- a/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php +++ b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php @@ -1,4 +1,5 @@ */ /** * JoinConditionsTag class diff --git a/classes/xml/xmlquery/tags/group/GroupsTag.class.php b/classes/xml/xmlquery/tags/group/GroupsTag.class.php index a383429a4..8320e8d7b 100644 --- a/classes/xml/xmlquery/tags/group/GroupsTag.class.php +++ b/classes/xml/xmlquery/tags/group/GroupsTag.class.php @@ -1,4 +1,5 @@ */ /** * GroupsTag class diff --git a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php index e1eb29bf0..76800fbc5 100644 --- a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php +++ b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php @@ -1,4 +1,5 @@ */ /** * IndexTag class diff --git a/classes/xml/xmlquery/tags/navigation/LimitTag.class.php b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php index 03cea98f9..6c92b76cc 100644 --- a/classes/xml/xmlquery/tags/navigation/LimitTag.class.php +++ b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php @@ -1,4 +1,5 @@ */ /** * LimitTag class diff --git a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php index 7b7dd9707..6c2019d65 100644 --- a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php +++ b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php @@ -1,4 +1,5 @@ */ /** * NavigationTag class diff --git a/classes/xml/xmlquery/tags/query/QueryTag.class.php b/classes/xml/xmlquery/tags/query/QueryTag.class.php index e2dedadb4..36df75a11 100644 --- a/classes/xml/xmlquery/tags/query/QueryTag.class.php +++ b/classes/xml/xmlquery/tags/query/QueryTag.class.php @@ -1,4 +1,5 @@ */ /** * QueryTag class diff --git a/classes/xml/xmlquery/tags/table/HintTableTag.class.php b/classes/xml/xmlquery/tags/table/HintTableTag.class.php index 87c82e74b..d499c2c1f 100644 --- a/classes/xml/xmlquery/tags/table/HintTableTag.class.php +++ b/classes/xml/xmlquery/tags/table/HintTableTag.class.php @@ -1,4 +1,5 @@ */ /** * HintTableTag diff --git a/classes/xml/xmlquery/tags/table/TableTag.class.php b/classes/xml/xmlquery/tags/table/TableTag.class.php index 84ba819a2..1156a678b 100644 --- a/classes/xml/xmlquery/tags/table/TableTag.class.php +++ b/classes/xml/xmlquery/tags/table/TableTag.class.php @@ -1,4 +1,5 @@ */ /** * TableTag diff --git a/classes/xml/xmlquery/tags/table/TablesTag.class.php b/classes/xml/xmlquery/tags/table/TablesTag.class.php index 23d2a2ec5..80eb97ee1 100644 --- a/classes/xml/xmlquery/tags/table/TablesTag.class.php +++ b/classes/xml/xmlquery/tags/table/TablesTag.class.php @@ -1,4 +1,5 @@ */ /** * TablesTag class diff --git a/common/css/xe.css b/common/css/xe.css index 5d2d53a19..e7255c80f 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,4 +1,5 @@ @charset "utf-8"; +/* Copyright (C) NAVER */ /* NAVER (developers@xpressengine.com) */ /* Element Reset */ body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index 26eb6e95c..c80088c81 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}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}body{position:relative;word-wrap:break-word}a img{border:0}[hidden]{display:none}.xe_content img{max-width:100%;height:auto}@media \0screen{img{max-width:none}}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;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;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)}body>.message{margin:1em}.message p{margin:1em 0 !important}.message.info{border-color:#BCE8F1;background-color:#D9EDF7;color:#3A87AD}.message.error{border-color:#EED3D7;background-color:#F2DEDE;color:#B94A48}.message.update{border-color:#D6E9C6;background-color:#DFF0D8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 15px;text-align:center;margin:0;padding:20px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif;box-shadow:0 0 5px #000;border-bottom:1px solid #ccc}#adminBar{position:fixed;top:0;left:0;right:0;height:28px;background:#666;width:100%;z-index:9999;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden;border-top:1px solid #eee;border-bottom:1px solid #eee;box-shadow:0 0 5px #333}#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>p{margin:0}#adminBar>.admin{float:left}#adminBar>.link{float:right;padding:0 10px 0 0}#adminBar a{color:#fff;text-decoration:none}#adminBar a:hover,#adminBar a:active,#adminBar a:focus{text-decoration:underline}.btnArea{padding:0;margin:10px 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btn{text-decoration:none !important;display:inline-block;*display:inline;*zoom:1;padding:0 12px !important;margin:0;line-height:24px !important;height:24px !important;font-family:inherit;font-size:12px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:top;cursor:pointer;overflow:visible;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border:1px solid #bbbbbb;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#a2a2a2;border-radius:2px;box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)}input.btn,button.btn{height:26px !important}.btn:hover,.btn:active,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn>a,.btn>button,.btn>input,.btn>span{display:inline-block;*zoom:1;margin:0 -12px !important;padding:0 12px !important;text-decoration:none !important;width:auto;font-family:inherit;line-height:24px;height:24px;border:0;background:none;color:#333;font-size:12px;vertical-align:top;overflow:visible;cursor:pointer}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2} \ No newline at end of file +@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}body{position:relative;word-wrap:break-word}a img{border:0}[hidden]{display:none}.xe_content img{max-width:100%;height:auto}@media \0screen{img{max-width:none}}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;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;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)}body>.message{margin:1em}.message p{margin:1em 0 !important}.message.info{border-color:#BCE8F1;background-color:#D9EDF7;color:#3A87AD}.message.error{border-color:#EED3D7;background-color:#F2DEDE;color:#B94A48}.message.update{border-color:#D6E9C6;background-color:#DFF0D8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 15px;text-align:center;margin:0;padding:20px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif;box-shadow:0 0 5px #000;border-bottom:1px solid #ccc}#adminBar{position:fixed;top:0;left:0;right:0;height:28px;background:#666;width:100%;z-index:9999;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden;border-top:1px solid #eee;border-bottom:1px solid #eee;box-shadow:0 0 5px #333}#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>p{margin:0}#adminBar>.admin{float:left}#adminBar>.link{float:right;padding:0 10px 0 0}#adminBar a{color:#fff;text-decoration:none}#adminBar a:hover,#adminBar a:active,#adminBar a:focus{text-decoration:underline}.btnArea{padding:0;margin:10px 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btn{text-decoration:none !important;display:inline-block;*display:inline;*zoom:1;padding:0 12px !important;margin:0;line-height:24px !important;height:24px !important;font-family:inherit;font-size:12px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:top;cursor:pointer;overflow:visible;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border:1px solid #bbbbbb;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#a2a2a2;border-radius:2px;box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)}input.btn,button.btn{height:26px !important}.btn:hover,.btn:active,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn>a,.btn>button,.btn>input,.btn>span{display:inline-block;*zoom:1;margin:0 -12px !important;padding:0 12px !important;text-decoration:none !important;width:auto;font-family:inherit;line-height:24px;height:24px;border:0;background:none;color:#333;font-size:12px;vertical-align:top;overflow:visible;cursor:pointer}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2} diff --git a/common/js/foggyLayer.js b/common/js/foggyLayer.js index 8f428281a..22a965e8f 100644 --- a/common/js/foggyLayer.js +++ b/common/js/foggyLayer.js @@ -28,4 +28,4 @@ jQuery(function($){ }); $foggyLayer.show(); -}); \ No newline at end of file +}); diff --git a/common/js/html5.js b/common/js/html5.js index 1b6624172..cde263d7e 100644 --- a/common/js/html5.js +++ b/common/js/html5.js @@ -1,2 +1,2 @@ /*! HTML5 Shiv pre3.5 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */ -(function(a,b){function h(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function j(a){var b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){l.shivMethods||c(a);var f;return b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return b[a]=c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function k(a){var b;return a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}function p(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+i().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(q(b)));return f}function q(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(n+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function r(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+i().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+n+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function s(a){var b=a.length;while(b--)a[b].removeNode()}function t(a){var b,c,d=a.namespaces,e=a.parentWindow;return!o||a.printShived?a:(typeof d[n]=="undefined"&&d.add(n),e.attachEvent("onbeforeprint",function(){var d,e,f,g=a.styleSheets,i=[],j=g.length,k=Array(j);while(j--)k[j]=g[j];while(f=k.pop())if(!f.disabled&&m.test(f.media)){for(d=f.imports,j=0,e=d.length;j",f="hidden"in c,f&&typeof injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b);var m=/^$|\b(?:all|print)\b/,n="html5shiv",o=!g&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();l.type+=" print",l.shivPrint=t,t(b)})(this,document) \ No newline at end of file +(function(a,b){function h(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function j(a){var b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){l.shivMethods||c(a);var f;return b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return b[a]=c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function k(a){var b;return a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}function p(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+i().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(q(b)));return f}function q(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(n+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function r(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+i().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+n+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function s(a){var b=a.length;while(b--)a[b].removeNode()}function t(a){var b,c,d=a.namespaces,e=a.parentWindow;return!o||a.printShived?a:(typeof d[n]=="undefined"&&d.add(n),e.attachEvent("onbeforeprint",function(){var d,e,f,g=a.styleSheets,i=[],j=g.length,k=Array(j);while(j--)k[j]=g[j];while(f=k.pop())if(!f.disabled&&m.test(f.media)){for(d=f.imports,j=0,e=d.length;j",f="hidden"in c,f&&typeof injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b);var m=/^$|\b(?:all|print)\b/,n="html5shiv",o=!g&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();l.type+=" print",l.shivPrint=t,t(b)})(this,document) diff --git a/common/js/plugins/filebox/filebox.js b/common/js/plugins/filebox/filebox.js index 09ecc53e7..23c984ce6 100644 --- a/common/js/plugins/filebox/filebox.js +++ b/common/js/plugins/filebox/filebox.js @@ -1,4 +1,3 @@ - ;(function($) { var defaults = { @@ -153,4 +152,4 @@ jQuery(document).ready(function($){ $(this).attr('target', 'iframeTarget'); } }); -}); \ No newline at end of file +}); diff --git a/common/js/plugins/ui.calendar/ui.calendar.js b/common/js/plugins/ui.calendar/ui.calendar.js index 35b654c1f..24d65e774 100644 --- a/common/js/plugins/ui.calendar/ui.calendar.js +++ b/common/js/plugins/ui.calendar/ui.calendar.js @@ -365,4 +365,4 @@ template.month = ''; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/common/js/x.js b/common/js/x.js index 4c81f34c8..e0a065970 100644 --- a/common/js/x.js +++ b/common/js/x.js @@ -672,4 +672,4 @@ function xStopPropagation(evt) xDeprecate('xStopPropagation'); if (evt && evt.stopPropagation) evt.stopPropagation(); else if (window.event) window.event.cancelBubble = true; -} \ No newline at end of file +} diff --git a/config/config.inc.php b/config/config.inc.php index 66d923cd6..ab9a5d9eb 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -1,4 +1,5 @@ */ /** * set the include of the class file and other environment configurations diff --git a/config/func.inc.php b/config/func.inc.php index c9c832a40..5e49dcdc7 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -1,4 +1,5 @@ */ /** * function library files for convenience diff --git a/config/package.inc.php b/config/package.inc.php index 8f3498b61..46eb98584 100644 --- a/config/package.inc.php +++ b/config/package.inc.php @@ -1,4 +1,5 @@ */ define('_XE_PACKAGE_', 'XE'); define('_XE_LOCATION_', 'ko'); diff --git a/index.php b/index.php index 690b6a22d..9c0319d29 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,5 @@ */ /** * @file index.php * @author NAVER (developers@xpressengine.com) diff --git a/layouts/default/default.layout.css b/layouts/default/default.layout.css index 80717238a..179770b73 100644 --- a/layouts/default/default.layout.css +++ b/layouts/default/default.layout.css @@ -104,4 +104,4 @@ body{margin:0} .body.sub .lnb li li>a{line-height:20px;padding:0 10px 0 25px} .body.sub .lnb li li.active>a, .body.sub .lnb li li>a:hover, -.body.sub .lnb li li>a:focus{background:#f5f5f5;color:#3192d7} \ No newline at end of file +.body.sub .lnb li li>a:focus{background:#f5f5f5;color:#3192d7} diff --git a/layouts/default/default.layout.ie7.css b/layouts/default/default.layout.ie7.css index 70a1a639d..b05119f3c 100644 --- a/layouts/default/default.layout.ie7.css +++ b/layouts/default/default.layout.ie7.css @@ -1,2 +1,2 @@ @charset "utf-8"; -.visual>button>i{top:50%} \ No newline at end of file +.visual>button>i{top:50%} diff --git a/layouts/default/default.layout.ie78.css b/layouts/default/default.layout.ie78.css index b0c087f21..ac559b4b7 100644 --- a/layouts/default/default.layout.ie78.css +++ b/layouts/default/default.layout.ie78.css @@ -2,4 +2,4 @@ .gnb, .gnb>ul>li.active>a, .gnb>ul>li.hover>a{filter:none} -.visual>button>i{top:auto} \ No newline at end of file +.visual>button>i{top:auto} diff --git a/layouts/default/default.layout.webfont.css b/layouts/default/default.layout.webfont.css index 40c4bba23..433d0efd1 100644 --- a/layouts/default/default.layout.webfont.css +++ b/layouts/default/default.layout.webfont.css @@ -2,4 +2,4 @@ @font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} @media all and (min-width:768px){ body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif} -} \ No newline at end of file +} diff --git a/layouts/user_layout/user_layout.css b/layouts/user_layout/user_layout.css index d384338f0..71c0ee68f 100644 --- a/layouts/user_layout/user_layout.css +++ b/layouts/user_layout/user_layout.css @@ -12,4 +12,4 @@ form, fieldset{border:0;margin:0;padding:0} .lnb{float:left;width:200px;background:#ddd} .account{} .content{float:right;width:740px;background:#ddd} -.footer{background:#ddd} \ No newline at end of file +.footer{background:#ddd} diff --git a/layouts/xe_official/css/black.css b/layouts/xe_official/css/black.css index 4912d3702..fe413d883 100644 --- a/layouts/xe_official/css/black.css +++ b/layouts/xe_official/css/black.css @@ -52,4 +52,4 @@ body{background:#000} /* Site Layout - Footer */ .footer{border-top:3px solid #424242;padding:1em 0;clear:both} .footer p{text-align:center;margin:0} -.footer a{color:#818181;font-size:.9em;text-decoration:none} \ No newline at end of file +.footer a{color:#818181;font-size:.9em;text-decoration:none} diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css index 762c9bfab..f0d1cf815 100644 --- a/layouts/xe_official/css/default.css +++ b/layouts/xe_official/css/default.css @@ -55,4 +55,4 @@ html{background:#fff url(../images/default/bgBody.gif) repeat-x left top;font-fa /* Site Layout - Footer */ .footer{border-top:3px solid #f4f4f4;padding:1em 0;clear:both} .footer p{text-align:center;margin:0} -.footer a{color:#999;font-size:.9em;text-decoration:none} \ No newline at end of file +.footer a{color:#999;font-size:.9em;text-decoration:none} diff --git a/layouts/xe_official/css/white.css b/layouts/xe_official/css/white.css index 7b60801ee..831af7e6f 100644 --- a/layouts/xe_official/css/white.css +++ b/layouts/xe_official/css/white.css @@ -51,4 +51,4 @@ body{background:#fff} /* Site Layout - Footer */ .footer{border-top:3px solid #f4f4f4;padding:1em 0;clear:both} .footer p{text-align:center;margin:0} -.footer a{color:#999;font-size:.9em;text-decoration:none} \ No newline at end of file +.footer a{color:#999;font-size:.9em;text-decoration:none} diff --git a/m.layouts/colorCode/css/Blue/layout.css b/m.layouts/colorCode/css/Blue/layout.css index 0cc602be9..7c6cb422d 100644 --- a/m.layouts/colorCode/css/Blue/layout.css +++ b/m.layouts/colorCode/css/Blue/layout.css @@ -58,4 +58,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/Blue/ .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#a5b9c7} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/colorCode/css/Gray/layout.css b/m.layouts/colorCode/css/Gray/layout.css index 6f73f536e..c980f5d21 100644 --- a/m.layouts/colorCode/css/Gray/layout.css +++ b/m.layouts/colorCode/css/Gray/layout.css @@ -58,4 +58,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/Gray/ .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#bababa} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/colorCode/css/Orange/layout.css b/m.layouts/colorCode/css/Orange/layout.css index 3df98424a..3a36df098 100644 --- a/m.layouts/colorCode/css/Orange/layout.css +++ b/m.layouts/colorCode/css/Orange/layout.css @@ -58,4 +58,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/Orang .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#dbb7a7} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/colorCode/css/Red/layout.css b/m.layouts/colorCode/css/Red/layout.css index 24b57786c..59d1c1668 100644 --- a/m.layouts/colorCode/css/Red/layout.css +++ b/m.layouts/colorCode/css/Red/layout.css @@ -58,4 +58,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/Red/b .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#efefef} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/colorCode/css/nGreenA/layout.css b/m.layouts/colorCode/css/nGreenA/layout.css index 1bf7d1fcb..fdb6c8d0a 100644 --- a/m.layouts/colorCode/css/nGreenA/layout.css +++ b/m.layouts/colorCode/css/nGreenA/layout.css @@ -58,4 +58,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/nGree .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#848484} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/colorCode/css/nGreenB/layout.css b/m.layouts/colorCode/css/nGreenB/layout.css index 5e5afe3cd..c18d267d5 100644 --- a/m.layouts/colorCode/css/nGreenB/layout.css +++ b/m.layouts/colorCode/css/nGreenB/layout.css @@ -52,4 +52,4 @@ ul.link .lang_lst li{width:90px;padding-left:1px;background:url('../../img/nGree .lang_lst li:first-child a{border-top:none} p.cr{height:20px;padding:11px 0 2px;text-align:center;font-size:12px;line-height:12px;color:#848484} .lo_foot.fixed{position:fixed;bottom:0;} -.lo_foot.static{position:static;} \ No newline at end of file +.lo_foot.static{position:static;} diff --git a/m.layouts/default/mx.css b/m.layouts/default/mx.css index 91bacf010..ec01d12ab 100644 --- a/m.layouts/default/mx.css +++ b/m.layouts/default/mx.css @@ -23,4 +23,4 @@ body,input,textarea,select,button,table{font-family:Tahoma,Geneva,sans-serif} .ft li{margin:0;padding:0;border:1px solid #9c9a99;border-top:0;border-bottom:0;margin:0 -1px;background:#868686} .ft a{display:inline-block;padding:0 15px;color:#fff;text-shadow:0 0 2px #000;font-size:12px;font-weight:bold;line-height:32px;text-decoration:none} /* Copyright */ -.cr{margin:0;text-align:center;background:#f2f0ec;color:#494949;font-size:11px;line-height:26px} \ No newline at end of file +.cr{margin:0;text-align:center;background:#f2f0ec;color:#494949;font-size:11px;line-height:26px} diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php index 24a333063..0efe3dc79 100644 --- a/modules/addon/addon.admin.controller.php +++ b/modules/addon/addon.admin.controller.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_ . 'modules/addon/addon.controller.php'); diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index 2bcaec5f4..3afb79f37 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -1,4 +1,5 @@ */ /** * Admin model class of addon module diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php index 8bdfa0d9f..78c523641 100644 --- a/modules/addon/addon.admin.view.php +++ b/modules/addon/addon.admin.view.php @@ -1,4 +1,5 @@ */ /** * Admin view class of addon modules diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php index 0b238262e..bf7e7ad1c 100644 --- a/modules/addon/addon.class.php +++ b/modules/addon/addon.class.php @@ -1,4 +1,5 @@ */ /** * High class of addon modules diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 894936497..8e690e1e6 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -1,4 +1,5 @@ */ /** * Addon module's controller class diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index f268a39ac..e21a7443c 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -1,4 +1,5 @@ */ /** * adminAdminController class diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 91dad5667..0aef3bf81 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -1,4 +1,5 @@ */ /** * adminAdminModel class diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index abb26dff1..2baca8c6f 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -1,4 +1,5 @@ */ /** * adminAdminView class diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 962accdfd..0bbb60e9a 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -1,4 +1,5 @@ */ /** * admin class diff --git a/modules/adminlogging/adminlogging.class.php b/modules/adminlogging/adminlogging.class.php index 6ec6ed3aa..f8dc29185 100644 --- a/modules/adminlogging/adminlogging.class.php +++ b/modules/adminlogging/adminlogging.class.php @@ -1,4 +1,5 @@ */ /** * adminlogging class diff --git a/modules/adminlogging/adminlogging.controller.php b/modules/adminlogging/adminlogging.controller.php index e1da018a9..eebde5a00 100644 --- a/modules/adminlogging/adminlogging.controller.php +++ b/modules/adminlogging/adminlogging.controller.php @@ -1,4 +1,5 @@ */ /** * adminloggingController class diff --git a/modules/adminlogging/adminlogging.model.php b/modules/adminlogging/adminlogging.model.php index f9638d7ef..bdad50df1 100644 --- a/modules/adminlogging/adminlogging.model.php +++ b/modules/adminlogging/adminlogging.model.php @@ -1,4 +1,5 @@ */ /** * adminloggingModel class diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index f4e530586..0559ed293 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php'); diff --git a/modules/autoinstall/autoinstall.admin.model.php b/modules/autoinstall/autoinstall.admin.model.php index 113a1540a..0b228e801 100644 --- a/modules/autoinstall/autoinstall.admin.model.php +++ b/modules/autoinstall/autoinstall.admin.model.php @@ -1,4 +1,5 @@ */ /** * Model class of the autoinstall module diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 40fc1dfc0..956ac3e3f 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -1,4 +1,5 @@ */ /** * Admin view class in the autoinstall module diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php index aaa64eff9..d3294a509 100644 --- a/modules/autoinstall/autoinstall.class.php +++ b/modules/autoinstall/autoinstall.class.php @@ -1,4 +1,5 @@ */ /** * XML Generater diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 1d8bab883..f1ebfbad2 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_ . 'libs/ftp.class.php'); diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index 89f2ebf75..b837d9751 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -1,4 +1,5 @@ */ /** * Model class of the autoinstall module diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index 4b4d40060..abc27b476 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -1,4 +1,5 @@ */ /** * commentAdminController class diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php index 26af7f9e2..f79c89abb 100644 --- a/modules/comment/comment.admin.view.php +++ b/modules/comment/comment.admin.view.php @@ -1,4 +1,5 @@ */ /** * commentAdminView class diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php index 495728597..808130b15 100644 --- a/modules/comment/comment.class.php +++ b/modules/comment/comment.class.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_ . 'modules/comment/comment.item.php'); diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 45f649d57..87c0f2f1f 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -1,4 +1,5 @@ */ /** * commentController class diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 1a8d436ad..ad0f1dfc0 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -1,4 +1,5 @@ */ /** * commentItem class diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 726b8286b..095085a01 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -1,4 +1,5 @@ */ /** * commentModel class diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php index 262ea8ce4..0e2cb92aa 100644 --- a/modules/comment/comment.view.php +++ b/modules/comment/comment.view.php @@ -1,4 +1,5 @@ */ /** * commentView class diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index 1329e388a..be289821f 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class communicationAdminController diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php index 3fad20f4e..6dcb1210e 100644 --- a/modules/communication/communication.admin.model.php +++ b/modules/communication/communication.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class communicationAdminModel diff --git a/modules/communication/communication.admin.view.php b/modules/communication/communication.admin.view.php index 6e80048dc..039a33c99 100644 --- a/modules/communication/communication.admin.view.php +++ b/modules/communication/communication.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class communicationAdminView diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php index 2551833ed..155fd6413 100644 --- a/modules/communication/communication.class.php +++ b/modules/communication/communication.class.php @@ -1,4 +1,5 @@ */ /** * @class communication diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 1f8e5bb43..8f1d830fc 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -1,4 +1,5 @@ */ /** * @class communicationController diff --git a/modules/communication/communication.mobile.php b/modules/communication/communication.mobile.php index 427870b23..d846f4cca 100644 --- a/modules/communication/communication.mobile.php +++ b/modules/communication/communication.mobile.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_ . 'modules/communication/communication.view.php'); diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index 37415a2a5..d5a0f88e3 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -1,4 +1,5 @@ */ /** * @class communicationModel diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 41c941a8d..7553081cd 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -1,4 +1,5 @@ */ /** * @class communicationView diff --git a/modules/counter/counter.admin.view.php b/modules/counter/counter.admin.view.php index a0050052d..ad85f2d0a 100644 --- a/modules/counter/counter.admin.view.php +++ b/modules/counter/counter.admin.view.php @@ -1,4 +1,5 @@ */ /** * Admin view class of counter module diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php index 887f70070..43afca409 100644 --- a/modules/counter/counter.class.php +++ b/modules/counter/counter.class.php @@ -1,4 +1,5 @@ */ /** * High class of counter module diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php index 6d65a87f8..3ec4ecde5 100644 --- a/modules/counter/counter.controller.php +++ b/modules/counter/counter.controller.php @@ -1,4 +1,5 @@ */ /** * Counter module's controller class diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php index 9baff0991..d961ae44c 100644 --- a/modules/counter/counter.model.php +++ b/modules/counter/counter.model.php @@ -1,4 +1,5 @@ */ /** * Model class of counter module diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index 597012365..290b43379 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -1,4 +1,6 @@ */ + /** * documentAdminController class * Document the module's admin controller class diff --git a/modules/document/document.admin.model.php b/modules/document/document.admin.model.php index 77b3d38dd..ca7666355 100644 --- a/modules/document/document.admin.model.php +++ b/modules/document/document.admin.model.php @@ -1,4 +1,6 @@ */ + /** * documentAdminModel class * Document the module's admin model class diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index cb343756b..70d29cb13 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -1,4 +1,5 @@ */ /** * documentAdminView class * Document admin view of the module class diff --git a/modules/document/document.class.php b/modules/document/document.class.php index bc065ce33..00e947744 100644 --- a/modules/document/document.class.php +++ b/modules/document/document.class.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_.'modules/document/document.item.php'); /** diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 21c6674e0..151e5f24e 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1,4 +1,5 @@ */ /** * documentController class * document the module's controller class diff --git a/modules/document/document.item.php b/modules/document/document.item.php index b1f4c18b9..e2111903a 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -1,4 +1,5 @@ */ /** * documentItem class * document object diff --git a/modules/document/document.model.php b/modules/document/document.model.php index dcf5ed0bf..94840fca6 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -1,4 +1,5 @@ */ /** * documentModel class * model class of the module document diff --git a/modules/document/document.view.php b/modules/document/document.view.php index 462b81784..788708bf9 100644 --- a/modules/document/document.view.php +++ b/modules/document/document.view.php @@ -1,4 +1,5 @@ */ /** * documentView class * View class of the module document diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php index 36816474f..8634b93f6 100644 --- a/modules/editor/components/emoticon/emoticon.class.php +++ b/modules/editor/components/emoticon/emoticon.class.php @@ -1,4 +1,5 @@ */ /** * @class emoticon * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/components/image_gallery/image_gallery.class.php b/modules/editor/components/image_gallery/image_gallery.class.php index 487ac9226..debf2ebc3 100644 --- a/modules/editor/components/image_gallery/image_gallery.class.php +++ b/modules/editor/components/image_gallery/image_gallery.class.php @@ -1,4 +1,5 @@ */ /** * @class image_gallery * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php index 49030c010..56707f0c8 100644 --- a/modules/editor/components/image_link/image_link.class.php +++ b/modules/editor/components/image_link/image_link.class.php @@ -1,4 +1,5 @@ */ /** * @class image_link * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php index 537da6a19..86aea3563 100644 --- a/modules/editor/components/multimedia_link/multimedia_link.class.php +++ b/modules/editor/components/multimedia_link/multimedia_link.class.php @@ -1,4 +1,5 @@ */ /** * @class multimedia_link * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index 000f8096c..1ff5a8571 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -1,4 +1,5 @@ */ /** * @class poll_maker * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php index 1cf30669d..771d1165c 100644 --- a/modules/editor/editor.admin.controller.php +++ b/modules/editor/editor.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class editorAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php index 5c1cdc2cc..bbb58cd25 100644 --- a/modules/editor/editor.admin.view.php +++ b/modules/editor/editor.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class editorAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.api.php b/modules/editor/editor.api.php index aee43f706..ffa9356aa 100644 --- a/modules/editor/editor.api.php +++ b/modules/editor/editor.api.php @@ -1,4 +1,5 @@ */ /** * @class editorAPI * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.class.php b/modules/editor/editor.class.php index 288852e85..fe936a09c 100644 --- a/modules/editor/editor.class.php +++ b/modules/editor/editor.class.php @@ -1,4 +1,5 @@ */ /** * @class editor * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index 160a690f4..4e43f9fcc 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -1,4 +1,5 @@ */ /** * @class editor * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index c655608dc..acfe070d9 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -1,4 +1,5 @@ */ /** * @class editorModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php index 2b435ea05..90908a7d4 100644 --- a/modules/editor/editor.view.php +++ b/modules/editor/editor.view.php @@ -1,4 +1,6 @@ */ + /** * @class editorView * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php index 2fd2196d0..5e0ccb081 100644 --- a/modules/file/file.admin.controller.php +++ b/modules/file/file.admin.controller.php @@ -1,4 +1,5 @@ */ /** * admin controller class of the file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index ba2c5ae0d..d20949c28 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -1,4 +1,5 @@ */ /** * Admin model class of the file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index b483b4b81..d193dbf54 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -1,4 +1,5 @@ */ /** * Admin view of the module class file * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.class.php b/modules/file/file.class.php index bf3f4384c..99d1133d8 100644 --- a/modules/file/file.class.php +++ b/modules/file/file.class.php @@ -1,4 +1,5 @@ */ /** * High class of the file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 9283ecd75..902721c1f 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -1,4 +1,5 @@ */ /** * Controller class of the file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.model.php b/modules/file/file.model.php index cb496456e..56c8fa60f 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -1,4 +1,5 @@ */ /** * Model class of the file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/file/file.view.php b/modules/file/file.view.php index 08485e221..8779e3dcd 100644 --- a/modules/file/file.view.php +++ b/modules/file/file.view.php @@ -1,4 +1,5 @@ */ /** * The view class file module * @author NAVER (developers@xpressengine.com) diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php index 7c6b7842e..2dd2c7252 100644 --- a/modules/importer/extract.class.php +++ b/modules/importer/extract.class.php @@ -1,4 +1,5 @@ */ /** * extract class * Class to save each file by using tags in the large xml diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index dee930ebc..c250ac25b 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -1,4 +1,5 @@ */ @set_time_limit(0); require_once('./modules/importer/extract.class.php'); diff --git a/modules/importer/importer.admin.view.php b/modules/importer/importer.admin.view.php index 1bc20df0b..3dc0fd28f 100644 --- a/modules/importer/importer.admin.view.php +++ b/modules/importer/importer.admin.view.php @@ -1,4 +1,5 @@ */ /** * importerAdminView class * admin view class of the importer module diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php index 268eaf968..13914a71b 100644 --- a/modules/importer/importer.class.php +++ b/modules/importer/importer.class.php @@ -1,4 +1,5 @@ */ /** * importer * high class of importer module diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index a0a253359..dc3d72be8 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -1,4 +1,5 @@ */ @set_time_limit(0); @require_once('./modules/importer/extract.class.php'); diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 00425f8c8..353a231e4 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class installAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/install/install.class.php b/modules/install/install.class.php index 104fa6f79..9435e4a74 100644 --- a/modules/install/install.class.php +++ b/modules/install/install.class.php @@ -1,4 +1,5 @@ */ /** * @class install * @author NAVER (developers@xpressengine.com) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 7f1b287c8..0e302525a 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -1,4 +1,5 @@ */ /** * @class installController * @author NAVER (developers@xpressengine.com) diff --git a/modules/install/install.model.php b/modules/install/install.model.php index 505361647..654610672 100644 --- a/modules/install/install.model.php +++ b/modules/install/install.model.php @@ -1,4 +1,5 @@ */ class installModel extends install { var $pwd; diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 3bf39452e..4db8fe48b 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -1,4 +1,5 @@ */ /** * @class installView * @author NAVER (developers@xpressengine.com) diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php index 29bf3b1a8..c4f58cc75 100644 --- a/modules/integration_search/integration_search.admin.controller.php +++ b/modules/integration_search/integration_search.admin.controller.php @@ -1,4 +1,5 @@ */ /** * The admin view class of the integration_search module * diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php index 420ba20fd..8e1bb4269 100644 --- a/modules/integration_search/integration_search.admin.view.php +++ b/modules/integration_search/integration_search.admin.view.php @@ -1,4 +1,5 @@ */ /** * The admin view class of the integration_search module * diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php index 482a42e29..06c993300 100644 --- a/modules/integration_search/integration_search.class.php +++ b/modules/integration_search/integration_search.class.php @@ -1,4 +1,5 @@ */ /** * The view class of the integration_search module * diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index ae8e54437..b739917a1 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -1,4 +1,5 @@ */ /** * The model class of integration module * diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index cec782e15..8da454be9 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -1,4 +1,5 @@ */ /** * The view class of the integration_search module * diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index 02e074b1c..1c830324d 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class layoutAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index ab75dfd0a..cbcd27311 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class layoutAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 4a043c14d..6f427aaaa 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class layoutAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php index 13e397a02..2519f6446 100644 --- a/modules/layout/layout.class.php +++ b/modules/layout/layout.class.php @@ -1,4 +1,5 @@ */ /** * @class layout * @author NAVER (developers@xpressengine.com) diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index a9c795a18..e0a9b8f49 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -1,4 +1,5 @@ */ /** * @class layoutModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index ea9d24688..c952f3e69 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -1,4 +1,5 @@ */ /** * @class layoutView * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 28bbf0bc4..5718e7ecb 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class memberAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index 0dde3b48a..06e344f7e 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class memberAdminModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 74bbe46ca..ebf1bde58 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class memberAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.api.php b/modules/member/member.api.php index 01ddcd531..8c70bb140 100644 --- a/modules/member/member.api.php +++ b/modules/member/member.api.php @@ -1,4 +1,5 @@ */ /** * @class memberAPI * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 463323fe0..e7bde82dd 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -1,4 +1,5 @@ */ /** * @class member * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index a2c15a429..4147f9ce7 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1,4 +1,5 @@ */ /** * @class memberController * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php index 101bf3ed9..b323d0ee3 100644 --- a/modules/member/member.mobile.php +++ b/modules/member/member.mobile.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_.'modules/member/member.view.php'); class memberMobile extends memberView { diff --git a/modules/member/member.model.php b/modules/member/member.model.php index baab61cf6..731d67b56 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -1,4 +1,5 @@ */ /** * @class memberModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 34003ec2e..8edab4b28 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -1,4 +1,5 @@ */ /** * @class memberView * @author NAVER (developers@xpressengine.com) diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index b84191839..47d55b0f1 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1,4 +1,5 @@ */ /** * menuAdminController class * admin controller class of the menu module diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 6cd1c038d..89d95015d 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class menuAdminModel * @brief admin model class of the menu module diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 14277317c..9400fba32 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -1,4 +1,5 @@ */ /** * menuAdminView class * admin view class of the menu module diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php index 3fd50bf0b..bd5521040 100644 --- a/modules/menu/menu.class.php +++ b/modules/menu/menu.class.php @@ -1,4 +1,5 @@ */ /** * menu class * high class of the menu module diff --git a/modules/menu/menu.mobile.php b/modules/menu/menu.mobile.php index 862ff76cc..7e9bf7fb7 100644 --- a/modules/menu/menu.mobile.php +++ b/modules/menu/menu.mobile.php @@ -1,4 +1,5 @@ */ /** * menuMobile class * mobile class of the menu module diff --git a/modules/message/message.admin.controller.php b/modules/message/message.admin.controller.php index a6dd4d4d2..03fd5a2bc 100644 --- a/modules/message/message.admin.controller.php +++ b/modules/message/message.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class messageAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/message/message.admin.model.php b/modules/message/message.admin.model.php index c7a91d088..3d53a1160 100644 --- a/modules/message/message.admin.model.php +++ b/modules/message/message.admin.model.php @@ -1,4 +1,5 @@ */ class messageAdminModel extends message{ public function getMessageAdminColorset() { @@ -26,4 +27,4 @@ class messageAdminModel extends message{ $this->add('tpl', $tpl); } -} \ No newline at end of file +} diff --git a/modules/message/message.admin.view.php b/modules/message/message.admin.view.php index 88bfb29a9..27468f8e0 100644 --- a/modules/message/message.admin.view.php +++ b/modules/message/message.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class messageAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/message/message.class.php b/modules/message/message.class.php index 7267245c3..462ceb37f 100644 --- a/modules/message/message.class.php +++ b/modules/message/message.class.php @@ -1,4 +1,5 @@ */ /** * @class message * @author NAVER (developers@xpressengine.com) diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php index c57c02a14..55371ff71 100644 --- a/modules/message/message.mobile.php +++ b/modules/message/message.mobile.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_.'modules/message/message.view.php'); class messageMobile extends messageView { diff --git a/modules/message/message.view.php b/modules/message/message.view.php index d3d23dafd..b935c444d 100644 --- a/modules/message/message.view.php +++ b/modules/message/message.view.php @@ -1,4 +1,5 @@ */ /** * @class messageView * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 752265c2b..a323f5c55 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class moduleAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 6a4839181..fad0674d3 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class moduleAdminModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 490e266db..004a79f76 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class moduleAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.class.php b/modules/module/module.class.php index 28bfe3b02..b7150bafb 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -1,4 +1,5 @@ */ /** * @class module * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 8bd46c4a2..322e7118c 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -1,4 +1,5 @@ */ /** * @class moduleController * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.mobile.php b/modules/module/module.mobile.php index 9f377a58f..32f40ad1e 100644 --- a/modules/module/module.mobile.php +++ b/modules/module/module.mobile.php @@ -1,4 +1,5 @@ */ class moduleMobile extends moduleObject { function dispModuleChangeLang() diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 22d12c261..d260abc7b 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -1,4 +1,5 @@ */ /** * @class moduleModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/module/module.view.php b/modules/module/module.view.php index d35bcd876..a69a748c8 100644 --- a/modules/module/module.view.php +++ b/modules/module/module.view.php @@ -1,4 +1,5 @@ */ /** * @class moduleView * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index d16a2a342..90b925a91 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class pageAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php index f360a915e..dc215ca81 100644 --- a/modules/page/page.admin.view.php +++ b/modules/page/page.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class pageAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.api.php b/modules/page/page.api.php index e26a78ed9..b844c10d5 100644 --- a/modules/page/page.api.php +++ b/modules/page/page.api.php @@ -1,4 +1,5 @@ */ /** * @class pageAPI * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.class.php b/modules/page/page.class.php index 3c1620347..2839dce2e 100644 --- a/modules/page/page.class.php +++ b/modules/page/page.class.php @@ -1,4 +1,5 @@ */ /** * @class page * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.controller.php b/modules/page/page.controller.php index cd29a0458..24378049c 100644 --- a/modules/page/page.controller.php +++ b/modules/page/page.controller.php @@ -1,4 +1,5 @@ */ /** * @class documentController * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php index a8b336a0c..417d082e1 100644 --- a/modules/page/page.mobile.php +++ b/modules/page/page.mobile.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_.'modules/page/page.view.php'); class pageMobile extends pageView diff --git a/modules/page/page.view.php b/modules/page/page.view.php index edae8c984..41c585b64 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -1,4 +1,5 @@ */ /** * @class pageView * @author NAVER (developers@xpressengine.com) diff --git a/modules/page/page.wap.php b/modules/page/page.wap.php index 8f4285ad0..1d8c5cebf 100644 --- a/modules/page/page.wap.php +++ b/modules/page/page.wap.php @@ -1,4 +1,5 @@ */ /** * @class pageWap * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index b42c46376..b788d1b97 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class pointAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php index cbed64420..d5b84f088 100644 --- a/modules/point/point.admin.view.php +++ b/modules/point/point.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class pointAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 9c3ed5511..3ff4d05cd 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -1,4 +1,5 @@ */ /** * @class point * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 1ac7311a6..1d317a1a8 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -1,4 +1,5 @@ */ /** * @class pointController * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.model.php b/modules/point/point.model.php index fa7279904..6d5a3b95b 100644 --- a/modules/point/point.model.php +++ b/modules/point/point.model.php @@ -1,4 +1,5 @@ */ /** * @class pointModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/point/point.view.php b/modules/point/point.view.php index af27ca7b8..c5e482b49 100644 --- a/modules/point/point.view.php +++ b/modules/point/point.view.php @@ -1,4 +1,5 @@ */ /** * @class pointView * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php index 5c46c0c06..9459d2d7b 100644 --- a/modules/poll/poll.admin.controller.php +++ b/modules/poll/poll.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class pollAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.admin.model.php b/modules/poll/poll.admin.model.php index 46e7fc013..c4da8adbf 100644 --- a/modules/poll/poll.admin.model.php +++ b/modules/poll/poll.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class pollAdminModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.admin.view.php b/modules/poll/poll.admin.view.php index 891276a4a..a3d4c4b6b 100644 --- a/modules/poll/poll.admin.view.php +++ b/modules/poll/poll.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class pollAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.class.php b/modules/poll/poll.class.php index d1893d7e3..3d8dac4de 100644 --- a/modules/poll/poll.class.php +++ b/modules/poll/poll.class.php @@ -1,4 +1,5 @@ */ /** * @class poll * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php index 305affd1a..bba43c900 100644 --- a/modules/poll/poll.controller.php +++ b/modules/poll/poll.controller.php @@ -1,4 +1,5 @@ */ /** * @class pollController * @author NAVER (developers@xpressengine.com) diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php index ff85fafda..79d3a7df5 100644 --- a/modules/poll/poll.model.php +++ b/modules/poll/poll.model.php @@ -1,4 +1,5 @@ */ /** * @class pollModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index a1c2a165a..208193bed 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -1,4 +1,5 @@ */ /** * The admin controller class of the rss module * diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php index c11967f85..30833e0ee 100644 --- a/modules/rss/rss.admin.view.php +++ b/modules/rss/rss.admin.view.php @@ -1,4 +1,5 @@ */ /** * The admin view class of the rss module * diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php index ac40f9c68..396be7ea1 100644 --- a/modules/rss/rss.class.php +++ b/modules/rss/rss.class.php @@ -1,4 +1,5 @@ */ /** * High class of rss module * diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php index f33428f2c..140c5dcea 100644 --- a/modules/rss/rss.controller.php +++ b/modules/rss/rss.controller.php @@ -1,4 +1,5 @@ */ /** * The controller class of rss module * diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php index 25466790f..7df8d6bdc 100644 --- a/modules/rss/rss.model.php +++ b/modules/rss/rss.model.php @@ -1,4 +1,5 @@ */ /** * The model class of the rss module * diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php index 85ca77f29..afdcacfa8 100644 --- a/modules/rss/rss.view.php +++ b/modules/rss/rss.view.php @@ -1,4 +1,5 @@ */ /** * The view class of the rss module * diff --git a/modules/session/session.admin.controller.php b/modules/session/session.admin.controller.php index 62c42027c..fb00d64c7 100644 --- a/modules/session/session.admin.controller.php +++ b/modules/session/session.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class sessionAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/session/session.admin.view.php b/modules/session/session.admin.view.php index e8f9b6c64..d1d4098b2 100644 --- a/modules/session/session.admin.view.php +++ b/modules/session/session.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class sessionAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/session/session.class.php b/modules/session/session.class.php index c9526ffc7..0b422e654 100644 --- a/modules/session/session.class.php +++ b/modules/session/session.class.php @@ -1,4 +1,5 @@ */ /** * @class session * @author NAVER (developers@xpressengine.com) diff --git a/modules/session/session.controller.php b/modules/session/session.controller.php index a2187a2d8..6661af4bb 100644 --- a/modules/session/session.controller.php +++ b/modules/session/session.controller.php @@ -1,4 +1,5 @@ */ /** * @class sessionController * @author NAVER (developers@xpressengine.com) diff --git a/modules/session/session.model.php b/modules/session/session.model.php index 991f63907..6663ab361 100644 --- a/modules/session/session.model.php +++ b/modules/session/session.model.php @@ -1,4 +1,5 @@ */ /** * @class sessionModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 02c696ecb..e2d4c66c9 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class spamfilterAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/spamfilter/spamfilter.admin.view.php b/modules/spamfilter/spamfilter.admin.view.php index 93e12e29a..ddce398a8 100644 --- a/modules/spamfilter/spamfilter.admin.view.php +++ b/modules/spamfilter/spamfilter.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class spamfilterAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php index 328dc0eda..1ae3b36c2 100644 --- a/modules/spamfilter/spamfilter.class.php +++ b/modules/spamfilter/spamfilter.class.php @@ -1,4 +1,5 @@ */ /** * @class spamfilter * @author NAVER (developers@xpressengine.com) diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 3bff2ccd8..db64ca398 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -1,4 +1,5 @@ */ /** * @class spamfilterController * @author NAVER (developers@xpressengine.com) diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index aef1ddcb5..1aa685f01 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -1,4 +1,5 @@ */ /** * @class spamfilterModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/tag/tag.admin.controller.php b/modules/tag/tag.admin.controller.php index 839c7a0bb..50d947ce5 100644 --- a/modules/tag/tag.admin.controller.php +++ b/modules/tag/tag.admin.controller.php @@ -1,4 +1,5 @@ */ /** * @class tagAdminController * @author NAVER (developers@xpressengine.com) diff --git a/modules/tag/tag.class.php b/modules/tag/tag.class.php index 251e0bd35..445da83fb 100644 --- a/modules/tag/tag.class.php +++ b/modules/tag/tag.class.php @@ -1,4 +1,5 @@ */ /** * @class tag * @author NAVER (developers@xpressengine.com) diff --git a/modules/tag/tag.controller.php b/modules/tag/tag.controller.php index 899471fc3..d5028d2dd 100644 --- a/modules/tag/tag.controller.php +++ b/modules/tag/tag.controller.php @@ -1,4 +1,5 @@ */ /** * @class tagController * @author NAVER (developers@xpressengine.com) diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php index f93c99f77..a34fc5c69 100644 --- a/modules/tag/tag.model.php +++ b/modules/tag/tag.model.php @@ -1,4 +1,5 @@ */ /** * @class tagModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php index 18e94cae8..53b9bd9fd 100644 --- a/modules/trackback/trackback.admin.controller.php +++ b/modules/trackback/trackback.admin.controller.php @@ -1,4 +1,5 @@ */ /** * trackbackAdminController class * trackback module admin controller class diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php index 20db5873a..c8403ce82 100644 --- a/modules/trackback/trackback.admin.model.php +++ b/modules/trackback/trackback.admin.model.php @@ -1,4 +1,5 @@ */ /** * @class trackbackAdminModel * @brief trackback module admin model class diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php index 2f520d290..2ae00ff7b 100644 --- a/modules/trackback/trackback.admin.view.php +++ b/modules/trackback/trackback.admin.view.php @@ -1,4 +1,5 @@ */ /** * trackbackAdminView class * trackback module admin view class diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php index 99121b487..ee17788a4 100644 --- a/modules/trackback/trackback.class.php +++ b/modules/trackback/trackback.class.php @@ -1,4 +1,5 @@ */ /** * trackback class * trackback module's high class diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php index ece0fae24..05c46f1a6 100644 --- a/modules/trackback/trackback.controller.php +++ b/modules/trackback/trackback.controller.php @@ -1,4 +1,5 @@ */ /** * trackbackController class * trackback module's Controller class diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php index f9b4bfa85..f50817c74 100644 --- a/modules/trackback/trackback.model.php +++ b/modules/trackback/trackback.model.php @@ -1,4 +1,5 @@ */ /** * trackbackModel class * trackback module model class diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php index faea62bc8..c5b6a2c07 100644 --- a/modules/trackback/trackback.view.php +++ b/modules/trackback/trackback.view.php @@ -1,4 +1,5 @@ */ /** * @class trackbackView * @brief trackback module's view class diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index abb918af0..4b975b6f4 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -1,4 +1,5 @@ */ /** * trashAdminController class * trash admin the module's controller class diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index 5080bf8ec..871912d4e 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -1,4 +1,5 @@ */ /** * trashAdminView class * Admin view class of the trash module diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php index 5e495719d..cb292d790 100644 --- a/modules/trash/trash.class.php +++ b/modules/trash/trash.class.php @@ -1,4 +1,5 @@ */ require_once(_XE_PATH_.'modules/trash/model/TrashVO.php'); /** diff --git a/modules/trash/trash.controller.php b/modules/trash/trash.controller.php index 876657213..809dda99c 100644 --- a/modules/trash/trash.controller.php +++ b/modules/trash/trash.controller.php @@ -1,4 +1,5 @@ */ /** * trashController * trash the module's controller class diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php index cd8a13a3d..9185d0e51 100644 --- a/modules/trash/trash.model.php +++ b/modules/trash/trash.model.php @@ -1,4 +1,5 @@ */ /** * trashModel class * trash the module's model class diff --git a/modules/trash/trash.view.php b/modules/trash/trash.view.php index c1e7ff88a..1562d133c 100644 --- a/modules/trash/trash.view.php +++ b/modules/trash/trash.view.php @@ -1,4 +1,5 @@ */ /** * trashView class * View class of the module trash diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php index 9c6542c51..6d38fe82b 100644 --- a/modules/widget/widget.admin.view.php +++ b/modules/widget/widget.admin.view.php @@ -1,4 +1,5 @@ */ /** * @class widgetAdminView * @author NAVER (developers@xpressengine.com) diff --git a/modules/widget/widget.class.php b/modules/widget/widget.class.php index ccd156586..89ce8eede 100644 --- a/modules/widget/widget.class.php +++ b/modules/widget/widget.class.php @@ -1,4 +1,5 @@ */ /** * @class widget * @author NAVER (developers@xpressengine.com) diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 55ac7aadd..94beded98 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -1,4 +1,5 @@ */ /** * @class widgetController * @author NAVER (developers@xpressengine.com) diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php index d929b74cf..06530773a 100644 --- a/modules/widget/widget.model.php +++ b/modules/widget/widget.model.php @@ -1,4 +1,5 @@ */ /** * @class widgetModel * @author NAVER (developers@xpressengine.com) diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php index 17be4aeb0..0e0e9476b 100644 --- a/modules/widget/widget.view.php +++ b/modules/widget/widget.view.php @@ -1,4 +1,5 @@ */ /** * @class widgetView * @author NAVER (developers@xpressengine.com) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 12da3030a..28119bdb3 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -1,4 +1,5 @@ */ if(!defined('__DEBUG__')) define('__DEBUG__', 1); if(!defined('__XE__')) define('__XE__', true); diff --git a/tests/FuncIncTest.class.php b/tests/FuncIncTest.class.php index bb49f66e9..ff436a91a 100644 --- a/tests/FuncIncTest.class.php +++ b/tests/FuncIncTest.class.php @@ -1,4 +1,5 @@ */ define('__XE__', 1); define('_XE_PATH_', realpath(dirname(__FILE__).'/../')); diff --git a/tests/classes/context/Context.mock.php b/tests/classes/context/Context.mock.php index f6c3888b8..7b577a9c7 100644 --- a/tests/classes/context/Context.mock.php +++ b/tests/classes/context/Context.mock.php @@ -1,4 +1,5 @@ */ if(!defined('FOLLOW_REQUEST_SSL')) define('FOLLOW_REQUEST_SSL',0); if(!defined('ENFORCE_SSL')) define('ENFORCE_SSL',1); diff --git a/tests/classes/context/ContextTest.php b/tests/classes/context/ContextTest.php index 70a61226c..d4551b4d6 100644 --- a/tests/classes/context/ContextTest.php +++ b/tests/classes/context/ContextTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; diff --git a/tests/classes/db/Helper.class.php b/tests/classes/db/Helper.class.php index 597d52ac3..e3aa4ad02 100644 --- a/tests/classes/db/Helper.class.php +++ b/tests/classes/db/Helper.class.php @@ -1,4 +1,5 @@ */ class Helper { static function cleanString($query){ @@ -20,4 +21,4 @@ } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/QueryTester.class.php b/tests/classes/db/QueryTester.class.php index 3fc911044..27c44aaa4 100644 --- a/tests/classes/db/QueryTester.class.php +++ b/tests/classes/db/QueryTester.class.php @@ -1,4 +1,5 @@ */ // Only supports queries inside modules for now @@ -317,4 +318,4 @@ } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php b/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php index 2e5f317f7..4b99ab824 100644 --- a/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php +++ b/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php @@ -1,4 +1,5 @@ */ /** * Test class for ConditionWithArgument. diff --git a/tests/classes/db/classes/db/queryparts/table/TableTest.php b/tests/classes/db/classes/db/queryparts/table/TableTest.php index df389a826..96ef0f230 100644 --- a/tests/classes/db/classes/db/queryparts/table/TableTest.php +++ b/tests/classes/db/classes/db/queryparts/table/TableTest.php @@ -1,4 +1,5 @@ */ /** * Test class for Table. diff --git a/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php index 905936df4..ca44d5dda 100644 --- a/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php +++ b/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php @@ -1,4 +1,5 @@ */ /** * Test class for Argument. diff --git a/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php index 17b43a3b5..23ded1838 100644 --- a/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php +++ b/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php @@ -1,4 +1,5 @@ */ /** * Test class for ConditionArgument. diff --git a/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php b/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php index 302b3505a..9d07584f7 100644 --- a/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php +++ b/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php @@ -1,4 +1,5 @@ */ /** * @file common/lang/en.lang.php * @author NAVER (developers@xpressengine.com) @@ -319,4 +320,4 @@ $lang->filter->invalid_number = "The format of %s is invalid. Please input numbe $lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.
To view them, please use another non-administrator ID."; $lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?'; -?> \ No newline at end of file +?> diff --git a/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php index 5aed5baa4..aafc07268 100644 --- a/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php +++ b/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php @@ -1,4 +1,5 @@ */ /** * Test class for QueryArgument. diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php index 02ce85348..97dda224b 100644 --- a/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php +++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php @@ -1,4 +1,5 @@ */ /** * Test class for ConditionTag. diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php index 860c44cc0..d449b65fc 100644 --- a/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php +++ b/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php @@ -1,4 +1,5 @@ */ /** * Test class for TableTag. */ @@ -129,4 +130,4 @@ $this->assertEquals("modules", $tag->getTableName()); } - } \ No newline at end of file + } diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php index 4beadadb8..466c22cad 100644 --- a/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php +++ b/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php @@ -1,4 +1,5 @@ */ /** * Test class for TablesTag. */ @@ -109,4 +110,4 @@ $this->assertTrue(is_a($tables[0], 'TableTag')); $this->assertTrue(is_a($tables[1], 'TableTag')); } - } \ No newline at end of file + } diff --git a/tests/classes/db/config/config.inc.php b/tests/classes/db/config/config.inc.php index 2c1a5106c..599a64464 100644 --- a/tests/classes/db/config/config.inc.php +++ b/tests/classes/db/config/config.inc.php @@ -1,4 +1,5 @@ */ error_reporting(E_ALL ^ E_NOTICE); define('_XE_PATH_', str_replace('tests/classes/db/config/config.inc.php', '', str_replace('\\', '/', __FILE__))); define('_TEST_PATH_', _XE_PATH_ . 'tests/classes/db/'); @@ -59,4 +60,4 @@ require_once(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionTag.class.php'); require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php'); require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php'); -?> \ No newline at end of file +?> diff --git a/tests/classes/db/db/CubridOnlineTest.php b/tests/classes/db/db/CubridOnlineTest.php index 8c368df4c..0e2556368 100644 --- a/tests/classes/db/db/CubridOnlineTest.php +++ b/tests/classes/db/db/CubridOnlineTest.php @@ -1,4 +1,5 @@ */ /** * Base class for tests for CUBRID SQL syntax diff --git a/tests/classes/db/db/CubridTest.php b/tests/classes/db/db/CubridTest.php index 8e3752771..dd02378c6 100644 --- a/tests/classes/db/db/CubridTest.php +++ b/tests/classes/db/db/CubridTest.php @@ -1,4 +1,5 @@ */ /** * Base class for tests for CUBRID SQL syntax diff --git a/tests/classes/db/db/DBTest.php b/tests/classes/db/db/DBTest.php index fe8f28ad6..cdc9e9f83 100644 --- a/tests/classes/db/db/DBTest.php +++ b/tests/classes/db/db/DBTest.php @@ -1,4 +1,5 @@ */ class DBTest extends PHPUnit_Framework_TestCase { diff --git a/tests/classes/db/db/ExpressionParserTest.php b/tests/classes/db/db/ExpressionParserTest.php index c43bd1f13..b48feef46 100644 --- a/tests/classes/db/db/ExpressionParserTest.php +++ b/tests/classes/db/db/ExpressionParserTest.php @@ -1,4 +1,5 @@ */ class ExpressionParserTest extends PHPUnit_Framework_TestCase { /* Escape char for: @@ -106,4 +107,4 @@ $this->_test("abs(score) + abs(totalscore)", NULL , 'abs('.$this->dbLeftEscapeChar.'score'.$this->dbRightEscapeChar.') + abs('.$this->dbLeftEscapeChar.'totalscore'.$this->dbRightEscapeChar.')'); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/MockDb.php b/tests/classes/db/db/MockDb.php index bfdd6d3ef..009dbff21 100644 --- a/tests/classes/db/db/MockDb.php +++ b/tests/classes/db/db/MockDb.php @@ -1,4 +1,5 @@ */ /** * @brief Mock database base class @@ -78,4 +79,4 @@ } } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/db/MssqlOnlineTest.php b/tests/classes/db/db/MssqlOnlineTest.php index 54d9fa7a9..497f6e1a7 100644 --- a/tests/classes/db/db/MssqlOnlineTest.php +++ b/tests/classes/db/db/MssqlOnlineTest.php @@ -1,4 +1,5 @@ */ /** * Base class for tests for MSSQL SQL syntax diff --git a/tests/classes/db/db/MssqlTest.php b/tests/classes/db/db/MssqlTest.php index 47149ee38..1f09ed99b 100644 --- a/tests/classes/db/db/MssqlTest.php +++ b/tests/classes/db/db/MssqlTest.php @@ -1,4 +1,5 @@ */ /* * To change this template, choose Tools | Templates diff --git a/tests/classes/db/db/MysqlTest.php b/tests/classes/db/db/MysqlTest.php index d04c83ef6..c78e857b3 100644 --- a/tests/classes/db/db/MysqlTest.php +++ b/tests/classes/db/db/MysqlTest.php @@ -1,4 +1,5 @@ */ /** * Base class for tests for Mysql SQL syntax diff --git a/tests/classes/db/db/SqliteTest.php b/tests/classes/db/db/SqliteTest.php index edb62d647..b1916b921 100644 --- a/tests/classes/db/db/SqliteTest.php +++ b/tests/classes/db/db/SqliteTest.php @@ -1,4 +1,5 @@ */ /** * Base class for tests for Sqlite SQL syntax diff --git a/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php b/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php index 0a210462c..0e9bc8ec1 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php @@ -1,4 +1,5 @@ */ class CubridDeleteTest extends CubridTest { @@ -17,4 +18,4 @@ and "act" = \'tata\''; $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php b/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php index 5133db710..78552090a 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php @@ -1,4 +1,5 @@ */ class CubridIndexHintTest extends CubridTest { var $xmlPath = 'data/'; diff --git a/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php b/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php index 4f8437abf..5ce67752e 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php @@ -1,4 +1,5 @@ */ class CubridInsertOnlineTest extends CubridOnlineTest { @@ -82,4 +83,4 @@ } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php b/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php index 96682c210..204726450 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php @@ -1,4 +1,5 @@ */ class CubridInsertTest extends CubridTest { @@ -124,4 +125,4 @@ $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php index 601d0f9b1..6d4abb679 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php @@ -1,4 +1,5 @@ */ class CubridSelectOnlineTest extends CubridOnlineTest { diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php index 44c3c6bf2..bd439956f 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php @@ -1,4 +1,5 @@ */ class CubridSelectTest extends CubridTest { @@ -452,4 +453,4 @@ $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php index 81fbcf5b1..42d5c59b0 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php @@ -1,4 +1,5 @@ */ /* * To change this template, choose Tools | Templates diff --git a/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php b/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php index a836ea8b4..2f1012d4b 100644 --- a/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php +++ b/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php @@ -1,4 +1,5 @@ */ class CubridUpdateTest extends CubridTest { @@ -94,4 +95,4 @@ // $queryTester->test_module_insertModule(); - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php b/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php index b322cc974..307381d20 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php @@ -1,4 +1,5 @@ */ class MssqlIndexHintTest extends MssqlTest { var $xmlPath = 'data/'; diff --git a/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php b/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php index 44867e38f..aef9cc250 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php @@ -1,4 +1,5 @@ */ class MssqlSelectOnlineTest extends MssqlOnlineTest { function test_syndication_getGrantedModule(){ @@ -8,4 +9,4 @@ } } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php b/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php index 2b04c3106..64b3d3524 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php @@ -1,4 +1,5 @@ */ class MssqlSelectTest extends MssqlTest { @@ -167,4 +168,4 @@ or [group_srl] = -2)'; $this->_test($xml_file, $argsString, $expected, array(67)); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php b/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php index bcd57fbb2..704771aa3 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php @@ -1,4 +1,5 @@ */ class MssqlUpdateOnlineTest extends MssqlOnlineTest { function test_counter_updateCounterUnique(){ @@ -9,4 +10,4 @@ } } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php index c3b1d8fb3..8d45a548c 100644 --- a/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php +++ b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php @@ -1,4 +1,5 @@ */ class MssqlUpdateTest extends MssqlTest { @@ -19,4 +20,4 @@ class MssqlUpdateTest extends MssqlTest { } -?> \ No newline at end of file +?> diff --git a/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php b/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php index 65d6bea3b..bec4ac6c7 100644 --- a/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php +++ b/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php @@ -1,4 +1,5 @@ */ class MysqlIndexHintTest extends MysqlTest { var $xmlPath = 'data/'; diff --git a/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php b/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php index d4bbdce97..aeb6c7057 100644 --- a/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php +++ b/tests/classes/db/db/xml_query/mysql/MysqlInsertTest.php @@ -1,4 +1,5 @@ */ /** * @class MysqlInsertTest diff --git a/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php index 28d2266fd..53d2a6583 100644 --- a/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php +++ b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php @@ -1,4 +1,5 @@ */ class MysqlSelectTest extends MysqlTest { diff --git a/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php b/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php index f03c4e2ee..5ba5799a8 100644 --- a/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php +++ b/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php @@ -1,4 +1,5 @@ */ class MysqlUpdateTest extends MysqlTest { @@ -72,4 +73,4 @@ where `session_key` = \'339321\''; $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php b/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php index 0d5a1c7c8..5bc3830fd 100644 --- a/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php +++ b/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php @@ -1,4 +1,5 @@ */ class SqliteDeleteTest extends SqliteTest { @@ -14,4 +15,4 @@ $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php b/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php index 2df8e2911..2ab9c149d 100644 --- a/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php +++ b/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php @@ -1,4 +1,5 @@ */ class SqliteUpdateTest extends SqliteTest { @@ -18,4 +19,4 @@ $this->_test($xml_file, $argsString, $expected); } - } \ No newline at end of file + } diff --git a/tests/classes/file/FileHandlerTest.php b/tests/classes/file/FileHandlerTest.php index fd56816a5..793a76fe6 100644 --- a/tests/classes/file/FileHandlerTest.php +++ b/tests/classes/file/FileHandlerTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; diff --git a/tests/classes/frontendfile/FrontEndFileHandlerTest.php b/tests/classes/frontendfile/FrontEndFileHandlerTest.php index 69852c667..439b11202 100644 --- a/tests/classes/frontendfile/FrontEndFileHandlerTest.php +++ b/tests/classes/frontendfile/FrontEndFileHandlerTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; diff --git a/tests/classes/security/SecurityTest.php b/tests/classes/security/SecurityTest.php index cb865f3a4..793bfb903 100644 --- a/tests/classes/security/SecurityTest.php +++ b/tests/classes/security/SecurityTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; diff --git a/tests/classes/template/TemplateHandlerTest.php b/tests/classes/template/TemplateHandlerTest.php index 09ea8c6a9..a377f0eee 100644 --- a/tests/classes/template/TemplateHandlerTest.php +++ b/tests/classes/template/TemplateHandlerTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; diff --git a/tests/classes/validator/ValidatorTest.php b/tests/classes/validator/ValidatorTest.php index 4b1f176fe..c5d7d9bcb 100644 --- a/tests/classes/validator/ValidatorTest.php +++ b/tests/classes/validator/ValidatorTest.php @@ -1,4 +1,5 @@ */ if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php'; require_once _XE_PATH_.'classes/xml/XmlParser.class.php'; diff --git a/tests/modules/admin/admin.Test.php b/tests/modules/admin/admin.Test.php index 08456c9f2..b94d500b7 100644 --- a/tests/modules/admin/admin.Test.php +++ b/tests/modules/admin/admin.Test.php @@ -1,4 +1,5 @@ */ error_reporting(0); class adminAdminControllerTest extends PHPUnit_Framework_TestCase diff --git a/tests/modules/document/document.Test.php b/tests/modules/document/document.Test.php index 916b7faea..2ae086c70 100644 --- a/tests/modules/document/document.Test.php +++ b/tests/modules/document/document.Test.php @@ -1,4 +1,5 @@ */ error_reporting(0); class documentModelTest extends PHPUnit_Framework_TestCase diff --git a/tools/dbxml_validator/connect_wrapper.php b/tools/dbxml_validator/connect_wrapper.php index d138f073f..0d5afda6d 100644 --- a/tools/dbxml_validator/connect_wrapper.php +++ b/tools/dbxml_validator/connect_wrapper.php @@ -1,4 +1,5 @@ */ /** @file vi: ts=4 diff --git a/tools/dbxml_validator/tests/xmlQueriesTest.php b/tools/dbxml_validator/tests/xmlQueriesTest.php index 212a5c67e..49b5f9c5e 100644 --- a/tools/dbxml_validator/tests/xmlQueriesTest.php +++ b/tools/dbxml_validator/tests/xmlQueriesTest.php @@ -1,4 +1,5 @@ */ if (!defined('__DIR__')) define('__DIR__', realpath(dirname(__FILE__))); diff --git a/tools/dbxml_validator/validate.php b/tools/dbxml_validator/validate.php index 7ac6cca2a..d605a94b0 100644 --- a/tools/dbxml_validator/validate.php +++ b/tools/dbxml_validator/validate.php @@ -1,5 +1,6 @@ #!/bin/env php */ /** vi:set ts=4: @file diff --git a/tools/minify/cssmin/CSSmin.php b/tools/minify/cssmin/CSSmin.php index bb0e52503..a32bb7832 100644 --- a/tools/minify/cssmin/CSSmin.php +++ b/tools/minify/cssmin/CSSmin.php @@ -1,4 +1,5 @@ */ /*! * cssmin.php rev 91c5ea5 diff --git a/tools/minify/jsminplus/jsminplus.php b/tools/minify/jsminplus/jsminplus.php index 4afa43adc..885edee41 100644 --- a/tools/minify/jsminplus/jsminplus.php +++ b/tools/minify/jsminplus/jsminplus.php @@ -1,4 +1,5 @@ */ /** * JSMinPlus version 1.3 @@ -1977,4 +1978,4 @@ class JSToken public $assignOp; } -?> \ No newline at end of file +?> diff --git a/tools/minify/minify.php b/tools/minify/minify.php index 7a7cb6045..37204776f 100755 --- a/tools/minify/minify.php +++ b/tools/minify/minify.php @@ -1,4 +1,5 @@ */ /** * Minify * This script comnbines multiple JavaScript or CSS files with minifying. diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index f1923e54b..4cd452670 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -1,4 +1,5 @@ */ /** * @class content * @author NAVER (developers@xpressengine.com) diff --git a/widgets/counter_status/counter_status.class.php b/widgets/counter_status/counter_status.class.php index c4ff67123..0e47dc181 100644 --- a/widgets/counter_status/counter_status.class.php +++ b/widgets/counter_status/counter_status.class.php @@ -1,4 +1,5 @@ */ /** * @class counter_status * @author NAVER (developers@xpressengine.com) diff --git a/widgets/language_select/language_select.class.php b/widgets/language_select/language_select.class.php index 7715bc46a..6e8ee001c 100644 --- a/widgets/language_select/language_select.class.php +++ b/widgets/language_select/language_select.class.php @@ -1,4 +1,5 @@ */ /** * @class language_select * @author NAVER (developers@xpressengine.com) diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php index 37118b8fe..d3cf2d9d8 100644 --- a/widgets/login_info/login_info.class.php +++ b/widgets/login_info/login_info.class.php @@ -1,4 +1,5 @@ */ /** * @class login_info * @author NAVER (developers@xpressengine.com) diff --git a/widgets/login_info/skins/default/default.login.css b/widgets/login_info/skins/default/default.login.css index 14331fd5e..9e4f443e2 100644 --- a/widgets/login_info/skins/default/default.login.css +++ b/widgets/login_info/skins/default/default.login.css @@ -1,4 +1,5 @@ -@charset "utf-8";.account{display:inline-block;*display:inline;zoom:1;vertical-align:top;margin:0;padding:0} +@charset "utf-8"; +.account{display:inline-block;*display:inline;zoom:1;vertical-align:top;margin:0;padding:0} .account>a, .account>.info .logout{display:inline-block;*display:inline;*zoom:1;background:#f7f7f7;border:1px solid #d4d8db;border-radius:2px;box-shadow:1px 1px 0 #f3f3f3;color:#666;text-decoration:none;padding:0 10px;line-height:21px;font-weight:bold;font-size:12px} .account>fieldset{position:absolute;z-index:2;width:229px;top:30px;right:0;display:none;border:0;background:#fff;border:1px solid #d7d7d7;border-radius:3px;margin:0;padding:20px 16px 18px 16px;box-shadow:0 1px 0 #aaa} @@ -21,4 +22,4 @@ .account .info{list-style:none;margin:0;padding:0} .account .info>li{display:inline-block;*display:inline;zoom:1} .account .info .user{display:inline-block;font-size:13px;font-weight:bold;color:#333;text-decoration:none;margin:0 10px 0 0} -.account .info .user:before{content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 2px 0 0;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAKNJREFUeNpijI2NZcAC2IA4EIg5gXgrEL9GV8CCRZMQEJ8EYhUo/x0QpwPxGmRFTFg0+iFpghlUga4Im0ZmHE4nqJGBXI3vsIi9IEYjKBQvo4k1EaPxFxDPReLfB+J9xGiURgtFRSAuxafRA4iXAvFtIJZAU9cFxJeAuAhqMDgBcEIjXJdAyILke6GG+INsFCVCE3o8e4Ns/ALEsxhIA0cAAgwAuLwYvH6hEcQAAAAASUVORK5CYII=) no-repeat} \ No newline at end of file +.account .info .user:before{content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 2px 0 0;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAKNJREFUeNpijI2NZcAC2IA4EIg5gXgrEL9GV8CCRZMQEJ8EYhUo/x0QpwPxGmRFTFg0+iFpghlUga4Im0ZmHE4nqJGBXI3vsIi9IEYjKBQvo4k1EaPxFxDPReLfB+J9xGiURgtFRSAuxafRA4iXAvFtIJZAU9cFxJeAuAhqMDgBcEIjXJdAyILke6GG+INsFCVCE3o8e4Ns/ALEsxhIA0cAAgwAuLwYvH6hEcQAAAAASUVORK5CYII=) no-repeat} diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css b/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css index c8312051f..e81bef9dd 100644 --- a/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css +++ b/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css @@ -51,4 +51,4 @@ .mbInfo_window li.i4 {background:url(../images/icon_article.gif) no-repeat top left;} .mbInfo_window li.i5 {background:url(../images/icon_friends.gif) no-repeat top left;} .mbInfo_window li.i6 {background:url(../images/icon_message.gif) no-repeat top left;} -.mbInfo_window li.i7 {background:url(../images/icon_tool.gif) no-repeat top left;} \ No newline at end of file +.mbInfo_window li.i7 {background:url(../images/icon_tool.gif) no-repeat top left;} diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php index 3e9c3eb24..e7b6b4f5c 100644 --- a/widgets/mcontent/mcontent.class.php +++ b/widgets/mcontent/mcontent.class.php @@ -1,4 +1,5 @@ */ /** * @class mcontent * @author NAVER (developers@xpressengine.com) From 3581db593226f4964675f33937de449060c3dc8f Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 8 Nov 2013 06:04:28 +0000 Subject: [PATCH 008/473] remove cdn feature git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13187 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 13 +---- .../FrontEndFileHandler.class.php | 48 +++---------------- classes/template/TemplateHandler.class.php | 4 +- config/config.inc.php | 18 ------- modules/admin/admin.admin.view.php | 1 - modules/admin/lang/lang.xml | 14 ------ modules/admin/tpl/config_general.html | 8 ---- modules/counter/tpl/index.html | 12 ++--- modules/document/tpl/category_list.html | 2 +- modules/document/tpl/checked_list.html | 2 +- modules/document/tpl/declared_list.html | 2 +- modules/document/tpl/document_list.html | 2 +- modules/document/tpl/extra_keys.html | 2 +- modules/document/tpl/header.html | 2 +- modules/document/tpl/preview_page.html | 2 +- modules/document/tpl/print_page.html | 2 +- modules/editor/tpl/admin_index.html | 2 +- modules/editor/tpl/editor_module_config.html | 2 +- modules/editor/tpl/setup_component.html | 6 +-- modules/editor/tpl/view_component.html | 6 +-- modules/file/tpl/file_list.html | 2 +- modules/file/tpl/header.html | 2 +- modules/importer/tpl/header.html | 4 +- modules/importer/tpl/index.html | 2 +- modules/install/install.admin.controller.php | 4 -- modules/integration_search/tpl/header.html | 2 +- modules/integration_search/tpl/index.html | 2 +- modules/layout/tpl/copy_layout.html | 2 +- .../layout/tpl/layout_all_instance_list.html | 2 +- modules/layout/tpl/layout_edit.html | 2 +- modules/layout/tpl/layout_instance_list.html | 2 +- .../m.skins/default/find_member_account.html | 6 +-- .../m.skins/default/find_temp_password.html | 2 +- .../member/m.skins/default/leave_form.html | 6 +-- .../member/m.skins/default/login_form.html | 4 +- .../m.skins/default/modify_email_address.html | 6 +-- .../member/m.skins/default/modify_info.html | 2 +- .../m.skins/default/modify_password.html | 6 +-- .../m.skins/default/rechecked_password.html | 2 +- .../member/m.skins/default/signup_form.html | 6 +-- modules/member/tpl/group_list.html | 4 +- modules/member/tpl/insert_member.html | 2 +- modules/member/tpl/member_list.html | 6 +-- modules/member/tpl/signup_config.html | 2 +- .../message/skins/default/system_message.html | 2 +- modules/module/tpl/copy_module.html | 2 +- modules/module/tpl/filebox_add.html | 2 +- modules/module/tpl/header.html | 2 +- .../module/tpl/include.manage_selected.html | 2 +- .../tpl/include.module_grant_setup.html | 2 +- modules/module/tpl/lang.html | 2 +- modules/module/tpl/module_grant_setup.html | 2 +- modules/module/tpl/module_grants.html | 2 +- modules/module/tpl/module_selector.html | 2 +- modules/module/tpl/module_setup.html | 2 +- modules/module/tpl/skin_info.html | 2 +- modules/page/tpl/article_content_modify.html | 2 +- modules/page/tpl/content.html | 2 +- modules/page/tpl/header.html | 2 +- modules/page/tpl/index.html | 8 ++-- modules/page/tpl/mcontent.html | 2 +- modules/page/tpl/mobile.html | 2 +- modules/page/tpl/page_content_modify.html | 8 ++-- modules/page/tpl/page_delete.html | 2 +- .../page/tpl/page_mobile_content_modify.html | 8 ++-- modules/point/tpl/header.html | 2 +- modules/point/tpl/member_list.html | 2 +- modules/point/tpl/point_module_config.html | 2 +- modules/poll/tpl/config.html | 2 +- modules/poll/tpl/poll_list.html | 2 +- modules/poll/tpl/result.html | 2 +- modules/session/tpl/index.html | 2 +- modules/spamfilter/tpl/header.html | 2 +- modules/trackback/tpl/trackback_list.html | 2 +- modules/trash/tpl/header.html | 2 +- modules/trash/tpl/trash_list.html | 2 +- modules/widget/tpl/add_content_widget.html | 4 +- modules/widget/tpl/skin_info.html | 2 +- modules/widget/tpl/widget_detail_info.html | 4 +- modules/widget/tpl/widget_generate_code.html | 2 +- .../tpl/widget_generate_code.include.html | 6 +-- .../tpl/widget_generate_code_in_page.html | 16 +++---- .../widget_style_generate_code_in_page.html | 16 +++---- 83 files changed, 137 insertions(+), 225 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 1426bfcba..ace27ba4e 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1994,22 +1994,13 @@ class Context * $args[1]: media, * $args[2]: target IE, * $args[3]: index - * @param bool $useCdn use cdn - * @param string $cdnPrefix cdn prefix - * @param string $cdnVersion cdn version * */ - function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '') + function loadFile($args) { is_a($this, 'Context') ? $self = $this : $self = Context::getInstance(); - if($useCdn && !$cdnPrefix) - { - $cdnPrefix = __XE_CDN_PREFIX__; - $cdnVersion = __XE_CDN_VERSION__; - } - - $self->oFrontEndFileHandler->loadFile($args, $useCdn, $cdnPrefix, $cdnVersion); + $self->oFrontEndFileHandler->loadFile($args); } /** diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 316946203..5fbc7b7dc 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -87,28 +87,15 @@ class FrontEndFileHandler extends Handler * $args[3]: index * * - * If $useCdn set true, use CDN instead local file. - * CDN path = $cdnPrefix . $cdnVersion . $args[0]
- *
- * i.e.
- * $cdnPrefix = 'http://static.xpressengine.com/core/';
- * $cdnVersion = 'ardent1';
- * $args[0] = './common/js/xe.js';
- * The CDN path is http://static.xprssengine.com/core/ardent1/common/js/xe.js.
- * * @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 = '') + function loadFile($args) { if(!is_array($args)) { $args = array($args); } - $file = $this->getFileInfo($args[0], $args[2], $args[1]); $availableExtension = array('css' => 1, 'js' => 1); @@ -117,9 +104,6 @@ class FrontEndFileHandler extends Handler return; } - $file->useCdn = $useCdn; - $file->cdnPrefix = $cdnPrefix; - $file->cdnVersion = $cdnVersion; $file->index = (int) $args[3]; if($file->fileExtension == 'css') @@ -294,23 +278,14 @@ class FrontEndFileHandler extends Handler $this->_sortMap($map, $mapIndex); - $dbInfo = Context::getDBInfo(); - $useCdn = $dbInfo->use_cdn; - $result = array(); foreach($map as $indexedMap) { foreach($indexedMap as $file) { - if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') - { - $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; - } - else - { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - } + $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; + $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; + $result[] = array('file' => $fullFilePath, 'media' => $file->media, 'targetie' => $file->targetIe); } } @@ -339,23 +314,14 @@ class FrontEndFileHandler extends Handler $this->_sortMap($map, $mapIndex); - $dbInfo = Context::getDBInfo(); - $useCdn = $dbInfo->use_cdn; - $result = array(); foreach($map as $indexedMap) { foreach($indexedMap as $file) { - if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') - { - $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; - } - else - { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - } + $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; + $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; + $result[] = array('file' => $fullFilePath, 'targetie' => $file->targetIe); } } diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 44e23bf2b..1e7cd753d 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -675,7 +675,7 @@ class TemplateHandler else { $metafile = $attr['target']; - $result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);"; + $result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);"; } break; case 'css': @@ -686,7 +686,7 @@ class TemplateHandler else { $metafile = $attr['target']; - $result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);"; + $result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);"; } break; } diff --git a/config/config.inc.php b/config/config.inc.php index ab9a5d9eb..0d986c1e5 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -100,8 +100,6 @@ else * define('__OB_GZHANDLER_ENABLE__', 1); * define('__ENABLE_PHPUNIT_TEST__', 0); * define('__PROXY_SERVER__', 'http://domain:port/path'); - * define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/'); - * define('__XE_CDN_VERSION__', 'yourCdnVersion'); */ if(file_exists(_XE_PATH_ . 'config/config.user.inc.php')) { @@ -234,22 +232,6 @@ if(!defined('__PROXY_SERVER__')) define('__PROXY_SERVER__', NULL); } -if(!defined('__XE_CDN_PREFIX__')) -{ - /** - * CDN prefix - */ - define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/'); -} - -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) { diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 2baca8c6f..afe1fb678 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -59,7 +59,6 @@ class adminAdminView extends admin Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y'); Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N'); Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none"); - Context::set('use_cdn', $db_info->use_cdn ? $db_info->use_cdn : "none"); if($db_info->http_port) { Context::set('http_port', $db_info->http_port); diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 4bb5d8190..c5b3d3ac8 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -880,13 +880,6 @@ - - - - - - - @@ -1017,13 +1010,6 @@ - - - - - - - diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html index 9c7d6b2e7..766347010 100644 --- a/modules/admin/tpl/config_general.html +++ b/modules/admin/tpl/config_general.html @@ -164,14 +164,6 @@ -
- -
- - -

{$lang->about_cdn}

-
-
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html index d8ed0d7c3..bb1a5a34b 100644 --- a/modules/counter/tpl/index.html +++ b/modules/counter/tpl/index.html @@ -1,5 +1,5 @@ - - + + @@ -73,14 +73,14 @@ - +
- + @@ -91,7 +91,7 @@ {@$img_width = 1} - - ":a.browser.firefox?"":"";for(var f='
+ {$key} @@ -102,7 +102,7 @@ {$key} + {$key} {$lang->unit_year} diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html index de5412a05..cd469383c 100644 --- a/modules/document/tpl/category_list.html +++ b/modules/document/tpl/category_list.html @@ -4,7 +4,7 @@ - + - +

{$lang->document} {$lang->help}

diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index af115fe4c..8cdf6e556 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +

{$lang->document} {$lang->help}

diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html index e0c43a2f7..22f3edbbe 100644 --- a/modules/document/tpl/extra_keys.html +++ b/modules/document/tpl/extra_keys.html @@ -1,4 +1,4 @@ - + diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html index 4ca9dc4b5..0a95fde2a 100644 --- a/modules/document/tpl/header.html +++ b/modules/document/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->document} {$lang->cmd_management}

{$lang->document_list} diff --git a/modules/document/tpl/preview_page.html b/modules/document/tpl/preview_page.html index 5195e31d4..eb1e0f8a3 100644 --- a/modules/document/tpl/preview_page.html +++ b/modules/document/tpl/preview_page.html @@ -1,4 +1,4 @@ - + {$content}

diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 9cffeb1af..0fc174353 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -1,4 +1,4 @@ - +

{$oDocument->getTitleText()}

{$oDocument->get('nick_name')} {$oDocument->getRegdate()} diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index 963879de7..283620454 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -1,4 +1,4 @@ - +

{$lang->editor} {$lang->help}

diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 71bff861c..0061f0a61 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -1,5 +1,5 @@ - +
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html index 6f2bda1e3..9c653a711 100644 --- a/modules/editor/tpl/setup_component.html +++ b/modules/editor/tpl/setup_component.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->editor}

diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 7f5478941..10cc4ebaf 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -1,6 +1,6 @@ - - - + + +

{$component->title} ver. {$component->version}

diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 73de322c9..ffe181a40 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +
diff --git a/modules/file/tpl/header.html b/modules/file/tpl/header.html index b624d5adf..0ee48c509 100644 --- a/modules/file/tpl/header.html +++ b/modules/file/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->file} {$lang->cmd_management}

{$lang->file_list} diff --git a/modules/importer/tpl/header.html b/modules/importer/tpl/header.html index f66d188eb..da53b10da 100644 --- a/modules/importer/tpl/header.html +++ b/modules/importer/tpl/header.html @@ -1,5 +1,5 @@ - - + + {@ $type_list = array('module'=>$lang->type_module, 'ttxml'=>$lang->type_ttxml, 'member'=>$lang->type_member, 'sync'=>$lang->type_syncmember, 'message'=>$lang->type_message) }

{$lang->importer} {$lang->help}

diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html index 5923ebf5a..cac85a045 100644 --- a/modules/importer/tpl/index.html +++ b/modules/importer/tpl/index.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 353a231e4..fe149412a 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -67,9 +67,6 @@ class installAdminController extends install $http_port = Context::get('http_port'); $https_port = Context::get('https_port'); - $use_cdn = Context::get('use_cdn'); - if($use_cdn != 'Y') $use_cdn = 'N'; - $use_rewrite = Context::get('use_rewrite'); if($use_rewrite!='Y') $use_rewrite = 'N'; @@ -92,7 +89,6 @@ class installAdminController extends install $db_info->use_rewrite = $use_rewrite; $db_info->use_sso = $use_sso; $db_info->use_ssl = $use_ssl; - $db_info->use_cdn = $use_cdn; $db_info->use_html5 = $use_html5; $db_info->admin_ip_list = $admin_ip_list; diff --git a/modules/integration_search/tpl/header.html b/modules/integration_search/tpl/header.html index b72cf7348..f19d26fdd 100644 --- a/modules/integration_search/tpl/header.html +++ b/modules/integration_search/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->integration_search}

diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index 600e805e6..1835af521 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/layout/tpl/copy_layout.html b/modules/layout/tpl/copy_layout.html index 795b71305..96054e5d9 100644 --- a/modules/layout/tpl/copy_layout.html +++ b/modules/layout/tpl/copy_layout.html @@ -3,7 +3,7 @@ var newTitle = '{$lang->new_title}'; var layoutTitle = '{$layout->layout_title}'; var addLang = '{$lang->cmd_insert}'; - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html index 47198a717..bcc8394e3 100644 --- a/modules/layout/tpl/layout_all_instance_list.html +++ b/modules/layout/tpl/layout_all_instance_list.html @@ -1,5 +1,5 @@ - + diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html index eb4921a00..e926f5854 100644 --- a/modules/layout/tpl/layout_edit.html +++ b/modules/layout/tpl/layout_edit.html @@ -1,5 +1,5 @@ - +

{nl2br($lang->about_layout_code)}

{$lang->layout_image_repository}

diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html index 13cc2d60a..702ea4fca 100644 --- a/modules/layout/tpl/layout_instance_list.html +++ b/modules/layout/tpl/layout_instance_list.html @@ -1,5 +1,5 @@ - + diff --git a/modules/member/m.skins/default/find_member_account.html b/modules/member/m.skins/default/find_member_account.html index 5eb2b0bdf..517d11bd0 100644 --- a/modules/member/m.skins/default/find_member_account.html +++ b/modules/member/m.skins/default/find_member_account.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->cmd_find_member_account_with_email}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/find_temp_password.html b/modules/member/m.skins/default/find_temp_password.html index 3ba9e7c94..b625fd6b4 100644 --- a/modules/member/m.skins/default/find_temp_password.html +++ b/modules/member/m.skins/default/find_temp_password.html @@ -1,4 +1,4 @@ - +

{$lang->cmd_find_member_account}

{$lang->about_temp_password}

diff --git a/modules/member/m.skins/default/leave_form.html b/modules/member/m.skins/default/leave_form.html index 200906203..eba8cb714 100644 --- a/modules/member/m.skins/default/leave_form.html +++ b/modules/member/m.skins/default/leave_form.html @@ -1,6 +1,6 @@ - - - + + +

{$member_title = $lang->msg_leave_member}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/login_form.html b/modules/member/m.skins/default/login_form.html index c83f542b8..24493b6ca 100644 --- a/modules/member/m.skins/default/login_form.html +++ b/modules/member/m.skins/default/login_form.html @@ -1,5 +1,5 @@ - - + +

{$lang->cmd_login}

diff --git a/modules/member/m.skins/default/modify_email_address.html b/modules/member/m.skins/default/modify_email_address.html index 3f8577f50..8951bf884 100644 --- a/modules/member/m.skins/default/modify_email_address.html +++ b/modules/member/m.skins/default/modify_email_address.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->cmd_modify_member_email_address}

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/member/m.skins/default/modify_info.html b/modules/member/m.skins/default/modify_info.html index 76080093f..e70313449 100644 --- a/modules/member/m.skins/default/modify_info.html +++ b/modules/member/m.skins/default/modify_info.html @@ -6,7 +6,7 @@ - + diff --git a/modules/module/tpl/lang.html b/modules/module/tpl/lang.html index 955508825..8ede243f6 100644 --- a/modules/module/tpl/lang.html +++ b/modules/module/tpl/lang.html @@ -1,4 +1,4 @@ - +

Select Your Language

diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index e596e58e7..3a1476010 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -1,4 +1,4 @@ - + diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 89dd5c87e..27dac3b18 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -1,5 +1,5 @@ - + - + @@ -92,7 +92,7 @@ jQuery(function($){ - + diff --git a/modules/page/tpl/mcontent.html b/modules/page/tpl/mcontent.html index 6339ceeb5..36b180a06 100644 --- a/modules/page/tpl/mcontent.html +++ b/modules/page/tpl/mcontent.html @@ -1,6 +1,6 @@ {$page_content} - +

{$lang->about_mcontent}

diff --git a/modules/page/tpl/mobile.html b/modules/page/tpl/mobile.html index e295f91fe..ec955fb92 100644 --- a/modules/page/tpl/mobile.html +++ b/modules/page/tpl/mobile.html @@ -1,4 +1,4 @@ - +
{$page_content}
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 388d59632..520abe078 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -1,8 +1,8 @@ - - - - + + + +
{$page_content}
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index a1cbf33aa..5f3d6c64b 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -1,4 +1,4 @@ - +
diff --git a/modules/page/tpl/page_mobile_content_modify.html b/modules/page/tpl/page_mobile_content_modify.html index 3b6486696..7be77183b 100644 --- a/modules/page/tpl/page_mobile_content_modify.html +++ b/modules/page/tpl/page_mobile_content_modify.html @@ -1,8 +1,8 @@ - - - - + + + +
{$page_content}
diff --git a/modules/point/tpl/header.html b/modules/point/tpl/header.html index 759db716a..a388e500f 100644 --- a/modules/point/tpl/header.html +++ b/modules/point/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->point} {$lang->cmd_management} {$lang->help}

diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html index f2222cf70..1f6456c75 100644 --- a/modules/point/tpl/member_list.html +++ b/modules/point/tpl/member_list.html @@ -1,5 +1,5 @@ - +

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html index 787821f43..81273df1c 100644 --- a/modules/point/tpl/point_module_config.html +++ b/modules/point/tpl/point_module_config.html @@ -1,4 +1,4 @@ - +

{$lang->point}

diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html index 41956cd00..fc1d5ebde 100644 --- a/modules/poll/tpl/config.html +++ b/modules/poll/tpl/config.html @@ -1,4 +1,4 @@ - +
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index e83ce7ddf..7d540a6c3 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -4,7 +4,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; xe.lang.msg_select_poll = '{$lang->msg_poll_is_null}'; xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}'; - +

{$lang->poll} {$lang->help}

diff --git a/modules/poll/tpl/result.html b/modules/poll/tpl/result.html index 3684b5f8f..c604ac379 100644 --- a/modules/poll/tpl/result.html +++ b/modules/poll/tpl/result.html @@ -1,4 +1,4 @@ - +

{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")} {$lang->poll_join_count} : {number_format($poll->poll_count)}

diff --git a/modules/session/tpl/index.html b/modules/session/tpl/index.html index 7c3ffafa1..c3cc9114e 100644 --- a/modules/session/tpl/index.html +++ b/modules/session/tpl/index.html @@ -1,4 +1,4 @@ - +

{$lang->session} {$lang->cmd_management}

diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html index a9ef8de56..ef8da12e1 100644 --- a/modules/spamfilter/tpl/header.html +++ b/modules/spamfilter/tpl/header.html @@ -1,4 +1,4 @@ - +

{$lang->spamfilter} {$lang->help}

diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 504065bf5..10ed25382 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -2,7 +2,7 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}'; xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - +

{$lang->trackback} {$lang->help}

diff --git a/modules/trash/tpl/header.html b/modules/trash/tpl/header.html index cf7e9e9de..bd7fd3cbc 100644 --- a/modules/trash/tpl/header.html +++ b/modules/trash/tpl/header.html @@ -1,2 +1,2 @@ - +

{$lang->cmd_trash} {$lang->cmd_management}

diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index a0de0190f..8f08c3e82 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -2,7 +2,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; var no_text_comment = '{$lang->no_text_comment}'; - +

{$lang->trash} {$lang->help}

diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html index 01174f180..9d1a4dc3a 100644 --- a/modules/widget/tpl/add_content_widget.html +++ b/modules/widget/tpl/add_content_widget.html @@ -1,5 +1,5 @@ - - + + diff --git a/modules/widget/tpl/skin_info.html b/modules/widget/tpl/skin_info.html index ec3711114..98defb9e2 100644 --- a/modules/widget/tpl/skin_info.html +++ b/modules/widget/tpl/skin_info.html @@ -1,4 +1,4 @@ - +

{$skin_info->title}

Total: {number_format($total_count)}, Page: {number_format($page)}/{number_format($total_page)}
diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html index d2e05f811..a66f928b6 100644 --- a/modules/widget/tpl/widget_detail_info.html +++ b/modules/widget/tpl/widget_detail_info.html @@ -1,5 +1,5 @@ - - + +

{$lang->widget}

{$lang->widget_maker}

diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html index c70a00f67..044278e22 100644 --- a/modules/widget/tpl/widget_generate_code.html +++ b/modules/widget/tpl/widget_generate_code.html @@ -1,5 +1,5 @@ - + diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html index 840c6681e..145582f6b 100644 --- a/modules/widget/tpl/widget_generate_code.include.html +++ b/modules/widget/tpl/widget_generate_code.include.html @@ -1,6 +1,6 @@ - - - + + +
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index 16b831654..1780a887d 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -1,11 +1,11 @@ - - - - - - - - + + + + + + + + '); + Context::addHtmlHeader(''); Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true); } } // compare session when calling actions such as writing a post or a comment on the board/issue tracker module - if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $target_acts)) + if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $this->target_acts)) { Context::loadLang('./addons/captcha/lang'); $ModuleHandler->error = "captcha_denied"; @@ -309,6 +301,8 @@ if(!class_exists('AddonCaptcha')) function compareCaptcha() { + if(!in_array(Context::get('act'), $this->target_acts)) return true; + if($_SESSION['captcha_authed']) { return true; diff --git a/addons/captcha/captcha.js b/addons/captcha/captcha.js index e7ce7591b..8be891b75 100644 --- a/addons/captcha/captcha.js +++ b/addons/captcha/captcha.js @@ -1,12 +1,10 @@ /* procFilter 함수를 가로채서 captcha 이미지 및 폼을 출력 */ -var oldExecXml = null; var calledArgs = null; (function($){ - $(function() { - - var captchaXE = null; + $(function() { + var captchaXE = null; - function xeCaptcha() { + function xeCaptcha() { $('form').each(function(i) { var isSubmitHook = false; @@ -21,7 +19,6 @@ var calledArgs = null; break; } } - } if (isSubmitHook) @@ -49,17 +46,17 @@ var calledArgs = null; $(self).append(''); $(self).submit(); }); - var params = new Array(); - params['captcha_action'] = 'setCaptchaSession'; - params['mid'] = current_mid; - oldExecXml('', '', params, captchaXE.show,new Array('error','message','about_captcha','captcha_reload','captcha_play','cmd_input','cmd_cancel')); + var params = new Array(); + params['captcha_action'] = 'setCaptchaSession'; + params['mid'] = current_mid; + window.oldExecXml('', '', params, captchaXE.show,new Array('error','message','about_captcha','captcha_reload','captcha_play','cmd_input','cmd_cancel')); }); } }); - var body = $(document.body); - var captchaIma; - - if (!captchaXE) { + 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; @@ -68,14 +65,14 @@ var calledArgs = null; if(fc_isIE && fc_isWin && !fc_isOpera){ _object_ =''; _object_ += ''; - _object_ += ''; + _object_ += ''; _object_ += ''; - _object_ += ''; + _object_ += ''; _object_ += ''; - _object_ += ''; + _object_ += ''; _object_ += ''; }else{ - _object_ = ''; + _object_ = ''; } captchaXE = $('').appendTo(captchaXE); - $div.find('button.cancel') + $div.find('button.cancel') .click(function(){ $('#captcha_layer').hide(); }); - + $div.find('button.play') .click(function(){ var swf = window['captcha_audio'] || document['captcha_audio']; @@ -114,15 +111,15 @@ var calledArgs = null; var params = new Array(); params['captcha_action'] = 'setCaptchaSession'; params['mid'] = current_mid; - oldExecXml('','',params, function() { + window.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; + 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; } }); + $.each(captchaTargetAct || {}, function(key,val){ if (val == act){ doCheck = true; return false; } }); if (doCheck) { /* captcha 를 사용하는 경우 */ @@ -133,49 +130,51 @@ var calledArgs = null; $(this).find('input[type=text]').val('').focus(); return false; } - captchaXE.compare(); return false; + captchaXE.compare(); return false; }); - 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')); + 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; + window.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); + window.oldExecXml(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj); } - return true; - }; + return true; + }; - captchaXE.show = function(ret_obj) { + 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 .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; - } + captchaXE.compare = function(e) { + var params = new Array(); + params['captcha_action'] = 'captchaCompare'; + params['mid'] = current_mid; + params['secret_text'] = $('#secret_text').val(); + window.oldExecXml(calledArgs.module,calledArgs.act,params, function() { + $("#captcha_layer").hide(); + window.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; - }); - }); + $(window).ready(function(){ + if(!window.oldExecXml) { + window.oldExecXml = window.exec_xml; + window.exec_xml = xeCaptcha().exec; + } + }); + }); })(jQuery); diff --git a/addons/captcha/captcha.min.js b/addons/captcha/captcha.min.js index da4a0eee5..0df1ecced 100644 --- a/addons/captcha/captcha.min.js +++ b/addons/captcha/captcha.min.js @@ -1,2 +1,2 @@ -var oldExecXml=null,calledArgs=null;(function($){$(function(){var captchaXE=null -function xeCaptcha(){$('form').each(function(i){var isSubmitHook=false;if(!$(this).attr('onsubmit')||$(this).attr('onsubmit').indexOf('procFilter')<0){var act=$(this).find('input[name=act]').val();for(var i=0;i');if(!$(this).find('input[name=error_return_url]'))$(this).append('');$(this).submit(function(event){if($(this).find('input[name=secret_text]').val())return true;event.preventDefault();var self=this;$('#captcha_layer form').submit(function(e){e.preventDefault();if(!$('#secret_text').val()){$(this).find('input[type=text]').val('').focus();return false};$(self).append('');$(self).submit()});var params=new Array();params.captcha_action='setCaptchaSession';params.mid=current_mid;oldExecXml('','',params,captchaXE.show,new Array('error','message','about_captcha','captcha_reload','captcha_play','cmd_input','cmd_cancel'))})}});var body=$(document.body),captchaIma;if(!captchaXE){var fc_isIE=(navigator.appVersion.indexOf("MSIE")!=-1)?true:false,fc_isWin=(navigator.appVersion.toLowerCase().indexOf("win")!=-1)?true:false,fc_isOpera=(navigator.userAgent.indexOf("Opera")!=-1)?true:false,_swfURL_=request_uri+'addons/captcha/swf/play.swf';if(fc_isIE&&fc_isWin&&!fc_isOpera){_object_='';_object_+='';_object_+='';_object_+='';_object_+='';_object_+='';_object_+='';_object_+=''}else _object_='';captchaXE=$('
@@ -91,7 +91,7 @@ {@$img_width = 1} - - diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 9256a8cf4..cadab8c32 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -30,8 +30,8 @@ - - + + from table fragments + if ( !jQuery.support.tbody ) { + + // String was a
+ {$key} @@ -102,7 +102,7 @@ {$key} + {$key} {$lang->unit_year} diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index 6d69479ae..f36cf5971 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -53,7 +53,7 @@ - {$lang->help} + {$lang->help}
{$lang->email} {$title}{$lang->signup_date} ������{$lang->last_login} ������{$lang->signup_date} ▲▼{$lang->last_login} ▲▼ {$lang->member_group} {$lang->inquiry}/{$lang->cmd_modify} diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index e63569932..885a96123 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -5,7 +5,7 @@

{$XE_VALIDATOR_MESSAGE}

- +
@@ -36,7 +36,7 @@ jQuery(function($){ }); - + @@ -92,7 +92,7 @@ jQuery(function($){ - + From c5ba8515d11aa72dffe4972e599dec7a2bb8121d Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 9 Nov 2013 09:44:35 +0000 Subject: [PATCH 015/473] =?UTF-8?q?Issue=203638=20image=5Fresize=20?= =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=EC=9D=B4=20=EB=AA=A8=EB=B0=94?= =?UTF-8?q?=EC=9D=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=EA=B0=80=20=EA=B3=A0=EC=A0=95=EB=90=9C=20hei?= =?UTF-8?q?ght=EB=A5=BC=20=EC=A1=B0=EC=A0=95=ED=95=98=EC=A7=80=20=EB=AA=BB?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13194 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/resize_image/css/resize_image.mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/resize_image/css/resize_image.mobile.css b/addons/resize_image/css/resize_image.mobile.css index e137c3fa3..53d753413 100644 --- a/addons/resize_image/css/resize_image.mobile.css +++ b/addons/resize_image/css/resize_image.mobile.css @@ -1 +1 @@ -.xe_content img{max-width:100%;height:auto} +.xe_content img{max-width:100%;height:auto !important} From 560fe3b7dbb3472eb82cb54fd5a0078321c5f715 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 9 Nov 2013 10:01:31 +0000 Subject: [PATCH 016/473] =?UTF-8?q?Issue=203639=20=EC=9C=A0=ED=8A=9C?= =?UTF-8?q?=EB=B8=8C=20embed=20=ED=8C=A8=ED=84=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13195 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/security/conf/embedWhiteUrl.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/security/conf/embedWhiteUrl.xml b/classes/security/conf/embedWhiteUrl.xml index 1c90fc58f..39dee605e 100644 --- a/classes/security/conf/embedWhiteUrl.xml +++ b/classes/security/conf/embedWhiteUrl.xml @@ -38,6 +38,7 @@ http://www.youtube-nocookie.com/ //www.youtube.com/v/ //www.youtube-nocookie.com/ + //www.youtube.com/embed/ http://play.mgoon.com/Video/ From 29004a93588dcb73bca14077b58ebdaa720afc95 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 9 Nov 2013 10:05:18 +0000 Subject: [PATCH 017/473] =?UTF-8?q?Issue=203639=20=EC=9C=A0=ED=8A=9C?= =?UTF-8?q?=EB=B8=8C=20embed=20=ED=8C=A8=ED=84=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13196 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/security/conf/embedWhiteUrl.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/security/conf/embedWhiteUrl.xml b/classes/security/conf/embedWhiteUrl.xml index 39dee605e..4a4cf00d5 100644 --- a/classes/security/conf/embedWhiteUrl.xml +++ b/classes/security/conf/embedWhiteUrl.xml @@ -204,6 +204,7 @@ https://www.youtube-nocookie.com/ //www.youtube.com/v/ //www.youtube-nocookie.com/ + //www.youtube.com/embed/ http://maps.google.com/ From 66a5039d04ffb87b4f38d2272105fa27823a72af Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 9 Nov 2013 10:15:13 +0000 Subject: [PATCH 018/473] =?UTF-8?q?Issue=202794=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=95=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90?= =?UTF-8?q?=EC=84=9C=20mid=EA=B0=80=20=EC=A0=9C=EA=B1=B0=EB=90=98=EB=8A=94?= =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20(thanks=20to=20sej?= =?UTF-8?q?in7940)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13197 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 4147f9ce7..f05f667b4 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -415,7 +415,7 @@ class memberController extends member $_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD'; - $redirectUrl = getNotEncodedUrl('', 'act', 'dispMemberModifyInfo'); + $redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); $this->setRedirectUrl($redirectUrl); } From 4f4c63ed3d00cbb8e72761cc8146c9f753242792 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 9 Nov 2013 15:28:16 +0000 Subject: [PATCH 019/473] =?UTF-8?q?Issue=203640=20X-UA-Compatible=20ie=3De?= =?UTF-8?q?dge=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13198 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/tpl/common_layout.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 4beb43b47..31557677d 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -11,6 +11,7 @@ + @@ -82,16 +83,16 @@ jQuery(function($){ function get_body_margin(position){ var margin = $('body').css('margin-' + position); var unit = margin.substr(-2); - + if(unit == 'px'){ margin = parseInt(margin); }else{ margin = 0; } - + return margin; } - + var height = $('#adminBar').outerHeight(); var margin_top = get_body_margin('top'); var new_margin_top = margin_top + height; @@ -99,11 +100,11 @@ jQuery(function($){ $('body').css({ 'margin-top': new_margin_top + 'px' }) - + var $fixed_elements = $('*').filter(function(){ if($(this).get(0) == $('#adminBar').get(0)) return false; if($(this).css("position") !== 'fixed') return false; - + var invisible = false; if(!$(this).is(':visible')){ invisible = true; @@ -114,7 +115,7 @@ jQuery(function($){ $(this).hide(); } if(top > height) return false; - + $(this).css('top', top + height); return true; }); From d9f001266c17a4f86d87760fe4aa269b8047969b Mon Sep 17 00:00:00 2001 From: khongchi Date: Tue, 12 Nov 2013 02:17:35 +0000 Subject: [PATCH 020/473] =?UTF-8?q?issue=203644,=20php5=EB=8C=80=EC=9D=91?= =?UTF-8?q?=20file=5Fput=5Fcontents=20=ED=95=A8=EC=88=98=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13199 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DB.class.php | 14 ++------------ classes/display/DisplayHandler.class.php | 5 +---- classes/validator/Validator.class.php | 14 +------------- config/func.inc.php | 7 +------ modules/install/install.admin.controller.php | 2 +- modules/module/module.admin.controller.php | 16 ++++++---------- modules/point/point.admin.controller.php | 8 +++++--- 7 files changed, 17 insertions(+), 49 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index fac85ff76..dac2504f9 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -459,13 +459,7 @@ class DB $buff[] = ''; } $buff[] = print_r($log, TRUE); - - if(@!$fp = fopen($debug_file, "a")) - { - return; - } - fwrite($fp, implode("\n", $buff) . "\n\n"); - fclose($fp); + @file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND); } } else @@ -486,11 +480,7 @@ class DB $buff .= sprintf("%s\t%s\n\t%0.6f sec\tquery_id:%s\n\n", date("Y-m-d H:i"), $this->query, $elapsed_time, $this->query_id); - if($fp = fopen($log_file, 'a')) - { - fwrite($fp, $buff); - fclose($fp); - } + @file_put_contents($log_file, $buff, FILE_APPEND); } } diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 0d59299f8..40589a843 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -297,13 +297,10 @@ class DisplayHandler extends Handler $buff = str_repeat('=', 40) . "\n" . $buff . str_repeat('-', 40); $buff = "\n\n"; - if(@!$fp = fopen($debug_file, 'a')) + if (!@file_put_contents($debug_file, $buff, FILE_APPEND)) { return; } - - fwrite($fp, $buff); - fclose($fp); } } } diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index e00188998..d16eebb12 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -682,19 +682,7 @@ class Validator return FALSE; } - if(is_callable('file_put_contents')) - { - @file_put_contents($filepath, $content); - } - else - { - $fp = @fopen($filepath, 'w'); - if(is_resource($fp)) - { - fwrite($fp, $content); - fclose($fp); - } - } + @file_put_contents($filepath, $content); return $filepath; } diff --git a/config/func.inc.php b/config/func.inc.php index 5e49dcdc7..58dd1add8 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -829,12 +829,7 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu } $debug_output = "\n\n"; - if(@!$fp = fopen($debug_file, 'a')) - { - return; - } - fwrite($fp, $debug_output); - fclose($fp); + @file_put_contents($debug_file, $debug_output, FILE_APPEND); } } diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index fe149412a..a8624a3d2 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -190,7 +190,7 @@ class installAdminController extends install foreach($ftp_info as $key => $val) { if(!$val) continue; - if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val))) + if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val))) { continue; } diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index a323f5c55..cc1454dcc 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -894,19 +894,15 @@ class moduleAdminController extends module $langMap[$langCode] += $langMap[$targetLangCode]; } - $fp = fopen(sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $langCode), 'w'); - if(!$fp) + $str = " $value) + { + $str = sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes($value, "'")); + } + if (!@file_put_contents(sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $langCode), $str)) { return; } - fwrite($fp, " $value) - { - fwrite($fp, sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes($value, "'"))); - } - - fwrite($fp, '?>'); } } diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index b788d1b97..c17095679 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -279,13 +279,15 @@ class pointAdminController extends point $output = executeQuery("point.initMemberPoint"); if(!$output->toBool()) return $output; // Save the file temporarily - $f = fopen("./files/cache/pointRecal.txt","w"); + + $str = ''; foreach($member as $key => $val) { $val += (int)$config->signup_point; - fwrite($f, $key.','.$val."\r\n"); + $str . = $key.','.$val."\r\n"; } - fclose($f); + + @file_put_contents('./files/cache/pointRecal.txt', $str); $this->add('total', count($member)); $this->add('position', 0); From 5fa0bf23d734ace013ab73daa0a72d9620b5c618 Mon Sep 17 00:00:00 2001 From: khongchi Date: Tue, 12 Nov 2013 02:23:26 +0000 Subject: [PATCH 021/473] =?UTF-8?q?issue=203636,=20makeDir=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=95=98=EC=9C=84=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=83=9D=EC=84=B1=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13200 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/file/FileHandler.class.php | 50 ++++++++++++++---------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 5078e9469..08ed3d298 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -318,11 +318,17 @@ class FileHandler */ function makeDir($path_string) { - static $oFtp = null; - // if safe_mode is on, use FTP - if(ini_get('safe_mode')) + if(!ini_get('safe_mode')) { + @mkdir($path_string, 0755); + @chmod($path_string, 0755); + } + // if safe_mode is on, use FTP + else + { + static $oFtp = null; + $ftp_info = Context::getFTPInfo(); if($oFtp == null) { @@ -356,34 +362,26 @@ class FileHandler { $ftp_path = "/"; } - } - - $path_string = str_replace(_XE_PATH_, '', $path_string); - $path_list = explode('/', $path_string); - - $path = _XE_PATH_; - for($i = 0; $i < count($path_list); $i++) - { - if(!$path_list[$i]) + + $path_string = str_replace(_XE_PATH_, '', $path_string); + $path_list = explode('/', $path_string); + + $path = _XE_PATH_; + for($i = 0; $i < count($path_list); $i++) { - continue; - } - - $path .= $path_list[$i] . '/'; - $ftp_path .= $path_list[$i] . '/'; - if(!is_dir($path)) - { - if(ini_get('safe_mode')) + if(!$path_list[$i]) + { + continue; + } + + $path .= $path_list[$i] . '/'; + $ftp_path .= $path_list[$i] . '/'; + if(!is_dir($path)) { $oFtp->ftp_mkdir($ftp_path); $oFtp->ftp_site("CHMOD 777 " . $ftp_path); } - else - { - @mkdir($path, 0755); - @chmod($path, 0755); - } - } + } } return is_dir($path_string); From 5693e340fe87541179474af4c28d2e27726ad05a Mon Sep 17 00:00:00 2001 From: khongchi Date: Wed, 13 Nov 2013 01:40:53 +0000 Subject: [PATCH 022/473] =?UTF-8?q?issue=203645,=20php5=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91,=20=ED=95=A8=EC=88=98=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13202 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/adminlogging/adminlogging.addon.php | 2 +- .../member_extra_info.lib.php | 17 +++--- addons/mobile/classes/mobile.class.php | 6 +-- classes/context/Context.class.php | 28 +++++----- classes/db/DBCubrid.class.php | 2 +- classes/db/DBMssql.class.php | 2 +- classes/db/DBMysql.class.php | 2 +- classes/display/HTMLDisplayHandler.php | 6 +-- classes/display/VirtualXMLDisplayHandler.php | 2 +- classes/module/ModuleHandler.class.php | 8 +-- classes/module/ModuleObject.class.php | 16 +++--- classes/security/EmbedFilter.class.php | 4 +- classes/xml/xmlquery/DBParser.class.php | 2 +- common/tpl/common_layout.html | 2 +- config/func.inc.php | 52 +++++-------------- modules/comment/comment.item.php | 2 +- modules/document/document.item.php | 4 +- modules/layout/layout.admin.controller.php | 2 +- modules/member/member.controller.php | 2 +- modules/member/member.model.php | 2 +- modules/menu/menu.admin.controller.php | 27 +++++----- modules/menu/menu.admin.model.php | 2 +- modules/menu/menu.admin.view.php | 2 +- modules/menu/menu.class.php | 4 +- modules/page/page.view.php | 4 +- widgets/content/content.class.php | 8 +-- widgets/login_info/login_info.class.php | 2 +- widgets/mcontent/mcontent.class.php | 8 +-- 28 files changed, 95 insertions(+), 125 deletions(-) diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php index 3cc15cd02..557aa762b 100644 --- a/addons/adminlogging/adminlogging.addon.php +++ b/addons/adminlogging/adminlogging.addon.php @@ -11,7 +11,7 @@ if(!defined('__XE__')) */ $logged_info = Context::get('logged_info'); $act = Context::get('act'); -$kind = strpos(strtolower($act), 'admin') !== false ? 'admin' : ''; +$kind = stripos($act, 'admin') !== false ? 'admin' : ''; if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y') { diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php index b6d641874..b6fc4e2ff 100644 --- a/addons/member_extra_info/member_extra_info.lib.php +++ b/addons/member_extra_info/member_extra_info.lib.php @@ -21,15 +21,16 @@ function memberTransImageName($matches) $oMemberModel = getModel('member'); $nick_name = $matches[5]; + $_tmp = &$GLOBALS['_transImageNameList'][$member_srl]; // If pre-defined data in the global variablesm return it - if(!$GLOBALS['_transImageNameList'][$member_srl]->cached) + if(!$_tmp->cached) { - $GLOBALS['_transImageNameList'][$member_srl]->cached = true; + $_tmp->cached = true; $image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl); $image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl); if(file_exists($image_name_file)) { - $GLOBALS['_transImageNameList'][$member_srl]->image_name_file = $image_name_file; + $_tmp->image_name_file = $image_name_file; } else { @@ -37,7 +38,7 @@ function memberTransImageName($matches) } if(file_exists($image_mark_file)) { - $GLOBALS['_transImageNameList'][$member_srl]->image_mark_file = $image_mark_file; + $_tmp->image_mark_file = $image_mark_file; } else { @@ -46,13 +47,13 @@ function memberTransImageName($matches) $site_module_info = Context::get('site_module_info'); $group_image = $oMemberModel->getGroupImageMark($member_srl, $site_module_info->site_srl); - $GLOBALS['_transImageNameList'][$member_srl]->group_image = $group_image; + $_tmp->group_image = $group_image; } else { - $group_image = $GLOBALS['_transImageNameList'][$member_srl]->group_image; - $image_name_file = $GLOBALS['_transImageNameList'][$member_srl]->image_name_file; - $image_mark_file = $GLOBALS['_transImageNameList'][$member_srl]->image_mark_file; + $group_image = $_tmp->group_image; + $image_name_file = $_tmp->image_name_file; + $image_mark_file = $_tmp->image_mark_file; } // If image name and mark doesn't exist, set the original information if(!$image_name_file && !$image_mark_file && !$group_image) diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php index 6ddd78087..01ad804cb 100644 --- a/addons/mobile/classes/mobile.class.php +++ b/addons/mobile/classes/mobile.class.php @@ -189,13 +189,13 @@ class mobileXE $userAgent = $_SERVER['HTTP_USER_AGENT']; $wap_sid = $_SERVER['HTTP_X_UP_SUBNO']; - if(preg_match("/SKT11/i", $userAgent) || preg_match("/skt/i", $browserAccept)) + if(stripos($userAgent, "SKT11") !== FALSE || stripos($browserAccept, "skt") !== FALSE) { Context::set('mobile_skt',1); return "wml"; } - elseif(preg_match("/hdml/i", $browserAccept)) return "hdml"; - elseif(preg_match("/CellPhone/i", $userAgent)) return "mhtml"; + elseif(stripos($browserAccept, "hdml") !== FALSE) return "hdml"; + elseif(stripos($userAgent, "cellphone") !== FALSE) return "mhtml"; return null; } diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index ace27ba4e..68e544252 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -388,11 +388,7 @@ class Context */ function close() { - // Session Close - if(function_exists('session_write_close')) - { - session_write_close(); - } + session_write_close(); // DB close $oDB = DB::getInstance(); @@ -440,7 +436,7 @@ class Context unset($db_info->db_userid); $db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix; unset($db_info->db_table_prefix); - if(substr($db_info->master_db["db_table_prefix"], -1) != '_') + if(substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0) { $db_info->master_db["db_table_prefix"] .= '_'; } @@ -620,7 +616,7 @@ class Context { return true; } - if(substr($default_url, -1) != '/') + if(substr_compare($default_url, '/', -1) !== 0) { $default_url .= '/'; } @@ -841,7 +837,7 @@ class Context return; } - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } @@ -865,7 +861,7 @@ class Context */ function _loadXmlLang($path) { - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } @@ -885,7 +881,7 @@ class Context */ function _loadPhpLang($path) { - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } @@ -1257,7 +1253,7 @@ class Context foreach($val as $k => $v) { - if($key === 'page' || $key === 'cpage' || substr($key, -3) === 'srl') + if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0) { $val[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v; } @@ -1452,7 +1448,7 @@ class Context else { $domain = preg_replace('/^(http|https):\/\//i', '', trim($domain)); - if(substr($domain, -1) != '/') + if(substr_compare($domain, '/', -1) !== 0) { $domain .= '/'; } @@ -1699,7 +1695,7 @@ class Context if($domain) { $target_url = trim($domain); - if(substr($target_url, -1) != '/') + if(substr_compare($target_url, '/', -1) !== 0) { $target_url.= '/'; } @@ -2227,7 +2223,7 @@ class Context continue; } - if(substr($filename, 0, 2) == './') + if(strncasecmp('./', $filename, 2) === 0) { $filename = substr($filename, 2); } @@ -2287,7 +2283,7 @@ class Context continue; } - if(substr($filename, 0, 2) == './') + if(strncasecmp('./', $filename, 2) === 0) { $filename = substr($filename, 2); } @@ -2506,7 +2502,7 @@ class Context } $path = '/' . implode('/', $_path); - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index 06ba24f9a..631823ef8 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -1043,7 +1043,7 @@ class DBCubrid extends DB // Check for distinct query and if found update count query structure $temp_select = $queryObject->getSelectString($with_values); - $uses_distinct = strpos(strtolower($temp_select), "distinct") !== FALSE; + $uses_distinct = stripos($temp_select, "distinct") !== FALSE; $uses_groupby = $queryObject->getGroupByString() != ''; if($uses_distinct || $uses_groupby) { diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index 619117b99..4290be2b0 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -932,7 +932,7 @@ class DBMssql extends DB // Check for distinct query and if found update count query structure $temp_select = $queryObject->getSelectString(true); - $uses_distinct = strpos(strtolower($temp_select), "distinct") !== false; + $uses_distinct = stripos($temp_select, "distinct") !== false; $uses_groupby = $queryObject->getGroupByString() != ''; if($uses_distinct || $uses_groupby) { diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 608afe640..c6f5553b4 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -751,7 +751,7 @@ class DBMysql extends DB // Check for distinct query and if found update count query structure $temp_select = $queryObject->getSelectString($with_values); - $uses_distinct = strpos(strtolower($temp_select), "distinct") !== false; + $uses_distinct = stripos($temp_select, "distinct") !== false; $uses_groupby = $queryObject->getGroupByString() != ''; if($uses_distinct || $uses_groupby) { diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index 8a36e8d06..cdd387a07 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -38,7 +38,7 @@ class HTMLDisplayHandler if(count($theme_skin) == 2) { $theme_path = sprintf('./themes/%s', $theme_skin[0]); - if(substr($theme_path, 0, strlen($theme_path)) != $theme_path) + if(substr_compare($theme_path, $theme_path, 0, strlen($theme_path)) !== 0) { $template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]); } @@ -117,7 +117,7 @@ class HTMLDisplayHandler // if popup_layout, remove admin bar. $realLayoutPath = FileHandler::getRealPath($layout_path); - if(substr($realLayoutPath, -1) != '/') + if(substr_compare($realLayoutPath, '/', -1) !== 0) { $realLayoutPath .= '/'; } @@ -135,7 +135,7 @@ class HTMLDisplayHandler $GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start; } - if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always')) + if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always')) { Context::addHtmlFooter(''); } diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php index 6a07c3c3a..4435b8f4b 100644 --- a/classes/display/VirtualXMLDisplayHandler.php +++ b/classes/display/VirtualXMLDisplayHandler.php @@ -16,7 +16,7 @@ class VirtualXMLDisplayHandler $redirect_url = $oModule->get('redirect_url'); $request_uri = Context::get('xeRequestURI'); $request_url = Context::get('xeVirtualRequestUrl'); - if(substr($request_url, -1) != '/') + if(substr_compare($request_url, '/', -1) !== 0) { $request_url .= '/'; } diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 3eaf13275..0ff9d2d22 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -80,7 +80,7 @@ class ModuleHandler extends Handler exit; } - if(isset($this->act) && substr($this->act, 0, 4) == 'disp') + if(isset($this->act) && substr_compare($this->act, 'disp', 0, 4) === 0) { if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on') { @@ -349,7 +349,7 @@ class ModuleHandler extends Handler // get type, kind $type = $xml_info->action->{$this->act}->type; $ruleset = $xml_info->action->{$this->act}->ruleset; - $kind = strpos(strtolower($this->act), 'admin') !== FALSE ? 'admin' : ''; + $kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : ''; if(!$kind && $this->module == 'admin') { $kind = 'admin'; @@ -475,7 +475,7 @@ class ModuleHandler extends Handler if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) { - $kind = strpos(strtolower($forward->act), 'admin') !== FALSE ? 'admin' : ''; + $kind = stripos($forward->act, 'admin') !== FALSE ? 'admin' : ''; $type = $forward->type; $ruleset = $forward->ruleset; $tpl_path = $oModule->getTemplatePath(); @@ -920,7 +920,7 @@ class ModuleHandler extends Handler $isLayoutDrop = Context::get('isLayoutDrop'); if($isLayoutDrop) { - $kind = strpos(strtolower($this->act), 'admin') !== FALSE ? 'admin' : ''; + $kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : ''; if($kind == 'admin') { $oModule->setLayoutFile('popup_layout'); diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 4af9ec4d2..ae2d0d55c 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -44,7 +44,7 @@ class ModuleObject extends Object * */ function setModulePath($path) { - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path.='/'; } @@ -251,7 +251,7 @@ class ModuleObject extends Object * */ function setTemplateFile($filename) { - if(substr($filename, -5) != '.html') + if(substr_compare($filename, '.html', -5) !== 0) { $filename .= '.html'; } @@ -274,11 +274,11 @@ class ModuleObject extends Object * */ function setTemplatePath($path) { - if(substr($path, 0, 1) != '/' && substr($path, 0, 2) != './') + if(substr_compare($path, '/', 0, 1) !== 0 && substr_compare($path, './', 0, 2) !== 0) { $path = './' . $path; } - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } @@ -301,7 +301,7 @@ class ModuleObject extends Object * */ function setEditedLayoutFile($filename) { - if(substr($filename, -5) != '.html') + if(substr_compare($filename, '.html', -5) !== 0) { $filename .= '.html'; } @@ -324,7 +324,7 @@ class ModuleObject extends Object * */ function setLayoutFile($filename) { - if(substr($filename, -5) != '.html') + if(substr_compare($filename, '.html', -5) !== 0) { $filename .= '.html'; } @@ -346,11 +346,11 @@ class ModuleObject extends Object * */ function setLayoutPath($path) { - if(substr($path, 0, 1) != '/' && substr($path, 0, 2) != './') + if(substr_compare($path, '/', 0, 1) !== 0 && substr_compare($path, './', 0, 2) !== 0) { $path = './' . $path; } - if(substr($path, -1) != '/') + if(substr_compare($path, '/', -1) !== 0) { $path .= '/'; } diff --git a/classes/security/EmbedFilter.class.php b/classes/security/EmbedFilter.class.php index 622f4d3fa..376bccdf9 100644 --- a/classes/security/EmbedFilter.class.php +++ b/classes/security/EmbedFilter.class.php @@ -569,7 +569,7 @@ class EmbedFilter if($m[1] == 'param') { - if(strpos(strtolower($m[0]), 'allowscriptaccess')) + if(stripos($m[0], 'allowscriptaccess')) { $m[0] = ' {@$isAdminKind = false} - + {@$isAdminKind = true} diff --git a/config/func.inc.php b/config/func.inc.php index 58dd1add8..a3da73c79 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -22,22 +22,6 @@ if(!function_exists('iconv')) '); } -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 * @var array @@ -343,7 +327,7 @@ function getFullUrl() } $url = Context::getUrl($num_args, $args_list); - if(!preg_match('/^http/i', $url)) + if(strncasecmp('http', $url, 4) !== 0) { preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match); return substr($match[0], 0, -1) . $url; @@ -367,7 +351,7 @@ function getNotEncodedFullUrl() } $url = Context::getUrl($num_args, $args_list, NULL, FALSE); - if(!preg_match('/^http/i', $url)) + if(strncasecmp('http', $url, 4) !== 0) { preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match); $url = Context::getUrl($num_args, $args_list, NULL, FALSE); @@ -440,7 +424,7 @@ function getFullSiteUrl() $num_args = count($args_list); $url = Context::getUrl($num_args, $args_list, $domain); - if(!preg_match('/^http/i', $url)) + if(strncasecmp('http', $url, 4) !== 0) { preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match); return substr($match[0], 0, -1) . $url; @@ -456,7 +440,7 @@ function getFullSiteUrl() */ function isSiteID($domain) { - return preg_match('/^([a-z0-9\_]+)$/i', $domain); + return preg_match('/^([a-zA-Z0-9\_]+)$/', $domain); } /** @@ -785,14 +769,9 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu { $firephp = FirePHP::getInstance(TRUE); } - if(function_exists("memory_get_usage")) - { - $label = sprintf('[%s:%d] (m:%s)', $file_name, $line_num, FileHandler::filesize(memory_get_usage())); - } - else - { - $label = sprintf('[%s:%d] ', $file_name, $line_num); - } + + $label = sprintf('[%s:%d] (m:%s)', $file_name, $line_num, FileHandler::filesize(memory_get_usage())); + // Check a FirePHP option if($display_option === 'TABLE') { @@ -814,14 +793,7 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu return; } $debug_file = _XE_PATH_ . 'files/' . $file; - if(function_exists("memory_get_usage")) - { - $debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, TRUE)); - } - else - { - $debug_output = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($debug_output, TRUE)); - } + $debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, TRUE)); if($display_option === TRUE) { @@ -1043,7 +1015,7 @@ function removeSrcHack($match) { foreach($m[1] as $idx => $name) { - if(substr($name, 0, 2) == 'on') + if(substr_compare($name, 'on', 0, 2) === 0) { continue; } @@ -1073,7 +1045,7 @@ function removeSrcHack($match) $attribute = strtolower(trim($name)); if($attribute == 'data' || $attribute == 'src' || $attribute == 'href') { - if(strpos(strtolower($val), 'data:') === 0) + if(stripos($val, 'data:') === 0) { continue; } @@ -1083,7 +1055,7 @@ function removeSrcHack($match) if($tag == 'img') { $attribute = strtolower(trim($name)); - if(strpos(strtolower($val), 'data:') === 0) + if(stripos($val, 'data:') === 0) { continue; } @@ -1169,7 +1141,7 @@ function getScriptPath() static $url = NULL; if($url == NULL) { - $url = preg_replace('/\/tools\//i', '/', preg_replace('/index.php$/i', '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME']))); + $url = str_ireplace('/tools/', '/', preg_replace('/index.php$/i', '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME']))); } return $url; } diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index ad0f1dfc0..99de62ea0 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -250,7 +250,7 @@ class commentItem extends Object return; } - if(!preg_match("/^http:\/\//i", $url)) + if(strncasecmp('http://', $url, 7) !== 0) { $url = "http://" . $url; } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index e2111903a..d07d6fc5e 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -383,7 +383,7 @@ class documentItem extends Object if($m[1] == 'param') { - if(strpos(strtolower($m[0]), 'allowscriptaccess')) + if(stripos($m[0], 'allowscriptaccess')) { $m[0] = 'password) { - if($this->useSha1 && function_exists('sha1')) + if($this->useSha1) { $args->password = md5(sha1(md5($args->password))); } diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 731d67b56..08518a6db 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -333,7 +333,7 @@ class memberModel extends member { foreach($extra_vars as $key => $val) { - if(!is_array($val)) if(preg_match('/\|\@\|/i', $val)) $val = explode('|@|', $val); + if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val); if(!$info->{$key}) $info->{$key} = $val; } } diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 47d55b0f1..c113fd16b 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -207,7 +207,7 @@ class menuAdminController extends menu foreach($output->data as $itemInfo) { - if($itemInfo->is_shortcut != 'Y' && !preg_match('/^http/i',$itemInfo->url)) + if($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0) { $moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl); if($moduleInfo->module_srl) @@ -331,7 +331,7 @@ class menuAdminController extends menu $oDB->begin(); // type is url - if(preg_match('/^http/i', $request->shortcut_target) || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target)) + if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target)) { // set menu variable $args->menu_srl = $request->menu_srl; @@ -414,7 +414,7 @@ class menuAdminController extends menu if($request->menu_name_key) $args->name = $request->menu_name_key; else $args->name = $request->menu_name; - if($request->module_id && preg_match('/^http/i', $request->module_id)) + if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0) { return new Object(-1, 'msg_invalid_request'); } @@ -531,7 +531,7 @@ class menuAdminController extends menu if($itemInfo->is_shortcut == 'Y') { // type is url - if(preg_match('/^http/i', $request->shortcut_target) || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target)) + if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target)) { $args->url = $request->shortcut_target; } @@ -813,7 +813,7 @@ class menuAdminController extends menu if($node['active_btn']) FileHandler::removeFile($node['active_btn']); // Delete module - if($node['is_shortcut'] != 'Y' && !preg_match('/^http/i',$node['url'])) + if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0) { $oModuleController = getController('module'); $oModuleModel = &getModel('module'); @@ -1054,7 +1054,7 @@ class menuAdminController extends menu $isModuleCopySuccess = false; // if menu have a reference of module instance - if($menuItemInfo->is_shortcut == 'N' && !preg_match('/^http/i', $originMenu['url'])) + if($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0 ) { $oModuleModel = &getModel('module'); $moduleInfo = $oModuleModel->getModuleInfoByMid($originMenu['url']); @@ -1367,7 +1367,7 @@ class menuAdminController extends menu Context::set('error_messge', Context::getLang('msg_invalid_request')); } - else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name'])) + else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name'])) { Context::set('error_messge', Context::getLang('msg_invalid_request')); } @@ -1748,13 +1748,13 @@ class menuAdminController extends menu $expand = $node->expand; $normal_btn = $node->normal_btn; - if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$normal_btn); + if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$normal_btn); else $normal_btn = ''; $hover_btn = $node->hover_btn; - if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$hover_btn); + if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$hover_btn); else $hover_btn = ''; $active_btn = $node->active_btn; - if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$active_btn); + if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$active_btn); else $active_btn = ''; $group_srls = $node->group_srls; @@ -1864,17 +1864,18 @@ class menuAdminController extends menu $expand = $node->expand; $normal_btn = $node->normal_btn; - if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$normal_btn); + if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$normal_btn); else $normal_btn = ''; $hover_btn = $node->hover_btn; - if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$hover_btn); + if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$hover_btn); else $hover_btn = ''; $active_btn = $node->active_btn; - if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$active_btn); + if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&','"','<','>'),$active_btn); else $active_btn = ''; + $group_srls = $node->group_srls; if($normal_btn) diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 89d95015d..1abd14579 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -178,7 +178,7 @@ class menuAdminModel extends menu { $menuItem->moduleType = null; } - else if(!preg_match('/^http/i',$menuItem->url)) + else if(strncasecmp('http', $menuItem->url, 4) !== 0) { $oModuleModel = &getModel('module'); $moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0); diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 9400fba32..1f46ddcfa 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -137,7 +137,7 @@ class menuAdminView extends menu function _menuInfoSetting(&$menu) { $oModuleModel = &getModel('module'); - if($menu['url'] && !preg_match('/^http/i', $menu['url'])) + if($menu['url'] && strncasecmp('http', $menu['url'], 4) !== 0) { unset($midInfo); unset($moduleInfo); diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php index bd5521040..752000330 100644 --- a/modules/menu/menu.class.php +++ b/modules/menu/menu.class.php @@ -89,7 +89,7 @@ class menu extends ModuleObject } // if url is empty, change type to shortcurt - if($value2->is_shortcut == 'N' && (!$value2->url || preg_match('/^http/i',$value2->url))) + if($value2->is_shortcut == 'N' && (!$value2->url || strncasecmp('http', $value2->url, 4) === 0)) { $value2->is_shortcut = 'Y'; $output3 = executeQuery('menu.updateMenuItem', $value2); @@ -110,7 +110,7 @@ class menu extends ModuleObject { foreach($output2->data AS $key2=>$value2) { - if(!empty($value2->url) && !preg_match('/^http/i',$value2->url)) + if(!empty($value2->url) && strncasecmp('http', $value2->url, 4) !== 0) { $moduleInfo = $oModuleModel->getModuleInfoByMid($value2->url); if(!$moduleInfo->module_srl) diff --git a/modules/page/page.view.php b/modules/page/page.view.php index 41c585b64..cda155be3 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -217,13 +217,13 @@ class pageView extends page return $matches[0]; // In case of .. , get a path } - else if(preg_match('/^\.\./i',$val)) + else if(strncasecmp('..', $val, 2) === 0)) { $p = Context::pathToUrl($this->path); return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]); } - if(substr($val,0,2)=='./') $val = substr($val,2); + if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2); $p = Context::pathToUrl($this->path); $path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]); diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 4cd452670..95a0d9a8a 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -465,7 +465,7 @@ class content extends WidgetHandler $buff = $this->requestFeedContents($args->rss_url); $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches); - if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = Context::convertEncodingStr($buff); + if($encoding && stripos($matches[1], "UTF-8") === FALSE) $buff = Context::convertEncodingStr($buff); $buff = preg_replace("/<\?xml.*\?>/i", "", $buff); @@ -602,7 +602,7 @@ class content extends WidgetHandler $content_item->setContentsLink($rss->link); if($item->title) { - if(!preg_match("/html/i", $value->title->attrs->type)) $item->title = $value->title->body; + if(stripos($value->title->attrs->type, "html") === FALSE) $item->title = $value->title->body; } $content_item->setTitle($item->title); $content_item->setNickName(max($item->author,$item->{'dc:creator'})); @@ -611,14 +611,14 @@ class content extends WidgetHandler $item->description = preg_replace('!requestFeedContents($args->rss_url); $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches); - if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = Context::convertEncodingStr($buff); + if($encoding && stripos($matches[1], "UTF-8") === FALSE) $buff = Context::convertEncodingStr($buff); $buff = preg_replace("/<\?xml.*\?>/i", "", $buff); @@ -548,7 +548,7 @@ class mcontent extends WidgetHandler $content_item->setContentsLink($rss->link); if($item->title) { - if(!preg_match("/html/i", $value->title->attrs->type)) $item->title = $value->title->body; + if(stripos($value->title->attrs->type, "html") === FALSE) $item->title = $value->title->body; } $content_item->setTitle($item->title); $content_item->setNickName(max($item->author,$item->{'dc:creator'})); @@ -557,14 +557,14 @@ class mcontent extends WidgetHandler $item->description = preg_replace('!path); return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]); From 0d643bac6296fc832033b0fb58deeca46e64b4b5 Mon Sep 17 00:00:00 2001 From: khongchi Date: Wed, 13 Nov 2013 07:55:56 +0000 Subject: [PATCH 024/473] fix syntax errors git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13204 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.controller.php | 2 +- modules/point/point.admin.controller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index cc1454dcc..57c3222b0 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -894,7 +894,7 @@ class moduleAdminController extends module $langMap[$langCode] += $langMap[$targetLangCode]; } - $str = " $value) { $str = sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes($value, "'")); diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index c17095679..8cef35414 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -284,7 +284,7 @@ class pointAdminController extends point foreach($member as $key => $val) { $val += (int)$config->signup_point; - $str . = $key.','.$val."\r\n"; + $str .= $key.','.$val."\r\n"; } @file_put_contents('./files/cache/pointRecal.txt', $str); From 797070a1a205503cc766f59f18302c712ae0ae87 Mon Sep 17 00:00:00 2001 From: khongchi Date: Thu, 14 Nov 2013 20:12:22 +0900 Subject: [PATCH 025/473] =?UTF-8?q?=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EC=B3=AC=EA=B3=84=EC=97=90=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EC=96=B4=20krzip=20extravar=EC=99=80=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=A0=95?= =?UTF-8?q?=EC=9D=98=20=ED=95=84=EB=93=9C=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/extravar/Extravar.class.php | 21 +---- modules/member/member.admin.view.php | 31 +------ modules/member/tpl/js/krzip_search.js | 113 -------------------------- 3 files changed, 4 insertions(+), 161 deletions(-) delete mode 100644 modules/member/tpl/js/krzip_search.js diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index 5c807f923..e37909fd7 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -473,25 +473,8 @@ class ExtraItem break; // address case "kr_zip" : - // krzip address javascript plugin load - Context::loadJavascriptPlugin('ui.krzip'); - - $buff .= - '' . - '' . - '' . - '' . - ''; + $krzipModel = &getModel('krzip'); + $buff .= $krzipModel->getKrzipCodeSearchHtml($column_name, $value); break; // General text default : diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index ebf1bde58..5615f9d98 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -595,35 +595,8 @@ class memberAdminView extends member } else if($extendForm->column_type == 'kr_zip') { - Context::loadFile(array('./modules/member/tpl/js/krzip_search.js', 'body'), true); - $extentionReplace = array( - 'msg_kr_address' => $lang->msg_kr_address, - 'msg_kr_address_etc' => $lang->msg_kr_address_etc, - 'cmd_search' => $lang->cmd_search, - 'cmd_search_again' => $lang->cmd_search_again, - 'addr_0' => $extendForm->value[0], - 'addr_1' => $extendForm->value[1]); - $replace = array_merge($extentionReplace, $replace); - $template = << -
- - - - - -
- -
- - -
- - -EOD; + $krzipModel = &getModel('krzip'); + $template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value); } else if($extendForm->column_type == 'jp_zip') { diff --git a/modules/member/tpl/js/krzip_search.js b/modules/member/tpl/js/krzip_search.js deleted file mode 100644 index bd23b616b..000000000 --- a/modules/member/tpl/js/krzip_search.js +++ /dev/null @@ -1,113 +0,0 @@ -/* 한국 우편 번호 관련 */ -function doHideKrZipList(column_name) { - var $j = jQuery; - $j('#zone_address_list_'+column_name).hide(); - $j('#zone_address_search_'+column_name).show(); - $j('#zone_address_1_'+column_name).hide(); - - var form = $j('#fo_insert_member'); - form.find('select[name=_tmp_address_list_'+column_name+']').focus(); - form.find('input[name='+column_name+']').eq(0).val(''); -} - -function doSelectKrZip(column_name) { - var $j = jQuery; - $j('#zone_address_list_'+column_name).hide(); - $j('#zone_address_search_'+column_name).hide(); - $j('#zone_address_1_'+column_name).show(); - - var form = $j('#fo_insert_member'); - var val = form.find('select[name=_tmp_address_list_'+column_name+']').val(); - var addr = form.find('input[name='+column_name+']'); - - addr - .eq(0).val(val).end() - .eq(1).focus(); -} - -function doSearchKrZip(column_name) { - var field = jQuery('#fo_insert_member input[name=_tmp_address_search_'+column_name+']'); - var _addr = field.val(); - if(!_addr) return; - - var params = { - addr : _addr, - column_name : column_name - }; - - var response_tags = ['error','message','address_list']; - - exec_xml('krzip', 'getKrzipCodeList', params, completeSearchKrZip, response_tags, params); -} - -function completeSearchKrZip(ret_obj, response_tags, callback_args) { - if(!ret_obj['address_list']) { - alert(alert_msg['address']); - return; - } - - var address_list = ret_obj['address_list'].split('\n'); - var column_name = callback_args['column_name']; - - var $j = jQuery; - - address_list = $j.map(address_list, function(addr){ return ''; }); - - $j('#zone_address_list_'+column_name).show(); - $j('#zone_address_search_'+column_name).hide(); - $j('#zone_address_1_'+column_name).hide(); - $j('#fo_insert_member select[name=_tmp_address_list_'+column_name+']').html(address_list.join('')).get(0).selectedIndex = 0; -} - -(function($){ - -$.krzip = function(column_name) { - var $search_zone, $select_zone; - - // search zone - ($search_zone = $('#zone_address_search_'+column_name)) - .find(':text') - .keypress(function(event){ - if(event.keyCode!=13) return; - $search_zone.find('button').click(); - return false; - }) - .end() - .find('button') - .click(function(){ - var val = $.trim($search_zone.find(':text').val()); - var params = { - addr : val, - column_name : column_name - }; - var response_tags = ['error','message','address_list']; - - if (!val) return false; - - function callback(ret_obj) { - var addr_list = ret_obj['address_list'] || ''; - - if(!addr_list) return alert(alert_msg['address']) || false; - - $search_zone.hide(); - $select_zone.show(); - - addr_list = $.map( addr_list.split('\n'), function(addr){return ''} ); - $('#address_list_'+column_name).html(addr_list.join('\n')).focus().get(0).selectedIndex = 0; - } - - exec_xml('krzip', 'getKrzipCodeList', params, callback, response_tags, params); - - return false; - }); - - // select zone - ($select_zone = $('#zone_address_list_'+column_name)) - .find('button') - .click(function(){ - $search_zone.show().find(':text').val('').focus(); - $select_zone.hide(); - }); -} - -})(jQuery); From 2b1d538a19da3dd9b3ffc0d439563d4ef408f8cf Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 00:44:08 +0900 Subject: [PATCH 026/473] =?UTF-8?q?#41=20build=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80=20(grunt)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 11 ++++++ 2 files changed, 119 insertions(+) create mode 100644 Gruntfile.js create mode 100644 package.json diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000000000..6371c166e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,108 @@ +module.exports = function(grunt) { + "use strict"; + + grunt.file.defaultEncoding = 'utf8'; + + grunt.initConfig({ + }); + + grunt.registerTask('build', '', function(A, B) { + if(!A || !B) grunt.fail.warn('Undefined build target.'); + + var done = this.async(); + var build_dir = 'build'; + var archive_full = build_dir + '/xe.' + B + '.tar.gz'; + var archive_changed = build_dir + '/xe.' + B + '.changed.tar.gz'; + var diff; + var tasks = ['changed', 'krzip', 'syndication']; + var taskDone = function() { + tasks.pop(); + grunt.verbose.writeln('remain tasks : '+tasks.length); + + if(tasks.length === 0) { + grunt.util.spawn({ + cmd: "tar", + args: ['cfz', 'xe.'+B+'.tar.gz', 'xe/'], + opts: { + cwd: 'build' + } + }, function (error, result, code) { + grunt.log.ok('Archived(full) : ' + archive_full); + + grunt.file.delete('build/xe'); + grunt.file.delete('build/temp.full.tar'); + + grunt.log.ok('Done!'); + }); + } + }; + + if(grunt.file.isDir(build_dir)) { + grunt.file.delete(build_dir); + } + grunt.file.mkdir(build_dir); + grunt.file.mkdir(build_dir + '/xe'); + + grunt.log.subhead('Archiving...'); + grunt.log.writeln('Target : ' + A + '...' + B); + + grunt.util.spawn({ + cmd: "git", + args: ['diff', '--name-only', A + '...' + B] + }, function (error, result, code) { + diff = result.stdout; + + if(diff) { + diff = diff.split(grunt.util.linefeed); + } + + grunt.util.spawn({ + cmd: "git", + args: ['archive', '--output=build/temp.full.tar', B, '.'] + }, function (error, result, code) { + + grunt.util.spawn({ + cmd: "tar", + args: ['xf', 'build/temp.full.tar', '-C' + , 'build/xe'], + }, function (error, result, code) { + + // krzip + grunt.util.spawn({ + cmd: "git", + args: ['clone', 'git@github.com:xpressengine/module-krzip.git', 'build/xe/modules/module-krzip'] + }, function (error, result, code) { + grunt.file.delete('build/xe/modules/module-krzip/.git'); + taskDone(); + }); + + // syndication + grunt.util.spawn({ + cmd: "git", + args: ['clone', 'git@github.com:xpressengine/module-syndication.git', 'build/xe/modules/syndication'] + }, function (error, result, code) { + grunt.file.delete('build/xe/modules/syndication/.git'); + taskDone(); + }); + }); + + // changed + if(diff.length) { + var args = ['archive', '--prefix=xe/', '-o', 'build/xe.'+B+'.changed.tar.gz', B]; + args = args.concat(diff); + grunt.util.spawn({ + cmd: "git", + args: args + }, function (error, result, code) { + grunt.log.ok('Archived(changed) : ./build/xe.'+B+'.changed.tar.gz'); + taskDone(); + }); + } else { + taskDone(); + } + }); + }); + }); + + grunt.registerTask('default', ['build']); +}; diff --git a/package.json b/package.json new file mode 100644 index 000000000..3517b4a32 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "name": "XpressEngine", + "devDependencies": { + "grunt": ">0.4.0", + "grunt-contrib-clean": "~0.5.0" + }, + "main": "Gruntfile.js", + "scripts": { + "test": "grunt" + } +} From c949ca526c0b032371e6de7e55d1d252cda71c98 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 00:47:17 +0900 Subject: [PATCH 027/473] =?UTF-8?q?ignore=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..53e8f06dc --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +files/ +build/ +node_modules/ +.DS_Srore +.Thumbs.db \ No newline at end of file From 4f459f9729d2f0c05f2b1484f62ea43ddc63cbe4 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 00:47:58 +0900 Subject: [PATCH 028/473] =?UTF-8?q?export-ignore=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.=20git-archive=20=EB=AA=85=EB=A0=B9=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=9C=EC=99=B8=20=ED=95=AD=EB=AA=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a46c8c196 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +.gitattributes export-ignore +.gitignore export-ignore +tools export-ignore +tests export-ignore +phpDoc export-ignore +Gruntfile.js export-ignore +package.json export-ignore \ No newline at end of file From 3f0457a82088ded51c96e1614d8a5d0df3ecce89 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 00:59:43 +0900 Subject: [PATCH 029/473] =?UTF-8?q?grunt.=20jshint=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 32 +++++++++++++++++++++++++++++--- package.json | 19 ++++++++++--------- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6371c166e..4a667d07a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,6 +4,31 @@ module.exports = function(grunt) { grunt.file.defaultEncoding = 'utf8'; grunt.initConfig({ + jshint: { + files: [ + 'Gruntfile.js', + // 'common/js/*.js', '!common/js/html5.js', '!common/js/jquery.js', '!common/js/x.js', '!common/js/xe.js', + // 'addons/**/*.js', + // 'modules/**/*.js', + // 'layouts/**/*.js', + // 'm.layouts/**/*.js', + // 'widgets/**/*.js', + // 'widgetstyles/**/*.js', + '!**/*.min.js', + '!**/*-packed.js' + ], + options : { + globalstrict: false, + undef : false, + eqeqeq: false, + browser : true, + globals: { + "jQuery" : true, + "console" : true, + "window" : true + } + } + }, }); grunt.registerTask('build', '', function(A, B) { @@ -63,8 +88,7 @@ module.exports = function(grunt) { grunt.util.spawn({ cmd: "tar", - args: ['xf', 'build/temp.full.tar', '-C' - , 'build/xe'], + args: ['xf', 'build/temp.full.tar', '-C', 'build/xe'] }, function (error, result, code) { // krzip @@ -104,5 +128,7 @@ module.exports = function(grunt) { }); }); - grunt.registerTask('default', ['build']); + grunt.loadNpmTasks('grunt-contrib-jshint'); + + grunt.registerTask('default', ['jshint']); }; diff --git a/package.json b/package.json index 3517b4a32..28b98dfe2 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { - "name": "XpressEngine", - "devDependencies": { - "grunt": ">0.4.0", - "grunt-contrib-clean": "~0.5.0" - }, - "main": "Gruntfile.js", - "scripts": { - "test": "grunt" - } + "name": "XpressEngine", + "devDependencies": { + "grunt": ">0.4.0", + "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-jshint": "~0.7.1" + }, + "main": "Gruntfile.js", + "scripts": { + "test": "grunt" + } } From 29675c0d871e9aff0df8d341e9a20d87ff73ac12 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 01:00:24 +0900 Subject: [PATCH 030/473] =?UTF-8?q?travis=20CI=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..b41aa52aa --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: php +before_script: + - npm install -g grunt-cli + - npm install +script: + - grunt From 3ab526eac20e6635b43d41247c4f1211d8c0793a Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 01:28:48 +0900 Subject: [PATCH 031/473] =?UTF-8?q?fixed=20#42=20=EA=B5=AC=EA=B8=80=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EB=A7=81=ED=81=AC?= =?UTF-8?q?=EB=A5=BC=20githhub=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/help/index.html | 8 ++++---- index.php | 9 +++++---- modules/admin/tpl/_footer.html | 2 +- modules/editor/skins/dreditor/editor.html | 2 +- modules/importer/lang/lang.xml | 16 ++++++++-------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/admin/help/index.html b/admin/help/index.html index bee717b3a..857abd807 100644 --- a/admin/help/index.html +++ b/admin/help/index.html @@ -252,11 +252,11 @@ body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,

XE core 설치 파일 다운로드

XE를 사용하여 사이트를 생성하려면 XE core를 설치해야 합니다. XE core는 XE의 설치와 운영을 담당하는 핵심 프로그램입니다. XE core에는 사이트 관리에 사용되는 기능이 없습니다. 하지만 XE core가 있어야 사용자가 추가 기능(모듈, 레이아웃, 스킨 등)을 설치하고 실행할 수 있습니다.

-

최신 XE core 설치 파일은 http://code.google.com/p/xe-core/downloads/list에서 무료로 다운로드할 수 있습니다.

+

최신 XE core 설치 파일은 http://www.xpressengine.com/index.php?mid=download&package_srl=18325662&type=all에서 무료로 다운로드할 수 있습니다.

참고

Windows 환경에서 WPI를 사용해 XE를 설치할 때는 XE core 설치 파일을 다운로드할 필요가 없습니다.

-

XE core 설치 파일은 zip과 tgz, 두 가지 형식으로 제공됩니다. 내 컴퓨터에서 압축을 해제한 후 서버에 업로드하려면 zip 파일을, 압축 파일을 서버에 업로드한 후 압축을 해제하려면 tgz 파일을 다운로드합니다. 각 형식의 파일 업로드 방식은 "XE core 설치 파일 형식별 업로드 방법"을 참조하십시오.

+

다운로드 받은 XE core 설치 파일의 압축을 해제한 후 서버에 업로드하려면 zip 파일을, 압축 파일을 서버에 업로드한 후 압축을 해제하려면 tgz 파일을 다운로드합니다. 각 형식의 파일 업로드 방식은 "XE core 설치 파일 형식별 업로드 방법"을 참조하십시오.

@@ -958,10 +958,10 @@ body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,

데이터 들여오기

-

제로보드4, zb5beta 또는 다른 프로그램의 데이터를 XE 데이터로 이전할 수 있습니다. 데이터의 추출은 공식사이트의 자료실에서 다운로드 받으시거나 svn을 통해 xe-migration project를 export 받으시면 됩니다.

+

제로보드4, zb5beta 또는 다른 프로그램의 데이터를 XE 데이터로 이전할 수 있습니다. 데이터의 추출은 공식사이트의 자료실에서 다운로드 받으시거나 Git을 통해 migration tool 저장소를 clone 하시면 됩니다.

XE의 '게시물 정보'를 다른 XE사이트 게시물로 이전하는 작업을 예로 들어 설명해 드리도록 하겠습니다.

    -
  1. 공식사이트의 자료실에서 "XpressEngine 데이터 추출 Ver 0.3"을 다운로드 받거나 xe-migration project에서 소스를 export 받습니다.
    2. +
  2. 공식사이트의 자료실에서 "XpressEngine 데이터 추출 Ver 0.3"을 다운로드 받거나 migration tool 저장소에서 소스를 clone 하시면 됩니다.
  3. 다운로드 받은 소스를 URL로 접근 가능한 곳에 압축을 풉니다. 이 예제에서는 XE의 URL이 http://example.com/xe/라면 http://example.com/migration/ 아래로 하겠습니다.
  4. 브라우져로 http://example.com/migration/index.php으로 접근하면 아래와 같은 모습을 볼 수 있습니다.
    diff --git a/index.php b/index.php index 9c0319d29..ad351ec6f 100644 --- a/index.php +++ b/index.php @@ -5,15 +5,16 @@ * @author NAVER (developers@xpressengine.com) * @brief Start page * - * Find and create module object by mif, act in Request Argument \n + * Find and create module object by mif, act in Request Argument * Set module information * * @mainpage XpressEngine * @section intro introduction - * XE is an opensource and being developed in the opensource project. \N + * + * XE is an opensource and being developed in the opensource project.\n * For more information, please see the link below. - * - Official website: http://www.xpressengine.com(korean), http://www.xpressengine.org(english) - * - SVN Repository: http://xe-core.googlecode.com/svn/ + * - Official website: http://www.xpressengine.com + * - Offcial Repository: https://github.com/xpressengine/core * \n * "XpressEngine (XE)" is free software; you can redistribute it and/or \n * modify it under the terms of the GNU Lesser General Public \n diff --git a/modules/admin/tpl/_footer.html b/modules/admin/tpl/_footer.html index 3f0e932b5..8e3962a29 100644 --- a/modules/admin/tpl/_footer.html +++ b/modules/admin/tpl/_footer.html @@ -10,7 +10,7 @@ | | | - {$lang->bug_report} + {$lang->bug_report}

    diff --git a/modules/editor/skins/dreditor/editor.html b/modules/editor/skins/dreditor/editor.html index 484438056..7a0a08248 100644 --- a/modules/editor/skins/dreditor/editor.html +++ b/modules/editor/skins/dreditor/editor.html @@ -555,7 +555,7 @@
    {$lang->edit->help_first_dt_5}
    {$lang->edit->help_first_dd_5}
    -

    {$lang->edit->help_bug_report}

    +

    {$lang->edit->help_bug_report}

    diff --git a/modules/importer/lang/lang.xml b/modules/importer/lang/lang.xml index d8f52134f..0835a95bb 100644 --- a/modules/importer/lang/lang.xml +++ b/modules/importer/lang/lang.xml @@ -503,25 +503,25 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http: - XML Exporter를 이용하면 XML파일로 변환할 수 있습니다.]]> + XML Exporter를 이용하면 XML파일로 변환할 수 있습니다.]]> XML Exporter to convert the data you want into XML File.]]> XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]> +変換するためには、XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]> XML Exporter生成XML文件后再上传。]]> +导入数据时请利用 XML Exporter生成XML文件后再上传。]]> XML Exporter 建立 XML 檔案後再上傳。]]> +匯入資料時，請利用 XML Exporter 建立 XML 檔案後再上傳。]]> Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]> +Pour transférer, vous devez utiliser Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]> XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]> +Чтобы импортировать, Вам следует использовать XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]> XML Exporter para transformar los datos en archivo XML, y luego subir ese archivo.]]> +Para la transferencia debe utilizar XML Exporter para transformar los datos en archivo XML, y luego subir ese archivo.]]> XML DışAktarımcı'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]> XML Exporter.]]> +Để hiểu rõ hơn công việc này, bạn có thể tham khảo cách chuyển đổi Data của bạn vào XE khi bạn đã Upload chúng tại XML Exporter.]]> Date: Fri, 15 Nov 2013 01:40:27 +0900 Subject: [PATCH 032/473] =?UTF-8?q?=EB=8C=80=EB=B2=84=EA=B9=85=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module/module.admin.view.php | 1 - modules/trash/trash.admin.view.php | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 004a79f76..c261632c9 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -308,7 +308,6 @@ class moduleAdminView extends module $oSecurity = new Security(); $oSecurity->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); - debugPrint($output->data); $this->setTemplateFile('adminFileBox'); } } diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index 871912d4e..1b8fc3f15 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -47,7 +47,6 @@ class trashAdminView extends trash Context::set('total_page', $output->total_page); Context::set('page', $output->page); Context::set('page_navigation', $output->page_navigation); - debugPrint($output->data); // 템플릿 파일 지정 $this->setTemplateFile('trash_list'); From 5d78acb99e27ef93cb3c736902f70c782c496339 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 01:54:50 +0900 Subject: [PATCH 033/473] =?UTF-8?q?5fa0bf23=EC=97=90=EC=84=9C=20=EB=94=94?= =?UTF-8?q?=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=83=9D=EC=84=B1=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/file/FileHandler.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 08ed3d298..02ccff9ec 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -321,7 +321,7 @@ class FileHandler if(!ini_get('safe_mode')) { - @mkdir($path_string, 0755); + @mkdir($path_string, 0755, TRUE); @chmod($path_string, 0755); } // if safe_mode is on, use FTP From 7a100cd7405fc2e5a26284eb0df53d7f09ae0be0 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 01:56:08 +0900 Subject: [PATCH 034/473] =?UTF-8?q?fixed=20#44=20admin=20bar=20=EB=B9=84?= =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/display/HTMLDisplayHandler.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index cdd387a07..56428b348 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -129,6 +129,8 @@ class HTMLDisplayHandler { Context::set('admin_bar', 'false'); } + // DISABLE ADMIN BAR + Context::set('admin_bar', 'false'); if(__DEBUG__ == 3) { From b8d20fb62f7357c54ef7c3ebcb94eb19b1be6eb2 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 02:01:45 +0900 Subject: [PATCH 035/473] =?UTF-8?q?fixed=20#1=20point=5Flevel=5Ficon=20?= =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=EC=9D=B4=20JSON,=20XML=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EA=B2=B0=EA=B3=BC=EC=97=90=20=EC=98=81=ED=96=A5?= =?UTF-8?q?=EC=9D=84=20=EC=A4=84=20=EC=88=98=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/point_level_icon/point_level_icon.addon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php index bddadad61..e091c6597 100644 --- a/addons/point_level_icon/point_level_icon.addon.php +++ b/addons/point_level_icon/point_level_icon.addon.php @@ -12,7 +12,7 @@ if(!defined('__XE__')) * Display point level icon before user name when point system is enabled. * */ // return unless before_display_content -if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify') +if($called_position != "before_display_content" || Context::getResponseMethod() != 'HTML' || Context::get('act') == 'dispPageAdminContentModify') { return; } From a7e130cc3e4b6c411ff976a17ba84950051d62f9 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Fri, 15 Nov 2013 02:24:07 +0900 Subject: [PATCH 036/473] =?UTF-8?q?fixed=20#47=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=EB=A7=B5=EC=97=90=EC=84=9C=20=EA=B6=8C=ED=95=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=8B=9C=20=EA=B7=B8=EB=A3=B9=EC=9D=84=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=95=98=EC=97=AC=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9D=84=20=EC=A0=80=EC=9E=A5=ED=95=A0=20=EC=88=98=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/menu/tpl/sitemap.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index f8e2a65a7..3903c99cd 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -2348,7 +2348,7 @@ jQuery(function($){ // Output of $.param function used in exec_json does not have a representation for an empty array. So, use "[]" (string) instead. if(vValue.length === 0) vValue = "[]"; - return vValue; + return vValue.toString(); } From ab021d75c72e0d52f480e33d1445eb09ec8a6b62 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 11:14:00 +0900 Subject: [PATCH 037/473] =?UTF-8?q?fixed=20#31=20r12836=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0=ED=95=9C=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=A9=94=EB=89=B4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=83=88=20=EC=B0=BD=EC=9C=BC=EB=A1=9C=20=EB=9D=84=EC=9A=B0?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/common.js | 953 ++++++++++++++++++++++---------------------- 1 file changed, 478 insertions(+), 475 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index d72b1293d..e8090224a 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -8,127 +8,130 @@ if(jQuery) jQuery.noConflict(); (function($) { - /* OS check */ - var UA = navigator.userAgent.toLowerCase(); - $.os = { - Linux: /linux/.test(UA), - Unix: /x11/.test(UA), - Mac: /mac/.test(UA), - Windows: /win/.test(UA) - }; - $.os.name = ($.os.Windows) ? 'Windows' : - ($.os.Linux) ? 'Linux' : - ($.os.Unix) ? 'Unix' : - ($.os.Mac) ? 'Mac' : ''; + /* OS check */ + var UA = navigator.userAgent.toLowerCase(); + $.os = { + Linux: /linux/.test(UA), + Unix: /x11/.test(UA), + Mac: /mac/.test(UA), + Windows: /win/.test(UA) + }; + $.os.name = ($.os.Windows) ? 'Windows' : + ($.os.Linux) ? 'Linux' : + ($.os.Unix) ? 'Unix' : + ($.os.Mac) ? 'Mac' : ''; - /** - * @brief XE 공용 유틸리티 함수 - * @namespace XE - */ - window.XE = { - loaded_popup_menus : new Array(), - addedDocument : new Array(), - /** - * @brief 특정 name을 가진 체크박스들의 checked 속성 변경 - * @param [itemName='cart',][options={}] - */ - checkboxToggleAll : function(itemName) { - if(!is_def(itemName)) itemName='cart'; - var options = { - wrap : null, - checked : 'toggle', - doClick : false - }; + /** + * @brief XE 공용 유틸리티 함수 + * @namespace XE + */ + window.XE = { + loaded_popup_menus : new Array(), + addedDocument : new Array(), + /** + * @brief 특정 name을 가진 체크박스들의 checked 속성 변경 + * @param [itemName='cart',][options={}] + */ + checkboxToggleAll : function(itemName) { + if(!is_def(itemName)) itemName='cart'; + var options = { + wrap : null, + checked : 'toggle', + doClick : false + }; - switch(arguments.length) { - case 1: - if(typeof(arguments[0]) == "string") { - itemName = arguments[0]; - } else { - $.extend(options, arguments[0] || {}); + switch(arguments.length) { + case 1: + if(typeof(arguments[0]) == "string") { + itemName = arguments[0]; + } else { + $.extend(options, arguments[0] || {}); itemName = 'cart'; - } - break; - case 2: - itemName = arguments[0]; - $.extend(options, arguments[1] || {}); - } + } + break; + case 2: + itemName = arguments[0]; + $.extend(options, arguments[1] || {}); + } - if(options.doClick == true) options.checked = null; - if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap; + if(options.doClick == true) options.checked = null; + if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap; + + if(options.wrap) { + var obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); + } else { + var obj = $('input[name='+itemName+']:checkbox'); + } - if(options.wrap) { - var obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); - } else { - var obj = $('input[name='+itemName+']:checkbox'); - } - if(options.checked == 'toggle') { - obj.each(function() { - $(this).attr('checked', ($(this).attr('checked')) ? false : true); - }); - } else { - (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked); - } - }, - - /** - * @brief 문서/회원 등 팝업 메뉴 출력 - */ - displayPopupMenu : function(ret_obj, response_tags, params) { - var target_srl = params["target_srl"]; - var menu_id = params["menu_id"]; - var menus = ret_obj['menus']; - var html = ""; + obj.each(function() { + $(this).attr('checked', ($(this).attr('checked')) ? false : true); + }); + } else { + (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked); + } + }, - if(this.loaded_popup_menus[menu_id]) { - html = this.loaded_popup_menus[menu_id]; + /** + * @brief 문서/회원 등 팝업 메뉴 출력 + */ + displayPopupMenu : function(ret_obj, response_tags, params) { + var target_srl = params["target_srl"]; + var menu_id = params["menu_id"]; + var menus = ret_obj['menus']; + var html = ""; - } else { - if(menus) { - var item = menus['item']; - if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item); - if(item.length) { - for(var i=0;i'+str+'
    5. '; - } - } - } - this.loaded_popup_menus[menu_id] = html; - } + var styleText = ""; + var click_str = ""; + /* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */ + switch(target) { + case "popup" : + click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\""; + break; + case "javascript" : + click_str = " onclick=\""+url+"; return false; \""; + url="#"; + break; + default : + click_str = ' target="_blank"'; + break; + } - /* 레이어 출력 */ - if(html) { - var area = $('#popup_menu_area').html('
      '+html+'
    '); - var areaOffset = {top:params['page_y'], left:params['page_x']}; + html += '
  5. '+str+'
    6. '; + } + } + } + this.loaded_popup_menus[menu_id] = html; + } - if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) - areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop(); - if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft()) - areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft(); + /* 레이어 출력 */ + if(html) { + var area = $('#popup_menu_area').html('
      '+html+'
    '); + var areaOffset = {top:params['page_y'], left:params['page_x']}; - area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus(); - } - } - } + if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) + areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop(); + if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft()) + areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft(); + + area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus(); + } + } + } }) (jQuery); @@ -141,65 +144,65 @@ jQuery(function($) { $($(this).attr('href')).attr('tabindex','0').focus(); }); - /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */ - if($.browser.msie) { - $('select').each(function(i, sels) { - var disabled_exists = false; - var first_enable = new Array(); + /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */ + if($.browser.msie) { + $('select').each(function(i, sels) { + var disabled_exists = false; + var first_enable = new Array(); - for(var j=0; j < sels.options.length; j++) { - if(sels.options[j].disabled) { - sels.options[j].style.color = '#CCCCCC'; - disabled_exists = true; - }else{ - first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j; - } - } + for(var j=0; j < sels.options.length; j++) { + if(sels.options[j].disabled) { + sels.options[j].style.color = '#CCCCCC'; + disabled_exists = true; + }else{ + first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j; + } + } - if(!disabled_exists) return; + if(!disabled_exists) return; - sels.oldonchange = sels.onchange; - sels.onchange = function() { - if(this.options[this.selectedIndex].disabled) { + sels.oldonchange = sels.onchange; + sels.onchange = function() { + if(this.options[this.selectedIndex].disabled) { - this.selectedIndex = first_enable[i]; - /* - if(this.options.length<=1) this.selectedIndex = -1; - else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++; - else this.selectedIndex--; - */ + this.selectedIndex = first_enable[i]; + /* + if(this.options.length<=1) this.selectedIndex = -1; + else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++; + else this.selectedIndex--; + */ - } else { - if(this.oldonchange) this.oldonchange(); - } - }; + } else { + if(this.oldonchange) this.oldonchange(); + } + }; - if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange(); + if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange(); - }); - } + }); + } + + /* 단락에디터 fold 컴포넌트 펼치기/접기 */ + var drEditorFold = $('.xe_content .fold_button'); + if(drEditorFold.size()) { + var fold_container = $('div.fold_container', drEditorFold); + $('button.more', drEditorFold).click(function() { + $(this).hide().next('button').show().parent().next(fold_container).show(); + }); + $('button.less', drEditorFold).click(function() { + $(this).hide().prev('button').show().parent().next(fold_container).hide(); + }); + } - /* 단락에디터 fold 컴포넌트 펼치기/접기 */ - var drEditorFold = $('.xe_content .fold_button'); - if(drEditorFold.size()) { - var fold_container = $('div.fold_container', drEditorFold); - $('button.more', drEditorFold).click(function() { - $(this).hide().next('button').show().parent().next(fold_container).show(); - }); - $('button.less', drEditorFold).click(function() { - $(this).hide().prev('button').show().parent().next(fold_container).hide(); - }); - } - jQuery('input[type="submit"],button[type="submit"]').click(function(ev){ var $el = jQuery(ev.currentTarget); - + setTimeout(function(){ return function(){ $el.attr('disabled', 'disabled'); }; }(), 0); - + setTimeout(function(){ return function(){ $el.removeAttr('disabled'); @@ -221,15 +224,15 @@ var isArray = Array.isArray || function(obj){ return Object.prototype.toString.c **/ String.prototype.getQuery = function(key) { var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - if(idx == -1) return null; - var query_string = loc.substr(idx+1, this.length), args = {}; - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); + var idx = loc.indexOf('?'); + if(idx == -1) return null; + var query_string = loc.substr(idx+1, this.length), args = {}; + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); - var q = args[key]; - if(typeof(q)=='undefined') q = ''; + var q = args[key]; + if(typeof(q)=='undefined') q = ''; - return q; + return q; } /** @@ -237,18 +240,18 @@ String.prototype.getQuery = function(key) { **/ String.prototype.setQuery = function(key, val) { var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - var uri = loc.replace(/#$/, ''); + var idx = loc.indexOf('?'); + var uri = loc.replace(/#$/, ''); var act, re, v; if (typeof(val)=='undefined') val = ''; - if (idx != -1) { - var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; + if (idx != -1) { + var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; uri = loc.substr(0, idx); - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); - args[key] = val; + args[key] = val; for (var prop in args) { if (!args.hasOwnProperty(prop)) continue; @@ -258,26 +261,26 @@ String.prototype.setQuery = function(key, val) { query_string = q_list.join('&'); uri = uri+(query_string?'?'+query_string:''); - } else { - if (String(val).trim()) uri = uri+'?'+key+'='+val; - } + } else { + if (String(val).trim()) uri = uri+'?'+key+'='+val; + } re = /^https:\/\/([^:\/]+)(:\d+|)/i; - if (re.test(uri)) { - var toReplace = 'http://'+RegExp.$1; - if (window.http_port && http_port != 80) toReplace += ':' + http_port; - uri = uri.replace(re, toReplace); - } + if (re.test(uri)) { + var toReplace = 'http://'+RegExp.$1; + if (window.http_port && http_port != 80) toReplace += ':' + http_port; + uri = uri.replace(re, toReplace); + } - var bUseSSL = !!window.enforce_ssl; + var bUseSSL = !!window.enforce_ssl; if (!bUseSSL && isArray(window.ssl_actions) && (act=uri.getQuery('act'))) { - for (var i=0,c=ssl_actions.length; i < c; i++) { - if (ssl_actions[i] === act) { - bUseSSL = true; - break; - } - } - } + for (var i=0,c=ssl_actions.length; i < c; i++) { + if (ssl_actions[i] === act) { + bUseSSL = true; + break; + } + } + } re = /http:\/\/([^:\/]+)(:\d+|)/i; if (bUseSSL && re.test(uri)) { @@ -289,14 +292,14 @@ String.prototype.setQuery = function(key, val) { // insert index.php if it isn't included uri = uri.replace(/\/(index\.php)?\?/, '/index.php?'); - return encodeURI(uri); + return encodeURI(uri); } /** * @brief string prototype으로 trim 함수 추가 **/ String.prototype.trim = function() { - return this.replace(/(^\s*)|(\s*$)/g, ""); + return this.replace(/(^\s*)|(\s*$)/g, ""); } })(); @@ -305,22 +308,22 @@ String.prototype.trim = function() { * @brief xSleep(micro time) **/ function xSleep(sec) { - sec = sec / 1000; - var now = new Date(); - var sleep = new Date(); - while( sleep.getTime() - now.getTime() < sec) { - sleep = new Date(); - } + sec = sec / 1000; + var now = new Date(); + var sleep = new Date(); + while( sleep.getTime() - now.getTime() < sec) { + sleep = new Date(); + } } /** * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return **/ function isDef() { - for(var i=0; i < arguments.length; ++i) { - if(typeof(arguments[i]) == "undefined") return false; - } - return true; + for(var i=0; i < arguments.length; ++i) { + if(typeof(arguments[i]) == "undefined") return false; + } + return true; } /** @@ -329,20 +332,20 @@ function isDef() { **/ var winopen_list = new Array(); function winopen(url, target, attribute) { - if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); - try { - if(target != "_blank" && winopen_list[target]) { - winopen_list[target].close(); - winopen_list[target] = null; - } - } catch(e) { - } + if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); + try { + if(target != "_blank" && winopen_list[target]) { + winopen_list[target].close(); + winopen_list[target] = null; + } + } catch(e) { + } - if(typeof(target) == 'undefined') target = '_blank'; - if(typeof(attribute) == 'undefined') attribute = ''; - var win = window.open(url, target, attribute); - win.focus(); - if(target != "_blank") winopen_list[target] = win; + if(typeof(target) == 'undefined') target = '_blank'; + if(typeof(attribute) == 'undefined') attribute = ''; + var win = window.open(url, target, attribute); + win.focus(); + if(target != "_blank") winopen_list[target] = win; } /** @@ -350,113 +353,113 @@ function winopen(url, target, attribute) { * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용 **/ function popopen(url, target) { - if(typeof(target) == "undefined") target = "_blank"; - if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); - winopen(url, target, "width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no"); + if(typeof(target) == "undefined") target = "_blank"; + if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); + winopen(url, target, "width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no"); } /** * @brief 메일 보내기용 **/ function sendMailTo(to) { - location.href="mailto:"+to; + location.href="mailto:"+to; } /** * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움) **/ function move_url(url, open_window) { - if(!url) return false; - if(typeof(open_window) == 'undefined') open_window = 'N'; - if(open_window=='N') { - open_window = false; - } else { - open_window = true; - } + if(!url) return false; + if(typeof(open_window) == 'undefined') open_window = 'N'; + if(open_window=='N') { + open_window = false; + } else { + open_window = true; + } - if(/^\./.test(url)) url = request_uri+url; + if(/^\./.test(url)) url = request_uri+url; - if(open_window) { - winopen(url); - } else { - location.href=url; - } + if(open_window) { + winopen(url); + } else { + location.href=url; + } - return false; + return false; } /** * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용) **/ function displayMultimedia(src, width, height, options) { - var html = _displayMultimedia(src, width, height, options); - if(html) document.writeln(html); + var html = _displayMultimedia(src, width, height, options); + if(html) document.writeln(html); } function _displayMultimedia(src, width, height, options) { - if(src.indexOf('files') == 0) src = request_uri + src; + if(src.indexOf('files') == 0) src = request_uri + src; - var defaults = { - wmode : 'transparent', - allowScriptAccess : 'sameDomain', - quality : 'high', - flashvars : '', - autostart : false - }; + var defaults = { + wmode : 'transparent', + allowScriptAccess : 'sameDomain', + quality : 'high', + flashvars : '', + autostart : false + }; - var params = jQuery.extend(defaults, options || {}); + var params = jQuery.extend(defaults, options || {}); var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false'; delete(params.autostart); - var clsid = ""; - var codebase = ""; - var html = ""; + var clsid = ""; + var codebase = ""; + var html = ""; - if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ - html = ''; - } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { - html = ''; - } else if(/\.swf/i.test(src)) { - clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; + if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ + html = ''; + } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { + html = ''; + } else if(/\.swf/i.test(src)) { + clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; - if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } - else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } - html = ''; - html += ''; - for(var name in params) { - if(params[name] != 'undefined' && params[name] != '') { - html += ''; - } - } - html += '' - + '' - + ''; - } else { + if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } + else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } + html = ''; + html += ''; + for(var name in params) { + if(params[name] != 'undefined' && params[name] != '') { + html += ''; + } + } + html += '' + + '' + + ''; + } else { if (jQuery.browser.mozilla || jQuery.browser.opera) { // firefox and opera uses 0 or 1 for autostart parameter. autostart = (params.autostart && params.autostart != 'false') ? '1' : '0'; } - html = ''+ - ''+ - ''+ - ''+ - '' - ).appendTo(document.body); + if(!dummy_obj.length) { + jQuery( + '
    '+ + ''+ + ''+ + ''+ + '' + ).appendTo(document.body); - dummy_obj = jQuery("#previewDocument")[0]; - } else { + dummy_obj = jQuery("#previewDocument")[0]; + } else { dummy_obj = dummy_obj[0]; } - if(dummy_obj) { - dummy_obj.content.value = content; - dummy_obj.submit(); - } + if(dummy_obj) { + dummy_obj.content.value = content; + dummy_obj.submit(); + } } /* 게시글 저장 */ function doDocumentSave(obj) { - var editor_sequence = obj.form.getAttribute('editor_sequence'); - var prev_content = editorRelKeys[editor_sequence]['content'].value; - if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { - var content = editorGetContent(editor_sequence); - editorRelKeys[editor_sequence]['content'].value = content; - } + var editor_sequence = obj.form.getAttribute('editor_sequence'); + var prev_content = editorRelKeys[editor_sequence]['content'].value; + if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { + var content = editorGetContent(editor_sequence); + editorRelKeys[editor_sequence]['content'].value = content; + } var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();; jQuery.each(data, function(i, field){ @@ -578,85 +581,85 @@ function doDocumentSave(obj) { exec_xml('document','procDocumentTempSave', params, completeDocumentSave, responses, params, obj.form); - editorRelKeys[editor_sequence]['content'].value = prev_content; - return false; + editorRelKeys[editor_sequence]['content'].value = prev_content; + return false; } function completeDocumentSave(ret_obj) { - jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']); - alert(ret_obj['message']); + jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']); + alert(ret_obj['message']); } /* 저장된 게시글 불러오기 */ var objForSavedDoc = null; function doDocumentLoad(obj) { - // 저장된 게시글 목록 불러오기 - objForSavedDoc = obj.form; - popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList')); + // 저장된 게시글 목록 불러오기 + objForSavedDoc = obj.form; + popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList')); } /* 저장된 게시글의 선택 */ function doDocumentSelect(document_srl) { - if(!opener || !opener.objForSavedDoc) { - window.close(); - return; - } + if(!opener || !opener.objForSavedDoc) { + window.close(); + return; + } - // 게시글을 가져와서 등록하기 - opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite'); - window.close(); + // 게시글을 가져와서 등록하기 + opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite'); + window.close(); } /* 스킨 정보 */ function viewSkinInfo(module, skin) { - popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo'); + popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo'); } /* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */ var addedDocument = new Array(); function doAddDocumentCart(obj) { - var srl = obj.value; - addedDocument[addedDocument.length] = srl; - setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100); + var srl = obj.value; + addedDocument[addedDocument.length] = srl; + setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100); } function callAddDocumentCart(document_length) { - if(addedDocument.length<1 || document_length != addedDocument.length) return; - var params = new Array(); - params["srls"] = addedDocument.join(","); - exec_xml("document","procDocumentAddCart", params, null); - addedDocument = new Array(); + if(addedDocument.length<1 || document_length != addedDocument.length) return; + var params = new Array(); + params["srls"] = addedDocument.join(","); + exec_xml("document","procDocumentAddCart", params, null); + addedDocument = new Array(); } /* ff의 rgb(a,b,c)를 #... 로 변경 */ function transRGB2Hex(value) { - if(!value) return value; - if(value.indexOf('#') > -1) return value.replace(/^#/, ''); + if(!value) return value; + if(value.indexOf('#') > -1) return value.replace(/^#/, ''); - if(value.toLowerCase().indexOf('rgb') < 0) return value; - value = value.replace(/^rgb\(/i, '').replace(/\)$/, ''); - value_list = value.split(','); + if(value.toLowerCase().indexOf('rgb') < 0) return value; + value = value.replace(/^rgb\(/i, '').replace(/\)$/, ''); + value_list = value.split(','); - var hex = ''; - for(var i = 0; i < value_list.length; i++) { - var color = parseInt(value_list[i], 10).toString(16); - if(color.length == 1) color = '0'+color; - hex += color; - } - return hex; + var hex = ''; + for(var i = 0; i < value_list.length; i++) { + var color = parseInt(value_list[i], 10).toString(16); + if(color.length == 1) color = '0'+color; + hex += color; + } + return hex; } /* 보안 로그인 모드로 전환 */ function toggleSecuritySignIn() { - var href = location.href; - if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http'); - else location.href = href.replace(/^http/i,'https'); + var href = location.href; + if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http'); + else location.href = href.replace(/^http/i,'https'); } function reloadDocument() { - location.reload(); + location.reload(); } @@ -669,137 +672,137 @@ function reloadDocument() { var Base64 = { - // private property - _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", + // private property + _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", - // public method for encoding - encode : function (input) { - var output = ""; - var chr1, chr2, chr3, enc1, enc2, enc3, enc4; - var i = 0; + // public method for encoding + encode : function (input) { + var output = ""; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; - input = Base64._utf8_encode(input); + input = Base64._utf8_encode(input); - while (i < input.length) { + while (i < input.length) { - chr1 = input.charCodeAt(i++); - chr2 = input.charCodeAt(i++); - chr3 = input.charCodeAt(i++); + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); - enc1 = chr1 >> 2; - enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); - enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); - enc4 = chr3 & 63; + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; - if (isNaN(chr2)) { - enc3 = enc4 = 64; - } else if (isNaN(chr3)) { - enc4 = 64; - } + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } - output = output + - this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + - this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); + output = output + + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); - } + } - return output; - }, + return output; + }, - // public method for decoding - decode : function (input) { - var output = ""; - var chr1, chr2, chr3; - var enc1, enc2, enc3, enc4; - var i = 0; + // public method for decoding + decode : function (input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - while (i < input.length) { + while (i < input.length) { - enc1 = this._keyStr.indexOf(input.charAt(i++)); - enc2 = this._keyStr.indexOf(input.charAt(i++)); - enc3 = this._keyStr.indexOf(input.charAt(i++)); - enc4 = this._keyStr.indexOf(input.charAt(i++)); + enc1 = this._keyStr.indexOf(input.charAt(i++)); + enc2 = this._keyStr.indexOf(input.charAt(i++)); + enc3 = this._keyStr.indexOf(input.charAt(i++)); + enc4 = this._keyStr.indexOf(input.charAt(i++)); - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; - output = output + String.fromCharCode(chr1); + output = output + String.fromCharCode(chr1); - if (enc3 != 64) { - output = output + String.fromCharCode(chr2); - } - if (enc4 != 64) { - output = output + String.fromCharCode(chr3); - } + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } - } + } - output = Base64._utf8_decode(output); + output = Base64._utf8_decode(output); - return output; + return output; - }, + }, - // private method for UTF-8 encoding - _utf8_encode : function (string) { - string = string.replace(/\r\n/g,"\n"); - var utftext = ""; + // private method for UTF-8 encoding + _utf8_encode : function (string) { + string = string.replace(/\r\n/g,"\n"); + var utftext = ""; - for (var n = 0; n < string.length; n++) { + for (var n = 0; n < string.length; n++) { - var c = string.charCodeAt(n); + var c = string.charCodeAt(n); - if (c < 128) { - utftext += String.fromCharCode(c); - } - else if((c > 127) && (c < 2048)) { - utftext += String.fromCharCode((c >> 6) | 192); - utftext += String.fromCharCode((c & 63) | 128); - } - else { - utftext += String.fromCharCode((c >> 12) | 224); - utftext += String.fromCharCode(((c >> 6) & 63) | 128); - utftext += String.fromCharCode((c & 63) | 128); - } + if (c < 128) { + utftext += String.fromCharCode(c); + } + else if((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } + else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } - } + } - return utftext; - }, + return utftext; + }, - // private method for UTF-8 decoding - _utf8_decode : function (utftext) { - var string = ""; - var i = 0; - var c = c1 = c2 = 0; + // private method for UTF-8 decoding + _utf8_decode : function (utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; - while ( i < utftext.length ) { + while ( i < utftext.length ) { - c = utftext.charCodeAt(i); + c = utftext.charCodeAt(i); - if (c < 128) { - string += String.fromCharCode(c); - i++; - } - else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); - i += 2; - } - else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); - i += 3; - } + if (c < 128) { + string += String.fromCharCode(c); + i++; + } + else if((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i+1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } + else { + c2 = utftext.charCodeAt(i+1); + c3 = utftext.charCodeAt(i+2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } - } + } - return string; - } + return string; + } } @@ -814,11 +817,11 @@ var Base64 = { * ------------------------------------------- */ if(typeof(resizeImageContents) == 'undefined') { - function resizeImageContents() {} + function resizeImageContents() {} } if(typeof(activateOptionDisabled) == 'undefined') { - function activateOptionDisabled() {} + function activateOptionDisabled() {} } objectExtend = jQuery.extend; @@ -827,57 +830,57 @@ objectExtend = jQuery.extend; * @brief 특정 Element의 display 옵션 토글 **/ function toggleDisplay(objId) { - jQuery('#'+objId).toggle(); + jQuery('#'+objId).toggle(); } /** * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음) **/ function svc_folder_open(id) { - jQuery("#_folder_open_"+id).hide(); - jQuery("#_folder_close_"+id).show(); - jQuery("#_folder_"+id).show(); + jQuery("#_folder_open_"+id).hide(); + jQuery("#_folder_close_"+id).show(); + jQuery("#_folder_"+id).show(); } function svc_folder_close(id) { - jQuery("#_folder_open_"+id).show(); - jQuery("#_folder_close_"+id).hide(); - jQuery("#_folder_"+id).hide(); + jQuery("#_folder_open_"+id).show(); + jQuery("#_folder_close_"+id).hide(); + jQuery("#_folder_"+id).hide(); } /** * @brief 날짜 선택 (달력 열기) **/ function open_calendar(fo_id, day_str, callback_func) { - if(typeof(day_str)=="undefined") day_str = ""; + if(typeof(day_str)=="undefined") day_str = ""; - var url = "./common/tpl/calendar.php?"; - if(fo_id) url+="fo_id="+fo_id; - if(day_str) url+="&day_str="+day_str; - if(callback_func) url+="&callback_func="+callback_func; + var url = "./common/tpl/calendar.php?"; + if(fo_id) url+="fo_id="+fo_id; + if(day_str) url+="&day_str="+day_str; + if(callback_func) url+="&callback_func="+callback_func; - popopen(url, 'Calendar'); + popopen(url, 'Calendar'); } var loaded_popup_menus = XE.loaded_popup_menus; function createPopupMenu() {} function chkPopupMenu() {} function displayPopupMenu(ret_obj, response_tags, params) { - XE.displayPopupMenu(ret_obj, response_tags, params); + XE.displayPopupMenu(ret_obj, response_tags, params); } function GetObjLeft(obj) { - return jQuery(obj).offset().left; + return jQuery(obj).offset().left; } function GetObjTop(obj) { - return jQuery(obj).offset().top; + return jQuery(obj).offset().top; } function replaceOuterHTML(obj, html) { - jQuery(obj).replaceWith(html); + jQuery(obj).replaceWith(html); } function getOuterHTML(obj) { - return jQuery(obj).html().trim(); + return jQuery(obj).html().trim(); } function setCookie(name, value, expire, path) { @@ -918,7 +921,7 @@ jQuery(function($){ if(!$target.length) $target = $(evt.target).closest('a,div,span'); if(!$target.length) return; - // 객체의 className값을 구함 + // 객체의 className값을 구함 var cls = $target.attr('class'), match; if(cls) match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9]\\d*))(?: |$)','')); if(!match) return; @@ -944,8 +947,8 @@ jQuery(function($){ show_waiting_message = false; exec_xml('member', action, params, XE.displayPopupMenu, response_tags, params); - show_waiting_message = true; - }); + show_waiting_message = true; + }); /** * Create popup windows automatically. From 59c151845ba0a09db325fb1cf0a30b4be8efb109 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 12:54:09 +0900 Subject: [PATCH 038/473] =?UTF-8?q?#41=20=EB=8B=A8=EC=9D=BC=20=EB=B8=8C?= =?UTF-8?q?=EB=9E=9C=EC=B9=98=EB=A5=BC=20=EC=A7=80=EC=A0=95=ED=95=98?= =?UTF-8?q?=EC=97=AC=20=EB=B9=8C=EB=93=9C=ED=95=A0=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 113 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 47 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4a667d07a..8911b5ea6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -32,14 +32,30 @@ module.exports = function(grunt) { }); grunt.registerTask('build', '', function(A, B) { - if(!A || !B) grunt.fail.warn('Undefined build target.'); + var _only_export = false; + + if(!A) { + grunt.fail.warn('Undefined build target.'); + } else if(A && !B) { + _only_export = true; + } + + if(!_only_export) { + tasks.push('changed'); + target = A + '...' + B; + version = B; + } else { + target = A; + version = A; + } var done = this.async(); var build_dir = 'build'; - var archive_full = build_dir + '/xe.' + B + '.tar.gz'; - var archive_changed = build_dir + '/xe.' + B + '.changed.tar.gz'; - var diff; - var tasks = ['changed', 'krzip', 'syndication']; + var archive_full = build_dir + '/xe.' + version + '.tar.gz'; + var archive_changed = build_dir + '/xe.' + version + '.changed.tar.gz'; + var diff, target, version; + var tasks = ['krzip', 'syndication']; + var taskDone = function() { tasks.pop(); grunt.verbose.writeln('remain tasks : '+tasks.length); @@ -47,7 +63,7 @@ module.exports = function(grunt) { if(tasks.length === 0) { grunt.util.spawn({ cmd: "tar", - args: ['cfz', 'xe.'+B+'.tar.gz', 'xe/'], + args: ['cfz', 'xe.'+version+'.tar.gz', 'xe/'], opts: { cwd: 'build' } @@ -69,61 +85,64 @@ module.exports = function(grunt) { grunt.file.mkdir(build_dir + '/xe'); grunt.log.subhead('Archiving...'); - grunt.log.writeln('Target : ' + A + '...' + B); + grunt.log.writeln('Target : ' + target); grunt.util.spawn({ cmd: "git", - args: ['diff', '--name-only', A + '...' + B] - }, function (error, result, code) { - diff = result.stdout; + args: ['archive', '--output=build/temp.full.tar', version, '.'] + }, function (error, result, code){ + if(!_only_export) { + // changed + grunt.util.spawn({ + cmd: "git", + args: ['diff', '--name-only', target] + }, function (error, result, code) { + diff = result.stdout; - if(diff) { - diff = diff.split(grunt.util.linefeed); + if(diff) { + diff = diff.split(grunt.util.linefeed); + } + + // changed + if(diff.length) { + var args = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.tar.gz', version]; + args = args.concat(diff); + grunt.util.spawn({ + cmd: "git", + args: args + }, function (error, result, code) { + grunt.log.ok('Archived(changed) : ./build/xe.'+version+'.changed.tar.gz'); + taskDone(); + }); + } else { + taskDone(); + } + }); } + // full grunt.util.spawn({ - cmd: "git", - args: ['archive', '--output=build/temp.full.tar', B, '.'] + cmd: "tar", + args: ['xf', 'build/temp.full.tar', '-C', 'build/xe'] }, function (error, result, code) { + // krzip grunt.util.spawn({ - cmd: "tar", - args: ['xf', 'build/temp.full.tar', '-C', 'build/xe'] + cmd: "git", + args: ['clone', 'git@github.com:xpressengine/module-krzip.git', 'build/xe/modules/module-krzip'] }, function (error, result, code) { - - // krzip - grunt.util.spawn({ - cmd: "git", - args: ['clone', 'git@github.com:xpressengine/module-krzip.git', 'build/xe/modules/module-krzip'] - }, function (error, result, code) { - grunt.file.delete('build/xe/modules/module-krzip/.git'); - taskDone(); - }); - - // syndication - grunt.util.spawn({ - cmd: "git", - args: ['clone', 'git@github.com:xpressengine/module-syndication.git', 'build/xe/modules/syndication'] - }, function (error, result, code) { - grunt.file.delete('build/xe/modules/syndication/.git'); - taskDone(); - }); + grunt.file.delete('build/xe/modules/module-krzip/.git'); + taskDone(); }); - // changed - if(diff.length) { - var args = ['archive', '--prefix=xe/', '-o', 'build/xe.'+B+'.changed.tar.gz', B]; - args = args.concat(diff); - grunt.util.spawn({ - cmd: "git", - args: args - }, function (error, result, code) { - grunt.log.ok('Archived(changed) : ./build/xe.'+B+'.changed.tar.gz'); - taskDone(); - }); - } else { + // syndication + grunt.util.spawn({ + cmd: "git", + args: ['clone', 'git@github.com:xpressengine/module-syndication.git', 'build/xe/modules/syndication'] + }, function (error, result, code) { + grunt.file.delete('build/xe/modules/syndication/.git'); taskDone(); - } + }); }); }); }); From 71c8a0b99f947802259e2fdf40a2c20ddf9f65db Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 15 Nov 2013 12:56:29 +0900 Subject: [PATCH 039/473] =?UTF-8?q?fixed=20#50,=20file=5Fput=5Fcontents?= =?UTF-8?q?=ED=95=A8=EC=88=98=EC=97=90=20LOCK=5FEX=20flag=20=EC=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/db/DB.class.php | 4 ++-- classes/display/DisplayHandler.class.php | 2 +- classes/file/FileHandler.class.php | 2 +- .../library/HTMLPurifier/DefinitionCache/Serializer.php | 2 +- .../htmlpurifier/library/HTMLPurifier/URIScheme/data.php | 2 +- classes/validator/Validator.class.php | 2 +- config/func.inc.php | 2 +- libs/phpmailer/phpmailer.php | 2 +- modules/module/module.admin.controller.php | 2 +- modules/point/point.admin.controller.php | 2 +- tools/minify/minify.php | 6 +++--- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index dac2504f9..1db0cf0c1 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -459,7 +459,7 @@ class DB $buff[] = ''; } $buff[] = print_r($log, TRUE); - @file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND); + @file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX); } } else @@ -480,7 +480,7 @@ class DB $buff .= sprintf("%s\t%s\n\t%0.6f sec\tquery_id:%s\n\n", date("Y-m-d H:i"), $this->query, $elapsed_time, $this->query_id); - @file_put_contents($log_file, $buff, FILE_APPEND); + @file_put_contents($log_file, $buff, FILE_APPEND|LOCK_EX); } } diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 40589a843..973cbdf5b 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -297,7 +297,7 @@ class DisplayHandler extends Handler $buff = str_repeat('=', 40) . "\n" . $buff . str_repeat('-', 40); $buff = "\n\n"; - if (!@file_put_contents($debug_file, $buff, FILE_APPEND)) + if (!@file_put_contents($debug_file, $buff, FILE_APPEND|LOCK_EX)) { return; } diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 02ccff9ec..1ca76df32 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -176,7 +176,7 @@ class FileHandler $flags = 0; } - @file_put_contents($file_name, $buff, $flags); + @file_put_contents($file_name, $buff, $flags|LOCK_EX); @chmod($file_name, 0644); } diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php index 73d5e90a6..8afb3fe64 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php @@ -101,7 +101,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends * @return Number of bytes written if success, or false if failure. */ private function _write($file, $data, $config) { - $result = file_put_contents($file, $data); + $result = file_put_contents($file, $data, LOCK_EX); if ($result !== false) { // set permissions of the new file (no execute) $chmod = $config->get('Cache.SerializerPermissions'); diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php index a5c43989e..a6a9bdcdd 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php @@ -61,7 +61,7 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { // XXX probably want to refactor this into a general mechanism // for filtering arbitrary content types $file = tempnam("/tmp", ""); - file_put_contents($file, $raw_data); + file_put_contents($file, $raw_data, LOCK_EX); if (function_exists('exif_imagetype')) { $image_code = exif_imagetype($file); } elseif (function_exists('getimagesize')) { diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index d16eebb12..54aa68e08 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -682,7 +682,7 @@ class Validator return FALSE; } - @file_put_contents($filepath, $content); + @file_put_contents($filepath, $content, LOCK_EX); return $filepath; } diff --git a/config/func.inc.php b/config/func.inc.php index a3da73c79..b37a01df1 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -801,7 +801,7 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu } $debug_output = "\n\n"; - @file_put_contents($debug_file, $debug_output, FILE_APPEND); + @file_put_contents($debug_file, $debug_output, FILE_APPEND|LOCK_EX); } } diff --git a/libs/phpmailer/phpmailer.php b/libs/phpmailer/phpmailer.php index b809939dd..c36f7c9d8 100644 --- a/libs/phpmailer/phpmailer.php +++ b/libs/phpmailer/phpmailer.php @@ -1234,7 +1234,7 @@ class PHPMailer { } else if ($this->sign_key_file) { try { $file = tempnam('', 'mail'); - file_put_contents($file, $body); //TODO check this worked + file_put_contents($file, $body, LOCK_EX); //TODO check this worked $signed = tempnam("", "signed"); if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) { @unlink($file); diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 57c3222b0..55cf1b9c5 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -899,7 +899,7 @@ class moduleAdminController extends module { $str = sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes($value, "'")); } - if (!@file_put_contents(sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $langCode), $str)) + if (!@file_put_contents(sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $langCode), $str, LOCK_EX)) { return; } diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 8cef35414..c021335f3 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -287,7 +287,7 @@ class pointAdminController extends point $str .= $key.','.$val."\r\n"; } - @file_put_contents('./files/cache/pointRecal.txt', $str); + @file_put_contents('./files/cache/pointRecal.txt', $str, LOCK_EX); $this->add('total', count($member)); $this->add('position', 0); diff --git a/tools/minify/minify.php b/tools/minify/minify.php index 37204776f..6c493f5d5 100755 --- a/tools/minify/minify.php +++ b/tools/minify/minify.php @@ -86,7 +86,7 @@ function execute($dir) { $content = JSMinPlus::minify($content); } - file_put_contents($target, $copyright.$content); + file_put_contents($target, $copyright.$content, LOCK_EX); echo '.'; } @@ -107,7 +107,7 @@ function execute($dir) { $target = preg_replace('@\.css$@', '.min.css', $file); $content = file_get_contents($file); - file_put_contents($target, $copyright.$oCSSmin->run($content)); + file_put_contents($target, $copyright.$oCSSmin->run($content), LOCK_EX); echo '.'; } echo " Done\n"; @@ -167,7 +167,7 @@ function merge($files, $target, $base_dir) { if ($body) { $file_count = count($files); echo " Merging {$file_count} files to create {$target} file..."; - file_put_contents($base_dir.$target, $body); + file_put_contents($base_dir.$target, $body, LOCK_EX); echo " Done\n"; } } From 203f2e683ace36feb0b0b53ed827d9d0538ddbe3 Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 15 Nov 2013 13:36:48 +0900 Subject: [PATCH 040/473] =?UTF-8?q?fixed=20#52,=20updateDocument=EC=8B=9C?= =?UTF-8?q?=20extra=5Fvar=20=EC=B2=98=EB=A6=AC=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 151e5f24e..30afead88 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -392,7 +392,7 @@ class documentController extends document if($obj->homepage && !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage; if($obj->notify_message != 'Y') $obj->notify_message = 'N'; // Serialize the $extra_vars - $obj->extra_vars = serialize($obj->extra_vars); + if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars); // Remove the columns for automatic saving unset($obj->_saved_doc_srl); unset($obj->_saved_doc_title); From 8ea446d74b0e6bc58911837f626f3175eecfee28 Mon Sep 17 00:00:00 2001 From: ngleader Date: Fri, 15 Nov 2013 13:40:18 +0900 Subject: [PATCH 041/473] =?UTF-8?q?#51=20IP=20=EC=9D=BC=EB=B6=80=EB=A5=BC?= =?UTF-8?q?=20=EA=B0=80=EB=A6=B4=20=EB=95=8C=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/comment.item.php | 2 +- modules/document/document.item.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 99de62ea0..9a317aa09 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -229,7 +229,7 @@ class commentItem extends Object return $this->get('ipaddress'); } - return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/', '*.$2.$3.$4', $this->get('ipaddress')); + return '*' . strstr($this->get('ipaddress'), '.'); } function isExistsHomepage() diff --git a/modules/document/document.item.php b/modules/document/document.item.php index d07d6fc5e..2c5d91034 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -276,8 +276,12 @@ class documentItem extends Object function getIpAddress() { - if($this->isGranted()) return $this->get('ipaddress'); - return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress')); + if($this->isGranted()) + { + return $this->get('ipaddress'); + } + + return '*' . strstr($this->get('ipaddress'), '.'); } function isExistsHomepage() From 29a2a99ac6a5acb6a8288e556c048e142e2c4d15 Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 15 Nov 2013 13:59:03 +0900 Subject: [PATCH 042/473] =?UTF-8?q?#53=20=ED=8C=8C=EC=9D=BC=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=B7=A8=EC=95=BD=EC=A0=90=20=EB=B0=A9?= =?UTF-8?q?=EC=96=B4=20=EA=B8=B0=EB=8A=A5=20disable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/security/UploadFileFilter.class.php | 66 +++++++++++---------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/classes/security/UploadFileFilter.class.php b/classes/security/UploadFileFilter.class.php index 3f345f743..445043931 100644 --- a/classes/security/UploadFileFilter.class.php +++ b/classes/security/UploadFileFilter.class.php @@ -3,36 +3,42 @@ class UploadFileFilter { - private static $_block_list = array('exec', 'system', 'passthru', 'show_source', 'phpinfo', 'fopen', 'file_get_contents', 'file_put_contents', 'fwrite', 'proc_open', 'popen'); - - public function check($file) - { - if (!$file || !file_exists($file)) return TRUE; - return self::_check($file); - } - - private function _check($file) - { - if (!($fp = fopen($file, 'r'))) return FALSE; - $has_php_tag = FALSE; - while (!feof($fp)) - { - $content = fread($fp, 8192); - if (FALSE === $has_php_tag) $has_php_tag = strpos($content, ' Date: Fri, 15 Nov 2013 15:01:54 +0900 Subject: [PATCH 043/473] =?UTF-8?q?#41=20=EB=B9=8C=EB=93=9C=20zip=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8911b5ea6..9fc1f5797 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,6 +33,7 @@ module.exports = function(grunt) { grunt.registerTask('build', '', function(A, B) { var _only_export = false; + var tasks = ['krzip', 'syndication']; if(!A) { grunt.fail.warn('Undefined build target.'); @@ -54,7 +55,6 @@ module.exports = function(grunt) { var archive_full = build_dir + '/xe.' + version + '.tar.gz'; var archive_changed = build_dir + '/xe.' + version + '.changed.tar.gz'; var diff, target, version; - var tasks = ['krzip', 'syndication']; var taskDone = function() { tasks.pop(); @@ -70,10 +70,20 @@ module.exports = function(grunt) { }, function (error, result, code) { grunt.log.ok('Archived(full) : ' + archive_full); - grunt.file.delete('build/xe'); - grunt.file.delete('build/temp.full.tar'); + grunt.util.spawn({ + cmd: "zip", + args: ['-r', 'xe.'+version+'.zip', 'xe/'], + opts: { + cwd: 'build' + } + }, function (error, result, code) { + grunt.log.ok('Archived(full) : ' + archive_full); - grunt.log.ok('Done!'); + grunt.file.delete('build/xe'); + grunt.file.delete('build/temp.full.tar'); + + grunt.log.ok('Done!'); + }); }); } }; @@ -105,16 +115,24 @@ module.exports = function(grunt) { // changed if(diff.length) { - var args = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.tar.gz', version]; - args = args.concat(diff); + var args_tar = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.tar.gz', version] + var args_zip = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.zip', version] + args_tar = args_tar.concat(diff); + args_zip = args_zip.concat(diff); + grunt.util.spawn({ cmd: "git", - args: args + args: args_tar }, function (error, result, code) { - grunt.log.ok('Archived(changed) : ./build/xe.'+version+'.changed.tar.gz'); - taskDone(); + grunt.util.spawn({ + cmd: "git", + args: args_zip + }, function (error, result, code) { + grunt.log.ok('Archived(changed) : ./build/xe.'+version+'.changed.tar.gz'); + taskDone(); + }); }); - } else { + } else { taskDone(); } }); @@ -125,7 +143,6 @@ module.exports = function(grunt) { cmd: "tar", args: ['xf', 'build/temp.full.tar', '-C', 'build/xe'] }, function (error, result, code) { - // krzip grunt.util.spawn({ cmd: "git", From c1231b5b7168c6423c99944310ce895f2b7ed999 Mon Sep 17 00:00:00 2001 From: khongchi Date: Fri, 15 Nov 2013 15:02:14 +0900 Subject: [PATCH 044/473] version update to 1.7.4.b2 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index ae9f07ab2..7133bc383 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -29,7 +29,7 @@ define('__ZBXE__', __XE__); /** * Display XE's full version. */ -define('__XE_VERSION__', '1.7.4.b1'); +define('__XE_VERSION__', '1.7.4.b2'); /** * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. From ca8a8711ed7f9e4a6f1f55f7a842ba59c3a5faf6 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 15 Nov 2013 15:47:47 +0900 Subject: [PATCH 045/473] minify common/js/*.js --- common/js/xe.js | 958 ++++++++++++++++++++++---------------------- common/js/xe.min.js | 78 +++- 2 files changed, 560 insertions(+), 476 deletions(-) diff --git a/common/js/xe.js b/common/js/xe.js index 0589a30d7..e4cee3ba7 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -292,127 +292,130 @@ $(window).load(function(){ xe.broadcast('ONLOAD'); }); if(jQuery) jQuery.noConflict(); (function($) { - /* OS check */ - var UA = navigator.userAgent.toLowerCase(); - $.os = { - Linux: /linux/.test(UA), - Unix: /x11/.test(UA), - Mac: /mac/.test(UA), - Windows: /win/.test(UA) - }; - $.os.name = ($.os.Windows) ? 'Windows' : - ($.os.Linux) ? 'Linux' : - ($.os.Unix) ? 'Unix' : - ($.os.Mac) ? 'Mac' : ''; + /* OS check */ + var UA = navigator.userAgent.toLowerCase(); + $.os = { + Linux: /linux/.test(UA), + Unix: /x11/.test(UA), + Mac: /mac/.test(UA), + Windows: /win/.test(UA) + }; + $.os.name = ($.os.Windows) ? 'Windows' : + ($.os.Linux) ? 'Linux' : + ($.os.Unix) ? 'Unix' : + ($.os.Mac) ? 'Mac' : ''; - /** - * @brief XE 공용 유틸리티 함수 - * @namespace XE - */ - window.XE = { - loaded_popup_menus : new Array(), - addedDocument : new Array(), - /** - * @brief 특정 name을 가진 체크박스들의 checked 속성 변경 - * @param [itemName='cart',][options={}] - */ - checkboxToggleAll : function(itemName) { - if(!is_def(itemName)) itemName='cart'; - var options = { - wrap : null, - checked : 'toggle', - doClick : false - }; + /** + * @brief XE 공용 유틸리티 함수 + * @namespace XE + */ + window.XE = { + loaded_popup_menus : new Array(), + addedDocument : new Array(), + /** + * @brief 특정 name을 가진 체크박스들의 checked 속성 변경 + * @param [itemName='cart',][options={}] + */ + checkboxToggleAll : function(itemName) { + if(!is_def(itemName)) itemName='cart'; + var options = { + wrap : null, + checked : 'toggle', + doClick : false + }; - switch(arguments.length) { - case 1: - if(typeof(arguments[0]) == "string") { - itemName = arguments[0]; - } else { - $.extend(options, arguments[0] || {}); + switch(arguments.length) { + case 1: + if(typeof(arguments[0]) == "string") { + itemName = arguments[0]; + } else { + $.extend(options, arguments[0] || {}); itemName = 'cart'; - } - break; - case 2: - itemName = arguments[0]; - $.extend(options, arguments[1] || {}); - } + } + break; + case 2: + itemName = arguments[0]; + $.extend(options, arguments[1] || {}); + } - if(options.doClick == true) options.checked = null; - if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap; + if(options.doClick == true) options.checked = null; + if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap; + + if(options.wrap) { + var obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); + } else { + var obj = $('input[name='+itemName+']:checkbox'); + } - if(options.wrap) { - var obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); - } else { - var obj = $('input[name='+itemName+']:checkbox'); - } - if(options.checked == 'toggle') { - obj.each(function() { - $(this).attr('checked', ($(this).attr('checked')) ? false : true); - }); - } else { - (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked); - } - }, - - /** - * @brief 문서/회원 등 팝업 메뉴 출력 - */ - displayPopupMenu : function(ret_obj, response_tags, params) { - var target_srl = params["target_srl"]; - var menu_id = params["menu_id"]; - var menus = ret_obj['menus']; - var html = ""; + obj.each(function() { + $(this).attr('checked', ($(this).attr('checked')) ? false : true); + }); + } else { + (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked); + } + }, - if(this.loaded_popup_menus[menu_id]) { - html = this.loaded_popup_menus[menu_id]; + /** + * @brief 문서/회원 등 팝업 메뉴 출력 + */ + displayPopupMenu : function(ret_obj, response_tags, params) { + var target_srl = params["target_srl"]; + var menu_id = params["menu_id"]; + var menus = ret_obj['menus']; + var html = ""; - } else { - if(menus) { - var item = menus['item']; - if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item); - if(item.length) { - for(var i=0;i'+str+' '; - } - } - } - this.loaded_popup_menus[menu_id] = html; - } + var styleText = ""; + var click_str = ""; + /* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */ + switch(target) { + case "popup" : + click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\""; + break; + case "javascript" : + click_str = " onclick=\""+url+"; return false; \""; + url="#"; + break; + default : + click_str = ' target="_blank"'; + break; + } - /* 레이어 출력 */ - if(html) { - var area = $('#popup_menu_area').html('
      '+html+'
    '); - var areaOffset = {top:params['page_y'], left:params['page_x']}; + html += '
  6. '+str+'
    7. '; + } + } + } + this.loaded_popup_menus[menu_id] = html; + } - if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) - areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop(); - if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft()) - areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft(); + /* 레이어 출력 */ + if(html) { + var area = $('#popup_menu_area').html('
      '+html+'
    '); + var areaOffset = {top:params['page_y'], left:params['page_x']}; - area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus(); - } - } - } + if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) + areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop(); + if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft()) + areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft(); + + area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus(); + } + } + } }) (jQuery); @@ -420,65 +423,70 @@ if(jQuery) jQuery.noConflict(); /* jQuery(document).ready() */ jQuery(function($) { - /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */ - if($.browser.msie) { - $('select').each(function(i, sels) { - var disabled_exists = false; - var first_enable = new Array(); + // Anchor: focus move to target + $('a[href^="#"]').click(function(){ + $($(this).attr('href')).attr('tabindex','0').focus(); + }); - for(var j=0; j < sels.options.length; j++) { - if(sels.options[j].disabled) { - sels.options[j].style.color = '#CCCCCC'; - disabled_exists = true; - }else{ - first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j; - } - } + /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */ + if($.browser.msie) { + $('select').each(function(i, sels) { + var disabled_exists = false; + var first_enable = new Array(); - if(!disabled_exists) return; + for(var j=0; j < sels.options.length; j++) { + if(sels.options[j].disabled) { + sels.options[j].style.color = '#CCCCCC'; + disabled_exists = true; + }else{ + first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j; + } + } - sels.oldonchange = sels.onchange; - sels.onchange = function() { - if(this.options[this.selectedIndex].disabled) { + if(!disabled_exists) return; - this.selectedIndex = first_enable[i]; - /* - if(this.options.length<=1) this.selectedIndex = -1; - else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++; - else this.selectedIndex--; - */ + sels.oldonchange = sels.onchange; + sels.onchange = function() { + if(this.options[this.selectedIndex].disabled) { - } else { - if(this.oldonchange) this.oldonchange(); - } - }; + this.selectedIndex = first_enable[i]; + /* + if(this.options.length<=1) this.selectedIndex = -1; + else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++; + else this.selectedIndex--; + */ - if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange(); + } else { + if(this.oldonchange) this.oldonchange(); + } + }; - }); - } + if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange(); + + }); + } + + /* 단락에디터 fold 컴포넌트 펼치기/접기 */ + var drEditorFold = $('.xe_content .fold_button'); + if(drEditorFold.size()) { + var fold_container = $('div.fold_container', drEditorFold); + $('button.more', drEditorFold).click(function() { + $(this).hide().next('button').show().parent().next(fold_container).show(); + }); + $('button.less', drEditorFold).click(function() { + $(this).hide().prev('button').show().parent().next(fold_container).hide(); + }); + } - /* 단락에디터 fold 컴포넌트 펼치기/접기 */ - var drEditorFold = $('.xe_content .fold_button'); - if(drEditorFold.size()) { - var fold_container = $('div.fold_container', drEditorFold); - $('button.more', drEditorFold).click(function() { - $(this).hide().next('button').show().parent().next(fold_container).show(); - }); - $('button.less', drEditorFold).click(function() { - $(this).hide().prev('button').show().parent().next(fold_container).hide(); - }); - } - jQuery('input[type="submit"],button[type="submit"]').click(function(ev){ var $el = jQuery(ev.currentTarget); - + setTimeout(function(){ return function(){ $el.attr('disabled', 'disabled'); }; }(), 0); - + setTimeout(function(){ return function(){ $el.removeAttr('disabled'); @@ -500,15 +508,15 @@ var isArray = Array.isArray || function(obj){ return Object.prototype.toString.c **/ String.prototype.getQuery = function(key) { var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - if(idx == -1) return null; - var query_string = loc.substr(idx+1, this.length), args = {}; - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); + var idx = loc.indexOf('?'); + if(idx == -1) return null; + var query_string = loc.substr(idx+1, this.length), args = {}; + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); - var q = args[key]; - if(typeof(q)=='undefined') q = ''; + var q = args[key]; + if(typeof(q)=='undefined') q = ''; - return q; + return q; } /** @@ -516,18 +524,18 @@ String.prototype.getQuery = function(key) { **/ String.prototype.setQuery = function(key, val) { var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - var uri = loc.replace(/#$/, ''); + var idx = loc.indexOf('?'); + var uri = loc.replace(/#$/, ''); var act, re, v; if (typeof(val)=='undefined') val = ''; - if (idx != -1) { - var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; + if (idx != -1) { + var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; uri = loc.substr(0, idx); - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); - args[key] = val; + args[key] = val; for (var prop in args) { if (!args.hasOwnProperty(prop)) continue; @@ -537,26 +545,26 @@ String.prototype.setQuery = function(key, val) { query_string = q_list.join('&'); uri = uri+(query_string?'?'+query_string:''); - } else { - if (String(val).trim()) uri = uri+'?'+key+'='+val; - } + } else { + if (String(val).trim()) uri = uri+'?'+key+'='+val; + } re = /^https:\/\/([^:\/]+)(:\d+|)/i; - if (re.test(uri)) { - var toReplace = 'http://'+RegExp.$1; - if (window.http_port && http_port != 80) toReplace += ':' + http_port; - uri = uri.replace(re, toReplace); - } + if (re.test(uri)) { + var toReplace = 'http://'+RegExp.$1; + if (window.http_port && http_port != 80) toReplace += ':' + http_port; + uri = uri.replace(re, toReplace); + } - var bUseSSL = !!window.enforce_ssl; + var bUseSSL = !!window.enforce_ssl; if (!bUseSSL && isArray(window.ssl_actions) && (act=uri.getQuery('act'))) { - for (var i=0,c=ssl_actions.length; i < c; i++) { - if (ssl_actions[i] === act) { - bUseSSL = true; - break; - } - } - } + for (var i=0,c=ssl_actions.length; i < c; i++) { + if (ssl_actions[i] === act) { + bUseSSL = true; + break; + } + } + } re = /http:\/\/([^:\/]+)(:\d+|)/i; if (bUseSSL && re.test(uri)) { @@ -568,14 +576,14 @@ String.prototype.setQuery = function(key, val) { // insert index.php if it isn't included uri = uri.replace(/\/(index\.php)?\?/, '/index.php?'); - return encodeURI(uri); + return encodeURI(uri); } /** * @brief string prototype으로 trim 함수 추가 **/ String.prototype.trim = function() { - return this.replace(/(^\s*)|(\s*$)/g, ""); + return this.replace(/(^\s*)|(\s*$)/g, ""); } })(); @@ -584,22 +592,22 @@ String.prototype.trim = function() { * @brief xSleep(micro time) **/ function xSleep(sec) { - sec = sec / 1000; - var now = new Date(); - var sleep = new Date(); - while( sleep.getTime() - now.getTime() < sec) { - sleep = new Date(); - } + sec = sec / 1000; + var now = new Date(); + var sleep = new Date(); + while( sleep.getTime() - now.getTime() < sec) { + sleep = new Date(); + } } /** * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return **/ function isDef() { - for(var i=0; i < arguments.length; ++i) { - if(typeof(arguments[i]) == "undefined") return false; - } - return true; + for(var i=0; i < arguments.length; ++i) { + if(typeof(arguments[i]) == "undefined") return false; + } + return true; } /** @@ -608,20 +616,20 @@ function isDef() { **/ var winopen_list = new Array(); function winopen(url, target, attribute) { - if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); - try { - if(target != "_blank" && winopen_list[target]) { - winopen_list[target].close(); - winopen_list[target] = null; - } - } catch(e) { - } + if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); + try { + if(target != "_blank" && winopen_list[target]) { + winopen_list[target].close(); + winopen_list[target] = null; + } + } catch(e) { + } - if(typeof(target) == 'undefined') target = '_blank'; - if(typeof(attribute) == 'undefined') attribute = ''; - var win = window.open(url, target, attribute); - win.focus(); - if(target != "_blank") winopen_list[target] = win; + if(typeof(target) == 'undefined') target = '_blank'; + if(typeof(attribute) == 'undefined') attribute = ''; + var win = window.open(url, target, attribute); + win.focus(); + if(target != "_blank") winopen_list[target] = win; } /** @@ -629,113 +637,113 @@ function winopen(url, target, attribute) { * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용 **/ function popopen(url, target) { - if(typeof(target) == "undefined") target = "_blank"; - if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); - winopen(url, target, "width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no"); + if(typeof(target) == "undefined") target = "_blank"; + if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); + winopen(url, target, "width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no"); } /** * @brief 메일 보내기용 **/ function sendMailTo(to) { - location.href="mailto:"+to; + location.href="mailto:"+to; } /** * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움) **/ function move_url(url, open_window) { - if(!url) return false; - if(typeof(open_window) == 'undefined') open_window = 'N'; - if(open_window=='N') { - open_window = false; - } else { - open_window = true; - } + if(!url) return false; + if(typeof(open_window) == 'undefined') open_window = 'N'; + if(open_window=='N') { + open_window = false; + } else { + open_window = true; + } - if(/^\./.test(url)) url = request_uri+url; + if(/^\./.test(url)) url = request_uri+url; - if(open_window) { - winopen(url); - } else { - location.href=url; - } + if(open_window) { + winopen(url); + } else { + location.href=url; + } - return false; + return false; } /** * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용) **/ function displayMultimedia(src, width, height, options) { - var html = _displayMultimedia(src, width, height, options); - if(html) document.writeln(html); + var html = _displayMultimedia(src, width, height, options); + if(html) document.writeln(html); } function _displayMultimedia(src, width, height, options) { - if(src.indexOf('files') == 0) src = request_uri + src; + if(src.indexOf('files') == 0) src = request_uri + src; - var defaults = { - wmode : 'transparent', - allowScriptAccess : 'sameDomain', - quality : 'high', - flashvars : '', - autostart : false - }; + var defaults = { + wmode : 'transparent', + allowScriptAccess : 'sameDomain', + quality : 'high', + flashvars : '', + autostart : false + }; - var params = jQuery.extend(defaults, options || {}); + var params = jQuery.extend(defaults, options || {}); var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false'; delete(params.autostart); - var clsid = ""; - var codebase = ""; - var html = ""; + var clsid = ""; + var codebase = ""; + var html = ""; - if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ - html = ''; - } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { - html = ''; - } else if(/\.swf/i.test(src)) { - clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; + if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){ + html = ''; + } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) { + html = ''; + } else if(/\.swf/i.test(src)) { + clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; - if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } - else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } - html = ''; - html += ''; - for(var name in params) { - if(params[name] != 'undefined' && params[name] != '') { - html += ''; - } - } - html += '' - + '' - + ''; - } else { + if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } + else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; } + html = ''; + html += ''; + for(var name in params) { + if(params[name] != 'undefined' && params[name] != '') { + html += ''; + } + } + html += '' + + '' + + ''; + } else { if (jQuery.browser.mozilla || jQuery.browser.opera) { // firefox and opera uses 0 or 1 for autostart parameter. autostart = (params.autostart && params.autostart != 'false') ? '1' : '0'; } - html = ''+ - ''+ - ''+ - ''+ - '' - ).appendTo(document.body); + if(!dummy_obj.length) { + jQuery( + '
    '+ + ''+ + ''+ + ''+ + '' + ).appendTo(document.body); - dummy_obj = jQuery("#previewDocument")[0]; - } else { + dummy_obj = jQuery("#previewDocument")[0]; + } else { dummy_obj = dummy_obj[0]; } - if(dummy_obj) { - dummy_obj.content.value = content; - dummy_obj.submit(); - } + if(dummy_obj) { + dummy_obj.content.value = content; + dummy_obj.submit(); + } } /* 게시글 저장 */ function doDocumentSave(obj) { - var editor_sequence = obj.form.getAttribute('editor_sequence'); - var prev_content = editorRelKeys[editor_sequence]['content'].value; - if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { - var content = editorGetContent(editor_sequence); - editorRelKeys[editor_sequence]['content'].value = content; - } + var editor_sequence = obj.form.getAttribute('editor_sequence'); + var prev_content = editorRelKeys[editor_sequence]['content'].value; + if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { + var content = editorGetContent(editor_sequence); + editorRelKeys[editor_sequence]['content'].value = content; + } var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();; jQuery.each(data, function(i, field){ @@ -857,85 +865,85 @@ function doDocumentSave(obj) { exec_xml('document','procDocumentTempSave', params, completeDocumentSave, responses, params, obj.form); - editorRelKeys[editor_sequence]['content'].value = prev_content; - return false; + editorRelKeys[editor_sequence]['content'].value = prev_content; + return false; } function completeDocumentSave(ret_obj) { - jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']); - alert(ret_obj['message']); + jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']); + alert(ret_obj['message']); } /* 저장된 게시글 불러오기 */ var objForSavedDoc = null; function doDocumentLoad(obj) { - // 저장된 게시글 목록 불러오기 - objForSavedDoc = obj.form; - popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList')); + // 저장된 게시글 목록 불러오기 + objForSavedDoc = obj.form; + popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList')); } /* 저장된 게시글의 선택 */ function doDocumentSelect(document_srl) { - if(!opener || !opener.objForSavedDoc) { - window.close(); - return; - } + if(!opener || !opener.objForSavedDoc) { + window.close(); + return; + } - // 게시글을 가져와서 등록하기 - opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite'); - window.close(); + // 게시글을 가져와서 등록하기 + opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite'); + window.close(); } /* 스킨 정보 */ function viewSkinInfo(module, skin) { - popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo'); + popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo'); } /* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */ var addedDocument = new Array(); function doAddDocumentCart(obj) { - var srl = obj.value; - addedDocument[addedDocument.length] = srl; - setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100); + var srl = obj.value; + addedDocument[addedDocument.length] = srl; + setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100); } function callAddDocumentCart(document_length) { - if(addedDocument.length<1 || document_length != addedDocument.length) return; - var params = new Array(); - params["srls"] = addedDocument.join(","); - exec_xml("document","procDocumentAddCart", params, null); - addedDocument = new Array(); + if(addedDocument.length<1 || document_length != addedDocument.length) return; + var params = new Array(); + params["srls"] = addedDocument.join(","); + exec_xml("document","procDocumentAddCart", params, null); + addedDocument = new Array(); } /* ff의 rgb(a,b,c)를 #... 로 변경 */ function transRGB2Hex(value) { - if(!value) return value; - if(value.indexOf('#') > -1) return value.replace(/^#/, ''); + if(!value) return value; + if(value.indexOf('#') > -1) return value.replace(/^#/, ''); - if(value.toLowerCase().indexOf('rgb') < 0) return value; - value = value.replace(/^rgb\(/i, '').replace(/\)$/, ''); - value_list = value.split(','); + if(value.toLowerCase().indexOf('rgb') < 0) return value; + value = value.replace(/^rgb\(/i, '').replace(/\)$/, ''); + value_list = value.split(','); - var hex = ''; - for(var i = 0; i < value_list.length; i++) { - var color = parseInt(value_list[i], 10).toString(16); - if(color.length == 1) color = '0'+color; - hex += color; - } - return hex; + var hex = ''; + for(var i = 0; i < value_list.length; i++) { + var color = parseInt(value_list[i], 10).toString(16); + if(color.length == 1) color = '0'+color; + hex += color; + } + return hex; } /* 보안 로그인 모드로 전환 */ function toggleSecuritySignIn() { - var href = location.href; - if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http'); - else location.href = href.replace(/^http/i,'https'); + var href = location.href; + if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http'); + else location.href = href.replace(/^http/i,'https'); } function reloadDocument() { - location.reload(); + location.reload(); } @@ -948,137 +956,137 @@ function reloadDocument() { var Base64 = { - // private property - _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", + // private property + _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", - // public method for encoding - encode : function (input) { - var output = ""; - var chr1, chr2, chr3, enc1, enc2, enc3, enc4; - var i = 0; + // public method for encoding + encode : function (input) { + var output = ""; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; - input = Base64._utf8_encode(input); + input = Base64._utf8_encode(input); - while (i < input.length) { + while (i < input.length) { - chr1 = input.charCodeAt(i++); - chr2 = input.charCodeAt(i++); - chr3 = input.charCodeAt(i++); + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); - enc1 = chr1 >> 2; - enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); - enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); - enc4 = chr3 & 63; + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; - if (isNaN(chr2)) { - enc3 = enc4 = 64; - } else if (isNaN(chr3)) { - enc4 = 64; - } + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } - output = output + - this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + - this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); + output = output + + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); - } + } - return output; - }, + return output; + }, - // public method for decoding - decode : function (input) { - var output = ""; - var chr1, chr2, chr3; - var enc1, enc2, enc3, enc4; - var i = 0; + // public method for decoding + decode : function (input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - while (i < input.length) { + while (i < input.length) { - enc1 = this._keyStr.indexOf(input.charAt(i++)); - enc2 = this._keyStr.indexOf(input.charAt(i++)); - enc3 = this._keyStr.indexOf(input.charAt(i++)); - enc4 = this._keyStr.indexOf(input.charAt(i++)); + enc1 = this._keyStr.indexOf(input.charAt(i++)); + enc2 = this._keyStr.indexOf(input.charAt(i++)); + enc3 = this._keyStr.indexOf(input.charAt(i++)); + enc4 = this._keyStr.indexOf(input.charAt(i++)); - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; - output = output + String.fromCharCode(chr1); + output = output + String.fromCharCode(chr1); - if (enc3 != 64) { - output = output + String.fromCharCode(chr2); - } - if (enc4 != 64) { - output = output + String.fromCharCode(chr3); - } + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } - } + } - output = Base64._utf8_decode(output); + output = Base64._utf8_decode(output); - return output; + return output; - }, + }, - // private method for UTF-8 encoding - _utf8_encode : function (string) { - string = string.replace(/\r\n/g,"\n"); - var utftext = ""; + // private method for UTF-8 encoding + _utf8_encode : function (string) { + string = string.replace(/\r\n/g,"\n"); + var utftext = ""; - for (var n = 0; n < string.length; n++) { + for (var n = 0; n < string.length; n++) { - var c = string.charCodeAt(n); + var c = string.charCodeAt(n); - if (c < 128) { - utftext += String.fromCharCode(c); - } - else if((c > 127) && (c < 2048)) { - utftext += String.fromCharCode((c >> 6) | 192); - utftext += String.fromCharCode((c & 63) | 128); - } - else { - utftext += String.fromCharCode((c >> 12) | 224); - utftext += String.fromCharCode(((c >> 6) & 63) | 128); - utftext += String.fromCharCode((c & 63) | 128); - } + if (c < 128) { + utftext += String.fromCharCode(c); + } + else if((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } + else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } - } + } - return utftext; - }, + return utftext; + }, - // private method for UTF-8 decoding - _utf8_decode : function (utftext) { - var string = ""; - var i = 0; - var c = c1 = c2 = 0; + // private method for UTF-8 decoding + _utf8_decode : function (utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; - while ( i < utftext.length ) { + while ( i < utftext.length ) { - c = utftext.charCodeAt(i); + c = utftext.charCodeAt(i); - if (c < 128) { - string += String.fromCharCode(c); - i++; - } - else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); - i += 2; - } - else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); - i += 3; - } + if (c < 128) { + string += String.fromCharCode(c); + i++; + } + else if((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i+1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } + else { + c2 = utftext.charCodeAt(i+1); + c3 = utftext.charCodeAt(i+2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } - } + } - return string; - } + return string; + } } @@ -1093,11 +1101,11 @@ var Base64 = { * ------------------------------------------- */ if(typeof(resizeImageContents) == 'undefined') { - function resizeImageContents() {} + function resizeImageContents() {} } if(typeof(activateOptionDisabled) == 'undefined') { - function activateOptionDisabled() {} + function activateOptionDisabled() {} } objectExtend = jQuery.extend; @@ -1106,57 +1114,57 @@ objectExtend = jQuery.extend; * @brief 특정 Element의 display 옵션 토글 **/ function toggleDisplay(objId) { - jQuery('#'+objId).toggle(); + jQuery('#'+objId).toggle(); } /** * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음) **/ function svc_folder_open(id) { - jQuery("#_folder_open_"+id).hide(); - jQuery("#_folder_close_"+id).show(); - jQuery("#_folder_"+id).show(); + jQuery("#_folder_open_"+id).hide(); + jQuery("#_folder_close_"+id).show(); + jQuery("#_folder_"+id).show(); } function svc_folder_close(id) { - jQuery("#_folder_open_"+id).show(); - jQuery("#_folder_close_"+id).hide(); - jQuery("#_folder_"+id).hide(); + jQuery("#_folder_open_"+id).show(); + jQuery("#_folder_close_"+id).hide(); + jQuery("#_folder_"+id).hide(); } /** * @brief 날짜 선택 (달력 열기) **/ function open_calendar(fo_id, day_str, callback_func) { - if(typeof(day_str)=="undefined") day_str = ""; + if(typeof(day_str)=="undefined") day_str = ""; - var url = "./common/tpl/calendar.php?"; - if(fo_id) url+="fo_id="+fo_id; - if(day_str) url+="&day_str="+day_str; - if(callback_func) url+="&callback_func="+callback_func; + var url = "./common/tpl/calendar.php?"; + if(fo_id) url+="fo_id="+fo_id; + if(day_str) url+="&day_str="+day_str; + if(callback_func) url+="&callback_func="+callback_func; - popopen(url, 'Calendar'); + popopen(url, 'Calendar'); } var loaded_popup_menus = XE.loaded_popup_menus; function createPopupMenu() {} function chkPopupMenu() {} function displayPopupMenu(ret_obj, response_tags, params) { - XE.displayPopupMenu(ret_obj, response_tags, params); + XE.displayPopupMenu(ret_obj, response_tags, params); } function GetObjLeft(obj) { - return jQuery(obj).offset().left; + return jQuery(obj).offset().left; } function GetObjTop(obj) { - return jQuery(obj).offset().top; + return jQuery(obj).offset().top; } function replaceOuterHTML(obj, html) { - jQuery(obj).replaceWith(html); + jQuery(obj).replaceWith(html); } function getOuterHTML(obj) { - return jQuery(obj).html().trim(); + return jQuery(obj).html().trim(); } function setCookie(name, value, expire, path) { @@ -1197,7 +1205,7 @@ jQuery(function($){ if(!$target.length) $target = $(evt.target).closest('a,div,span'); if(!$target.length) return; - // 객체의 className값을 구함 + // 객체의 className값을 구함 var cls = $target.attr('class'), match; if(cls) match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9]\\d*))(?: |$)','')); if(!match) return; @@ -1223,8 +1231,8 @@ jQuery(function($){ show_waiting_message = false; exec_xml('member', action, params, XE.displayPopupMenu, response_tags, params); - show_waiting_message = true; - }); + show_waiting_message = true; + }); /** * Create popup windows automatically. diff --git a/common/js/xe.min.js b/common/js/xe.min.js index 315d4dcfc..125eb87e0 100644 --- a/common/js/xe.min.js +++ b/common/js/xe.min.js @@ -1 +1,77 @@ -(function(g){var c,a,d;var e=[];c={getName:function(){return"Core"},createApp:function(j,h){var i=b();g.extend(i.prototype,a,h);i.prototype.getName=function(){return j};return i},createPlugin:function(j,h){var i=b();g.extend(i.prototype,d,h);i.prototype.getName=function(){return j};return i},getApps:function(){return g.makeArray(e)},getApp:function(h){h=(h||"").toLowerCase();if(typeof e[h]!="undefined"){return e[h]}else{return null}},registerApp:function(h){var i=h.getName().toLowerCase();e.push(h);if(!g.isArray(e[i])){e[i]=[]}e[i].push(h);h.parent=this;if(g.isFunction(h.activate)){h.activate()}},unregisterApp:function(i){var j=i.getName().toLowerCase();var h=g.inArray(i,e);if(h>=0){e=e.splice(h,1)}if(g.isArray(e[j])){h=g.inArray(i,e[j]);if(h>=0){e[j]=e[j].splice(h,1)}}if(g.isFunction(i.deactivate)){i.deactivate()}},broadcast:function(i,h){this._broadcast(this,i,h)},_broadcast:function(j,l,k){for(var h=0;h=0){return false}this._plugins.push(j);if(!g.isArray(this._plugins[i])){this._plugins[i]=[]}this._plugins[i].push(j);g.each(j._binded_fn,function(l,k){h.registerHandler(l,k)});j.oApp=this;if(g.isFunction(j.activate)){j.activate()}return true},registerHandler:function(h,i){var j=this._messages;h=h.toUpperCase();if(!g.isArray(j[h])){j[h]=[]}j[h].push(i)},cast:function(i,h){return this._cast(this,i,h||[])},broadcast:function(h,j,i){if(this.parent&&this.parent._broadcast){this.parent._broadcast(h,j,i)}},_cast:function(k,h,j){var l,m;var q=this._messages;h=h.toUpperCase();if(q["BEFORE_"+h]||this["API_BEFORE_"+h]){var n=this._cast(k,"BEFORE_"+h,j);if(!n){return}}var p=[],o="API_"+h;if(g.isArray(q[h])){for(l=0;l"+q+" "}}}this.loaded_popup_menus[s]=o}if(o){var g=b("#popup_menu_area").html("
      "+o+"
    ");var h={top:j.page_y,left:j.page_x};if(g.outerHeight()+h.top>b(window).height()+b(window).scrollTop()){h.top=b(window).height()-g.outerHeight()+b(window).scrollTop()}if(g.outerWidth()+h.left>b(window).width()+b(window).scrollLeft()){h.left=b(window).width()-g.outerWidth()+b(window).scrollLeft()}g.css({top:h.top,left:h.left}).show().focus()}}}})(jQuery);jQuery(function(c){if(c.browser.msie){c("select").each(function(h,d){var g=false;var k=new Array();for(var e=0;e-1)?k[h]:e}}if(!g){return}d.oldonchange=d.onchange;d.onchange=function(){if(this.options[this.selectedIndex].disabled){this.selectedIndex=k[h]}else{if(this.oldonchange){this.oldonchange()}}};if(d.selectedIndex>=0&&d.options[d.selectedIndex].disabled){d.onchange()}})}var a=c(".xe_content .fold_button");if(a.size()){var b=c("div.fold_container",a);c("button.more",a).click(function(){c(this).hide().next("button").show().parent().next(b).show()});c("button.less",a).click(function(){c(this).hide().prev("button").show().parent().next(b).hide()})}jQuery('input[type="submit"],button[type="submit"]').click(function(e){var d=jQuery(e.currentTarget);setTimeout(function(){return function(){d.attr("disabled","disabled")}}(),0);setTimeout(function(){return function(){d.removeAttr("disabled")}}(),3000)})});(function(){function a(d,c){return(d.replace(/#.*$/,"")===c.replace(/#.*$/,""))}var b=Array.isArray||function(c){return Object.prototype.toString.call(c)=="[object Array]"};String.prototype.getQuery=function(e){var i=a(this,window.location.href)?current_url:this;var c=i.indexOf("?");if(c==-1){return null}var h=i.substr(c+1,this.length),d={};h.replace(/([^=]+)=([^&]*)(&|$)/g,function(){d[arguments[1]]=arguments[2]});var g=d[e];if(typeof(g)=="undefined"){g=""}return g};String.prototype.setQuery=function(q,e){var k=a(this,window.location.href)?current_url:this;var p=k.indexOf("?");var g=k.replace(/#$/,"");var l,s,r;if(typeof(e)=="undefined"){e=""}if(p!=-1){var j=g.substr(p+1,k.length),m={},u=[];g=k.substr(0,p);j.replace(/([^=]+)=([^&]*)(&|$)/g,function(i,c,v){m[c]=v});m[q]=e;for(var d in m){if(!m.hasOwnProperty(d)){continue}if(!(r=String(m[d]).trim())){continue}u.push(d+"="+decodeURI(r))}j=u.join("&");g=g+(j?"?"+j:"")}else{if(String(e).trim()){g=g+"?"+q+"="+e}}s=/^https:\/\/([^:\/]+)(:\d+|)/i;if(s.test(g)){var t="http://"+RegExp.$1;if(window.http_port&&http_port!=80){t+=":"+http_port}g=g.replace(s,t)}var o=!!window.enforce_ssl;if(!o&&b(window.ssl_actions)&&(l=g.getQuery("act"))){for(var h=0,n=ssl_actions.length;h-1&&!a.getQuery("vid")){a=a.setQuery("vid",xeVid)}try{if(g!="_blank"&&winopen_list[g]){winopen_list[g].close();winopen_list[g]=null}}catch(d){}if(typeof(g)=="undefined"){g="_blank"}if(typeof(b)=="undefined"){b=""}var c=window.open(a,g,b);c.focus();if(g!="_blank"){winopen_list[g]=c}}function popopen(a,b){if(typeof(b)=="undefined"){b="_blank"}if(typeof(xeVid)!="undefined"&&a.indexOf(request_uri)>-1&&!a.getQuery("vid")){a=a.setQuery("vid",xeVid)}winopen(a,b,"width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no")}function sendMailTo(a){location.href="mailto:"+a}function move_url(a,b){if(!a){return false}if(typeof(b)=="undefined"){b="N"}if(b=="N"){b=false}else{b=true}if(/^\./.test(a)){a=request_uri+a}if(b){winopen(a)}else{location.href=a}return false}function displayMultimedia(e,d,a,b){var c=_displayMultimedia(e,d,a,b);if(c){document.writeln(c)}}function _displayMultimedia(a,c,j,l){if(a.indexOf("files")==0){a=request_uri+a}var e={wmode:"transparent",allowScriptAccess:"sameDomain",quality:"high",flashvars:"",autostart:false};var d=jQuery.extend(e,l||{});var k=(d.autostart&&d.autostart!="false")?"true":"false";delete (d.autostart);var g="";var h="";var i="";if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(a)){i=''}else{if(/\.flv$/i.test(a)||/\.mov$/i.test(a)||/\.moov$/i.test(a)||/\.m4v$/i.test(a)){i=''}else{if(/\.swf/i.test(a)){g="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";if(typeof(enforce_ssl)!="undefined"&&enforce_ssl){h="https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"}else{h="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"}i='';i+='';for(var b in d){if(d[b]!="undefined"&&d[b]!=""){i+=''}}i+=''}else{if(jQuery.browser.mozilla||jQuery.browser.opera){k=(d.autostart&&d.autostart!="false")?"1":"0"}i='.popup"),a,d,c,e,i;i=b.css({overflow:"scroll"}).offset();a=b.width(10).height(10000).get(0).scrollWidth+i.left*2;d=b.height(10).width(10000).get(0).scrollHeight+i.top*2;if(a<800){a=800+i.left*2}c=j.width();e=j.height();if(a!=c){window.resizeBy(a-c,0)}if(d!=e){window.resizeBy(0,d-e)}b.width(a-i.left*2).css({overflow:"",height:""})}function doCallModuleAction(a,c,b){var d={target_srl:b,cur_mid:current_mid,mid:current_mid};exec_xml(a,c,d,completeCallModuleAction)}function completeCallModuleAction(a,b){if(a.message!="success"){alert(a.message)}location.reload()}function completeMessage(a){alert(a.message);location.reload()}function doChangeLangType(a){if(typeof(a)=="string"){setLangType(a)}else{var b=a.options[a.selectedIndex].value;setLangType(b)}location.href=location.href.setQuery("l","")}function setLangType(b){var a=new Date();a.setTime(a.getTime()+(7000*24*3600000));setCookie("lang_type",b,a,"/")}function doDocumentPreview(e){var a=e;while(a.nodeName!="FORM"){a=a.parentNode}if(a.nodeName!="FORM"){return}var b=a.getAttribute("editor_sequence");var c=editorGetContent(b);var d=window.open("","previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");var g=jQuery("#previewDocument");if(!g.length){jQuery('
    ').appendTo(document.body);g=jQuery("#previewDocument")[0]}else{g=g[0]}if(g){g.content.value=c;g.submit()}}function doDocumentSave(g){var b=g.form.getAttribute("editor_sequence");var i=editorRelKeys[b]["content"].value;if(typeof(b)!="undefined"&&b&&typeof(editorRelKeys)!="undefined"&&typeof(editorGetContent)=="function"){var c=editorGetContent(b);editorRelKeys[b]["content"].value=c}var h={},e=["error","message","document_srl"],a=g.form.elements,d=jQuery(g.form).serializeArray();jQuery.each(d,function(j,k){var l=jQuery.trim(k.value);if(!l){return true}if(/\[\]$/.test(k.name)){k.name=k.name.replace(/\[\]$/,"")}if(h[k.name]){h[k.name]+="|@|"+l}else{h[k.name]=k.value}});exec_xml("document","procDocumentTempSave",h,completeDocumentSave,e,h,g.form);editorRelKeys[b]["content"].value=i;return false}function completeDocumentSave(a){jQuery("input[name=document_srl]").eq(0).val(a.document_srl);alert(a.message)}var objForSavedDoc=null;function doDocumentLoad(a){objForSavedDoc=a.form;popopen(request_uri.setQuery("module","document").setQuery("act","dispTempSavedList"))}function doDocumentSelect(a){if(!opener||!opener.objForSavedDoc){window.close();return}opener.location.href=opener.current_url.setQuery("document_srl",a).setQuery("act","dispBoardWrite");window.close()}function viewSkinInfo(a,b){popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+a+"&skin="+b,"SkinInfo")}var addedDocument=new Array();function doAddDocumentCart(b){var a=b.value;addedDocument[addedDocument.length]=a;setTimeout(function(){callAddDocumentCart(addedDocument.length)},100)}function callAddDocumentCart(a){if(addedDocument.length<1||a!=addedDocument.length){return}var b=new Array();b.srls=addedDocument.join(",");exec_xml("document","procDocumentAddCart",b,null);addedDocument=new Array()}function transRGB2Hex(d){if(!d){return d}if(d.indexOf("#")>-1){return d.replace(/^#/,"")}if(d.toLowerCase().indexOf("rgb")<0){return d}d=d.replace(/^rgb\(/i,"").replace(/\)$/,"");value_list=d.split(",");var c="";for(var b=0;b>2;h=((l&3)<<4)|(j>>4);e=((j&15)<<2)|(g>>6);d=g&63;if(isNaN(j)){e=d=64}else{if(isNaN(g)){d=64}}a=a+this._keyStr.charAt(k)+this._keyStr.charAt(h)+this._keyStr.charAt(e)+this._keyStr.charAt(d)}return a},decode:function(c){var a="";var l,j,g;var k,h,e,d;var b=0;c=c.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(b>4);j=((h&15)<<4)|(e>>2);g=((e&3)<<6)|d;a=a+String.fromCharCode(l);if(e!=64){a=a+String.fromCharCode(j)}if(d!=64){a=a+String.fromCharCode(g)}}a=Base64._utf8_decode(a);return a},_utf8_encode:function(b){b=b.replace(/\r\n/g,"\n");var a="";for(var e=0;e127)&&(d<2048)){a+=String.fromCharCode((d>>6)|192);a+=String.fromCharCode((d&63)|128)}else{a+=String.fromCharCode((d>>12)|224);a+=String.fromCharCode(((d>>6)&63)|128);a+=String.fromCharCode((d&63)|128)}}}return a},_utf8_decode:function(a){var b="";var d=0;var e=c1=c2=0;while(d191)&&(e<224)){c2=a.charCodeAt(d+1);b+=String.fromCharCode(((e&31)<<6)|(c2&63));d+=2}else{c2=a.charCodeAt(d+1);c3=a.charCodeAt(d+2);b+=String.fromCharCode(((e&15)<<12)|((c2&63)<<6)|(c3&63));d+=3}}}return b}};if(typeof(resizeImageContents)=="undefined"){function resizeImageContents(){}}if(typeof(activateOptionDisabled)=="undefined"){function activateOptionDisabled(){}}objectExtend=jQuery.extend;function toggleDisplay(a){jQuery("#"+a).toggle()}function svc_folder_open(a){jQuery("#_folder_open_"+a).hide();jQuery("#_folder_close_"+a).show();jQuery("#_folder_"+a).show()}function svc_folder_close(a){jQuery("#_folder_open_"+a).show();jQuery("#_folder_close_"+a).hide();jQuery("#_folder_"+a).hide()}function open_calendar(c,d,b){if(typeof(d)=="undefined"){d=""}var a="./common/tpl/calendar.php?";if(c){a+="fo_id="+c}if(d){a+="&day_str="+d}if(b){a+="&callback_func="+b}popopen(a,"Calendar")}var loaded_popup_menus=XE.loaded_popup_menus;function createPopupMenu(){}function chkPopupMenu(){}function displayPopupMenu(a,b,c){XE.displayPopupMenu(a,b,c)}function GetObjLeft(a){return jQuery(a).offset().left}function GetObjTop(a){return jQuery(a).offset().top}function replaceOuterHTML(b,a){jQuery(b).replaceWith(a)}function getOuterHTML(a){return jQuery(a).html().trim()}function setCookie(b,c,a,e){var d=b+"="+escape(c)+((!a)?"":("; expires="+a.toGMTString()))+"; path="+((!e)?"/":e);document.cookie=d}function getCookie(b){var a=document.cookie.match(new RegExp(b+"=(.*?)(?:;|$)"));if(a){return unescape(a[1])}}function is_def(a){return(typeof(a)!="undefined")}function ucfirst(a){return a.charAt(0).toUpperCase()+a.slice(1)}function get_by_id(a){return document.getElementById(a)}jQuery(function(a){a(document).click(function(d){var e=a("#popup_menu_area");if(!e.length){e=a('
 - + - + \s*$/g, + + // We have to close these tags to support XHTML (#13200) + wrapMap = { + option: [ 1, "" ], + legend: [ 1, "
", "
" ], + area: [ 1, "", "" ], + param: [ 1, "", "" ], + thead: [ 1, "
Total: {number_format($total_count)}, Page: {number_format($page)}/{number_format($total_page)}
{htmlspecialchars($val->source_filename)}{htmlspecialchars($val->source_filename)} {FileHandler::filesize($val->file_size)} {$val->download_count} From 45528de09734b3d83470cbe90c589a6277518c39 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 16 Nov 2013 17:19:03 +0900 Subject: [PATCH 055/473] =?UTF-8?q?#60=20common/css/*.css=20coding=20style?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/mobile.css | 39 ++++- common/css/xe.css | 331 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 322 insertions(+), 48 deletions(-) diff --git a/common/css/mobile.css b/common/css/mobile.css index 90fe6178c..64f739182 100644 --- a/common/css/mobile.css +++ b/common/css/mobile.css @@ -1,8 +1,35 @@ @CHARSET "UTF-8"; + /* Message */ -.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)} -body>.message{margin:1em} -.message p{margin:1em 0 !important} -.message.info{border-color:#BCE8F1;background-color:#D9EDF7;color:#3A87AD} -.message.error{border-color:#EED3D7;background-color:#F2DEDE;color:#B94A48} -.message.update{border-color:#D6E9C6;background-color:#DFF0D8;color:#468847} \ No newline at end of file +.message { + position: relative; + border: 1px solid #ddd; + background-color: #f8f8f8; + margin: 1em 0; + padding: 0 1em; + border-radius: 4px; + line-height: 1.4; + font-size: 13px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +body>.message { + margin: 1em; +} +.message p { + margin: 1em 0 !important; +} +.message.info { + border-color: #BCE8F1; + background-color: #D9EDF7; + color: #3A87AD; +} +.message.error { + border-color: #EED3D7; + background-color: #F2DEDE; + color: #B94A48; +} +.message.update { + border-color: #D6E9C6; + background-color: #DFF0D8; + color: #468847; +} diff --git a/common/css/xe.css b/common/css/xe.css index e7255c80f..b485aac78 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,63 +1,310 @@ @charset "utf-8"; -/* Copyright (C) NAVER */ + +/* Copyright (C) NAVER */ /* NAVER (developers@xpressengine.com) */ /* Element Reset */ -body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px} -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block} -body{position:relative;word-wrap:break-word} -a img{border:0} -[hidden]{display:none} -.xe_content img{max-width:100%;height:auto} -@media \0screen{img{max-width:none}} +body, +table, +input, +textarea, +select, +button { + font-family: Tahoma,Geneva,sans-serif; + font-size: 12px; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} +body { + position: relative; + word-wrap: break-word; +} +a img { + border: 0; +} +[hidden] { + display: none; +} +.xe_content img { + max-width: 100%; + height: auto; +} +@media \0screen { + img { + max-width: none; + }; +} + /* Popup Menu Area */ -#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;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;line-height:1.25} -#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px} +#popup_menu_area { + position: absolute; + background: #fff; + border: 1px solid #e9e9e9; + border-radius: 3px; + margin: 10px 0; + padding: 10px; + font-size: 12px; + box-shadow: 0 0 6px #666; + 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; + line-height: 1.25; +} +#popup_menu_area a { + display: block; + text-decoration: none; + color: #333; + border-radius: 2px; + padding: 1px 3px; +} #popup_menu_area a:hover, #popup_menu_area a:active, -#popup_menu_area a:focus{background:#666;color:#fff} +#popup_menu_area a:focus { + background: #666; + color: #fff; +} + /* Message */ -.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)} -body>.message{margin:1em} -.message p{margin:1em 0 !important} -.message.info{border-color:#BCE8F1;background-color:#D9EDF7;color:#3A87AD} -.message.error{border-color:#EED3D7;background-color:#F2DEDE;color:#B94A48} -.message.update{border-color:#D6E9C6;background-color:#DFF0D8;color:#468847} +.message { + position: relative; + border: 1px solid #ddd; + background-color: #f8f8f8; + margin: 1em 0; + padding: 0 1em; + border-radius: 4px; + line-height: 1.4; + font-size: 13px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +body>.message { + margin: 1em; +} +.message p { + margin: 1em 0 !important; +} +.message.info { + border-color: #BCE8F1; + background-color: #D9EDF7; + color: #3A87AD; +} +.message.error { + border-color: #EED3D7; + background-color: #F2DEDE; + color: #B94A48; +} +.message.update { + border-color: #D6E9C6; + background-color: #DFF0D8; + color: #468847; +} + /* Waiting for server response */ -.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 15px;text-align:center;margin:0;padding:20px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif;box-shadow:0 0 5px #000;border-bottom:1px solid #ccc} +.wfsr { + display: none; + position: absolute; + position: fixed; + left: 0; + top: 0; + right: 0; + z-index: 100; + color: #fff; + background: #333 url("../../common/img/msg.loading.gif") no-repeat center 15px; + text-align: center; + margin: 0; + padding: 20px 0 0 0; + opacity: .8; + filter: alpha(opacity=80); + font: bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif; + box-shadow: 0 0 5px #000; + border-bottom: 1px solid #ccc; +} /* Admin Bar */ -#adminBar{position:fixed;top:0;left:0;right:0;height:28px;background:#666;width:100%;z-index:9999;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden;border-top:1px solid #eee;border-bottom:1px solid #eee;box-shadow:0 0 5px #333} -#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1} -#adminBar img{vertical-align:top} -#adminBar>p{margin:0} -#adminBar>.admin{float:left} -#adminBar>.link{float:right;padding:0 10px 0 0} -#adminBar a{color:#fff;text-decoration:none} +#adminBar { + position: fixed; + top: 0; + left: 0; + right: 0; + height: 28px; + background: #666; + width: 100%; + z-index: 9999; + color: #fff; + font: 12px/28px Arial,Helvetica,sans-serif; + padding: 0; + overflow: hidden; + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; + box-shadow: 0 0 5px #333; +} +#adminBar>h1 { + margin: 0 10px 0 0; + padding: 6px 0 0 10px; + float: left; + font-size: 12px; + line-height: 1; +} +#adminBar img { + vertical-align: top; +} +#adminBar>p { + margin: 0; +} +#adminBar>.admin { + float: left; +} +#adminBar>.link { + float: right; + padding: 0 10px 0 0; +} +#adminBar a { + color: #fff; + text-decoration: none; +} #adminBar a:hover, #adminBar a:active, -#adminBar a:focus{text-decoration:underline} +#adminBar a:focus { + text-decoration: underline; +} + /* Button */ -.btnArea{padding:0;margin:10px 0;text-align:right;zoom:1;clear:both} -.btnArea:after{content:"";display:block;clear:both} -.btn{text-decoration:none !important;display:inline-block;*display:inline;*zoom:1;padding:0 12px !important;margin:0;line-height:24px !important;height:24px !important;font-family:inherit;font-size:12px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:top;cursor:pointer;overflow:visible;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border:1px solid #bbbbbb;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#a2a2a2;border-radius:2px;box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)} +.btnArea { + padding: 0; + margin: 10px 0; + text-align: right; + zoom: 1; + clear: both; +} +.btnArea:after { + content: ""; + display: block; + clear: both; +} +.btn { + text-decoration: none !important; + display: inline-block; + *display: inline; + *zoom: 1; + padding: 0 12px !important; + margin: 0; + line-height: 24px !important; + height: 24px !important; + font-family: inherit; + font-size: 12px; + color: #333333; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: top; + cursor: pointer; + overflow: visible; + background-color: #f5f5f5; + *background-color: #e6e6e6; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(top, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + filter: progid: DXImageTransform.Microsoft.gradient(enabled=false); + border: 1px solid #bbbbbb; + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-bottom-color: #a2a2a2; + border-radius: 2px; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} input.btn, -button.btn{height:26px !important} +button.btn { + height: 26px !important; +} .btn:hover, .btn:active, -.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9} +.btn[disabled] { + color: #333333; + background-color: #e6e6e6; + *background-color: #d9d9d9; +} .btn>a, .btn>button, .btn>input, -.btn>span{display:inline-block;*zoom:1;margin:0 -12px !important;padding:0 12px !important;text-decoration:none !important;width:auto;font-family:inherit;line-height:24px;height:24px;border:0;background:none;color:#333;font-size:12px;vertical-align:top;overflow:visible;cursor:pointer} -.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1} -.btn-group:first-child{*margin-left:0} -.btn-group+.btn-group{margin-left:5px} -.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} -.btn-group>.btn+.btn{margin-left:-1px} -.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px} -.btn-group>.btn:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px} +.btn>span { + display: inline-block; + *zoom: 1; + margin: 0 -12px !important; + padding: 0 12px !important; + text-decoration: none !important; + width: auto; + font-family: inherit; + line-height: 24px; + height: 24px; + border: 0; + background: none; + color: #333; + font-size: 12px; + vertical-align: top; + overflow: visible; + cursor: pointer; +} +.btn-group { + position: relative; + display: inline-block; + *display: inline; + *margin-left: .3em; + font-size: 0; + white-space: nowrap; + vertical-align: middle; + *zoom: 1; +} +.btn-group:first-child { + *margin-left: 0; +} +.btn-group+.btn-group { + margin-left: 5px; +} +.btn-group>.btn { + position: relative; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group>.btn+.btn { + margin-left: -1px; +} +.btn-group>.btn:first-child { + margin-left: 0; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-topleft: 4px; +} +.btn-group>.btn: last-child { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; +} .btn-group>.btn:hover, .btn-group>.btn:focus, .btn-group>.btn:active, -.btn-group>.btn.active{z-index:2} +.btn-group>.btn.active { + z-index: 2; +} From c8e2c210d1a5cc3dc09fcbdb5f6b27a277d1f6af Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 16 Nov 2013 17:28:45 +0900 Subject: [PATCH 056/473] =?UTF-8?q?#60=20property=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/mobile.css | 14 ++--- common/css/xe.css | 119 +++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/common/css/mobile.css b/common/css/mobile.css index 64f739182..ba5342189 100644 --- a/common/css/mobile.css +++ b/common/css/mobile.css @@ -1,16 +1,18 @@ -@CHARSET "UTF-8"; +@charset "utf-8"; +/* Copyright (C) NAVER */ +/* NAVER (developers@xpressengine.com) */ /* Message */ .message { position: relative; - border: 1px solid #ddd; - background-color: #f8f8f8; margin: 1em 0; padding: 0 1em; + border: 1px solid #ddd; border-radius: 4px; line-height: 1.4; font-size: 13px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #f8f8f8; } body>.message { margin: 1em; @@ -20,16 +22,16 @@ body>.message { } .message.info { border-color: #BCE8F1; - background-color: #D9EDF7; color: #3A87AD; + background-color: #D9EDF7; } .message.error { border-color: #EED3D7; - background-color: #F2DEDE; color: #B94A48; + background-color: #F2DEDE; } .message.update { border-color: #D6E9C6; - background-color: #DFF0D8; color: #468847; + background-color: #DFF0D8; } diff --git a/common/css/xe.css b/common/css/xe.css index b485aac78..21f425b55 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,7 +1,7 @@ @charset "utf-8"; - -/* Copyright (C) NAVER */ +/* Copyright (C) NAVER */ /* NAVER (developers@xpressengine.com) */ + /* Element Reset */ body, table, @@ -9,7 +9,7 @@ input, textarea, select, button { - font-family: Tahoma,Geneva,sans-serif; + font-family: Tahoma, Geneva, sans-serif; font-size: 12px; } article, @@ -41,25 +41,25 @@ a img { @media \0screen { img { max-width: none; - }; + } } /* Popup Menu Area */ #popup_menu_area { position: absolute; - background: #fff; - border: 1px solid #e9e9e9; - border-radius: 3px; margin: 10px 0; padding: 10px; + border: 1px solid #e9e9e9; + border-radius: 3px; font-size: 12px; box-shadow: 0 0 6px #666; filter: progid: DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5); + background: #fff; } #popup_menu_area ul { - list-style: none; margin: 0; padding: 0; + list-style: none; } #popup_menu_area li { margin: 0; @@ -68,29 +68,29 @@ a img { } #popup_menu_area a { display: block; + padding: 1px 3px; + border-radius: 2px; text-decoration: none; color: #333; - border-radius: 2px; - padding: 1px 3px; } #popup_menu_area a:hover, #popup_menu_area a:active, #popup_menu_area a:focus { - background: #666; color: #fff; + background: #666; } /* Message */ .message { position: relative; - border: 1px solid #ddd; - background-color: #f8f8f8; margin: 1em 0; padding: 0 1em; + border: 1px solid #ddd; border-radius: 4px; line-height: 1.4; font-size: 13px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #f8f8f8; } body>.message { margin: 1em; @@ -100,64 +100,63 @@ body>.message { } .message.info { border-color: #BCE8F1; - background-color: #D9EDF7; color: #3A87AD; + background-color: #D9EDF7; } .message.error { border-color: #EED3D7; - background-color: #F2DEDE; color: #B94A48; + background-color: #F2DEDE; } .message.update { border-color: #D6E9C6; - background-color: #DFF0D8; color: #468847; + background-color: #DFF0D8; } /* Waiting for server response */ .wfsr { + z-index: 100; display: none; - position: absolute; position: fixed; left: 0; top: 0; right: 0; - z-index: 100; - color: #fff; - background: #333 url("../../common/img/msg.loading.gif") no-repeat center 15px; - text-align: center; margin: 0; padding: 20px 0 0 0; + border-bottom: 1px solid #ccc; + text-align: center; + font: bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif; + color: #fff; opacity: .8; filter: alpha(opacity=80); - font: bold 16px/60px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif; box-shadow: 0 0 5px #000; - border-bottom: 1px solid #ccc; + background: #333 url("../../common/img/msg.loading.gif") no-repeat center 15px; } /* Admin Bar */ #adminBar { + z-index: 9999; position: fixed; top: 0; left: 0; right: 0; - height: 28px; - background: #666; - width: 100%; - z-index: 9999; - color: #fff; - font: 12px/28px Arial,Helvetica,sans-serif; padding: 0; - overflow: hidden; + width: 100%; + height: 28px; border-top: 1px solid #eee; border-bottom: 1px solid #eee; + font: 12px/28px Arial, Helvetica, sans-serif; + color: #fff; + overflow: hidden; box-shadow: 0 0 5px #333; + background: #666; } #adminBar>h1 { + float: left; margin: 0 10px 0 0; padding: 6px 0 0 10px; - float: left; - font-size: 12px; line-height: 1; + font-size: 12px; } #adminBar img { vertical-align: top; @@ -173,8 +172,8 @@ body>.message { padding: 0 10px 0 0; } #adminBar a { - color: #fff; text-decoration: none; + color: #fff; } #adminBar a:hover, #adminBar a:active, @@ -184,34 +183,40 @@ body>.message { /* Button */ .btnArea { - padding: 0; + clear: both; margin: 10px 0; + padding: 0; text-align: right; zoom: 1; - clear: both; } .btnArea:after { - content: ""; - display: block; clear: both; + display: block; + content: ""; } .btn { - text-decoration: none !important; display: inline-block; *display: inline; - *zoom: 1; - padding: 0 12px !important; margin: 0; - line-height: 24px !important; + padding: 0 12px !important; height: 24px !important; - font-family: inherit; - font-size: 12px; - color: #333333; + overflow: visible; + border: 1px solid #bbbbbb; + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-bottom-color: #a2a2a2; + border-radius: 2px; + text-decoration: none !important; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: top; + line-height: 24px !important; + font-family: inherit; + font-size: 12px; + color: #333333; + *zoom: 1; cursor: pointer; - overflow: visible; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #f5f5f5; *background-color: #e6e6e6; background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); @@ -221,12 +226,6 @@ body>.message { background-repeat: repeat-x; filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); filter: progid: DXImageTransform.Microsoft.gradient(enabled=false); - border: 1px solid #bbbbbb; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - border-radius: 2px; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } input.btn, button.btn { @@ -235,7 +234,7 @@ button.btn { .btn:hover, .btn:active, .btn[disabled] { - color: #333333; + color: #333; background-color: #e6e6e6; *background-color: #d9d9d9; } @@ -247,27 +246,27 @@ button.btn { *zoom: 1; margin: 0 -12px !important; padding: 0 12px !important; - text-decoration: none !important; + overflow: visible; width: auto; - font-family: inherit; - line-height: 24px; height: 24px; border: 0; - background: none; - color: #333; - font-size: 12px; vertical-align: top; - overflow: visible; + text-decoration: none !important; + line-height: 24px; + font-family: inherit; + font-size: 12px; + color: #333; cursor: pointer; + background: none; } .btn-group { position: relative; display: inline-block; *display: inline; *margin-left: .3em; - font-size: 0; white-space: nowrap; vertical-align: middle; + font-size: 0; *zoom: 1; } .btn-group:first-child { From 03377fa9549cd165bb2f77bbf7137bb91a654624 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 16 Nov 2013 14:06:56 +0900 Subject: [PATCH 057/473] =?UTF-8?q?#56=20js,=20css=20lint=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 44 ++++++++++++++++++++++++++++++++++++++++++-- package.json | 4 +++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3cf8e91a4..5b9642923 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,7 @@ module.exports = function(grunt) { jshint: { files: [ 'Gruntfile.js', - // 'common/js/*.js', '!common/js/html5.js', '!common/js/jquery.js', '!common/js/x.js', '!common/js/xe.js', + 'common/js/*.js', '!common/js/html5.js', '!common/js/jquery.js', '!common/js/x.js', '!common/js/xe.js', // 'addons/**/*.js', // 'modules/**/*.js', // 'layouts/**/*.js', @@ -26,9 +26,46 @@ module.exports = function(grunt) { "jQuery" : true, "console" : true, "window" : true - } + }, + ignores : [ + 'skins/xe_2010_gallery/js/jquery.easing.1.3.js', + 'skins/xe_2010_gallery/js/json2007.js', + '**/*.min.js', + '**/*.compressed.js' + ] } }, + csslint: { + strict: { + options: { + 'adjoining-classes' : false, + 'box-model' : false, + 'duplicate-background-images' : false, + 'ids' : false, + 'important' : false, + 'overqualified-elements' : false, + 'qualified-headings' : false, + 'star-property-hack' : false, + 'underscore-property-hack' : false, + }, + src: [ + 'common/css/*.css', + '!common/css/bootstrap.css', + '!common/css/bootstrap-responsive.css', + '!**/*.min.css', + ] + } + }, + cssmin: { + 'common-css': { + options: { + banner: '/* My minified css file */' + }, + files: { + 'path/to/output.css': ['path/to/**/*.css'] + } + } + } }); grunt.registerTask('build', '', function(A, B) { @@ -165,6 +202,9 @@ module.exports = function(grunt) { }); grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-contrib-csslint'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.registerTask('default', ['jshint']); + grunt.registerTask('lint', ['jshint', 'csslint']); }; diff --git a/package.json b/package.json index 28b98dfe2..8dc5934f8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "devDependencies": { "grunt": ">0.4.0", "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-jshint": "~0.7.1" + "grunt-contrib-jshint": "~0.7.1", + "grunt-contrib-csslint": "*", + "grunt-contrib-cssmin": "~0.7.0" }, "main": "Gruntfile.js", "scripts": { From f94852935a3325870f56d887528ab9d657d2df36 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 16 Nov 2013 18:22:35 +0900 Subject: [PATCH 058/473] =?UTF-8?q?#60=20css,=20js=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 4 +- common/css/mobile.css | 4 +- common/css/xe.css | 17 +- common/js/common.js | 231 +++++----- common/js/js_app.js | 494 +++++++++++---------- common/js/xml_handler.js | 855 +++++++++++++++++++------------------ common/js/xml_js_filter.js | 656 ++++++++++++++-------------- 7 files changed, 1150 insertions(+), 1111 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5b9642923..1f3ea82a8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,6 +38,7 @@ module.exports = function(grunt) { csslint: { strict: { options: { + import : 2, 'adjoining-classes' : false, 'box-model' : false, 'duplicate-background-images' : false, @@ -205,6 +206,5 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-csslint'); grunt.loadNpmTasks('grunt-contrib-cssmin'); - grunt.registerTask('default', ['jshint']); - grunt.registerTask('lint', ['jshint', 'csslint']); + grunt.registerTask('default', ['jshint', 'csslint']); }; diff --git a/common/css/mobile.css b/common/css/mobile.css index ba5342189..fab53bc83 100644 --- a/common/css/mobile.css +++ b/common/css/mobile.css @@ -1,6 +1,6 @@ @charset "utf-8"; -/* Copyright (C) NAVER */ -/* NAVER (developers@xpressengine.com) */ +/*! Copyright (C) NAVER */ +/* @author NAVER */ /* Message */ .message { diff --git a/common/css/xe.css b/common/css/xe.css index 21f425b55..c8c330fa6 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -1,6 +1,7 @@ @charset "utf-8"; -/* Copyright (C) NAVER */ -/* NAVER (developers@xpressengine.com) */ +/*! Copyright (C) NAVER */ +/* @author NAVER */ +/*csslint unqualified-attributes: false, display-property-grouping: false*/ /* Element Reset */ body, @@ -133,6 +134,7 @@ body>.message { box-shadow: 0 0 5px #000; background: #333 url("../../common/img/msg.loading.gif") no-repeat center 15px; } + /* Admin Bar */ #adminBar { z-index: 9999; @@ -221,10 +223,11 @@ body>.message { *background-color: #e6e6e6; background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: linear-gradient(top, #ffffff, #e6e6e6); background-repeat: repeat-x; - filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); filter: progid: DXImageTransform.Microsoft.gradient(enabled=false); } input.btn, @@ -287,19 +290,19 @@ button.btn { .btn-group>.btn:first-child { margin-left: 0; -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .btn-group>.btn: last-child { -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; border-top-right-radius: 4px; -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .btn-group>.btn:hover, .btn-group>.btn:focus, diff --git a/common/js/common.js b/common/js/common.js index e8090224a..e1e49170e 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -26,14 +26,15 @@ if(jQuery) jQuery.noConflict(); * @namespace XE */ window.XE = { - loaded_popup_menus : new Array(), - addedDocument : new Array(), + loaded_popup_menus : [], + addedDocument : [], /** * @brief 특정 name을 가진 체크박스들의 checked 속성 변경 * @param [itemName='cart',][options={}] */ checkboxToggleAll : function(itemName) { if(!is_def(itemName)) itemName='cart'; + var obj; var options = { wrap : null, checked : 'toggle', @@ -54,13 +55,13 @@ if(jQuery) jQuery.noConflict(); $.extend(options, arguments[1] || {}); } - if(options.doClick == true) options.checked = null; + if(options.doClick === true) options.checked = null; if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap; if(options.wrap) { - var obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); + obj = $(options.wrap).find('input[name='+itemName+']:checkbox'); } else { - var obj = $('input[name='+itemName+']:checkbox'); + obj = $('input[name='+itemName+']:checkbox'); } if(options.checked == 'toggle') { @@ -68,7 +69,11 @@ if(jQuery) jQuery.noConflict(); $(this).attr('checked', ($(this).attr('checked')) ? false : true); }); } else { - (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked); + if(options.doClick === true) { + obj.click(); + } else { + obj.attr('checked', options.checked); + } } }, @@ -76,9 +81,9 @@ if(jQuery) jQuery.noConflict(); * @brief 문서/회원 등 팝업 메뉴 출력 */ displayPopupMenu : function(ret_obj, response_tags, params) { - var target_srl = params["target_srl"]; - var menu_id = params["menu_id"]; - var menus = ret_obj['menus']; + var target_srl = params.target_srl; + var menu_id = params.menu_id; + var menus = ret_obj.menus; var html = ""; if(this.loaded_popup_menus[menu_id]) { @@ -86,7 +91,7 @@ if(jQuery) jQuery.noConflict(); } else { if(menus) { - var item = menus['item']; + var item = menus.item; if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item); if(item.length) { for(var i=0;i'+str+' '; + html += '
  • '+str+'
    • '; } } } @@ -121,7 +126,7 @@ if(jQuery) jQuery.noConflict(); /* 레이어 출력 */ if(html) { var area = $('#popup_menu_area').html('
      '+html+'
    '); - var areaOffset = {top:params['page_y'], left:params['page_x']}; + var areaOffset = {top:params.page_y, left:params.page_x}; if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop()) areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop(); @@ -131,7 +136,7 @@ if(jQuery) jQuery.noConflict(); area.css({ top:areaOffset.top, left:areaOffset.left }).show().focus(); } } - } + }; }) (jQuery); @@ -148,7 +153,7 @@ jQuery(function($) { if($.browser.msie) { $('select').each(function(i, sels) { var disabled_exists = false; - var first_enable = new Array(); + var first_enable = []; for(var j=0; j < sels.options.length; j++) { if(sels.options[j].disabled) { @@ -212,95 +217,93 @@ jQuery(function($) { }); (function(){ // String extension methods + function isSameUrl(a,b) { + return (a.replace(/#.*$/, '') === b.replace(/#.*$/, '')); + } + var isArray = Array.isArray || function(obj){ return Object.prototype.toString.call(obj)=='[object Array]'; }; -function isSameUrl(a,b) { - return (a.replace(/#.*$/, '') === b.replace(/#.*$/, '')); -} + /** + * @brief location.href에서 특정 key의 값을 return + **/ + String.prototype.getQuery = function(key) { + var loc = isSameUrl(this, window.location.href) ? current_url : this; + var idx = loc.indexOf('?'); + if(idx == -1) return null; + var query_string = loc.substr(idx+1, this.length), args = {}; + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); -var isArray = Array.isArray || function(obj){ return Object.prototype.toString.call(obj)=='[object Array]' }; + var q = args[key]; + if(typeof(q)=='undefined') q = ''; -/** - * @brief location.href에서 특정 key의 값을 return - **/ -String.prototype.getQuery = function(key) { - var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - if(idx == -1) return null; - var query_string = loc.substr(idx+1, this.length), args = {}; - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; }); + return q; + }; - var q = args[key]; - if(typeof(q)=='undefined') q = ''; + /** + * @brief location.href에서 특정 key의 값을 return + **/ + String.prototype.setQuery = function(key, val) { + var loc = isSameUrl(this, window.location.href) ? current_url : this; + var idx = loc.indexOf('?'); + var uri = loc.replace(/#$/, ''); + var act, re, v, toReplace; - return q; -} + if (typeof(val)=='undefined') val = ''; -/** - * @brief location.href에서 특정 key의 값을 return - **/ -String.prototype.setQuery = function(key, val) { - var loc = isSameUrl(this, window.location.href) ? current_url : this; - var idx = loc.indexOf('?'); - var uri = loc.replace(/#$/, ''); - var act, re, v; + if (idx != -1) { + var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; + uri = loc.substr(0, idx); + query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); - if (typeof(val)=='undefined') val = ''; + args[key] = val; - if (idx != -1) { - var query_string = uri.substr(idx+1, loc.length), args = {}, q_list = []; - uri = loc.substr(0, idx); - query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; }); + for (var prop in args) { + if (!args.hasOwnProperty(prop)) continue; + if (!(v = String(args[prop]).trim())) continue; + q_list.push(prop+'='+decodeURI(v)); + } - args[key] = val; - - for (var prop in args) { - if (!args.hasOwnProperty(prop)) continue; - if (!(v = String(args[prop]).trim())) continue; - q_list.push(prop+'='+decodeURI(v)); + query_string = q_list.join('&'); + uri = uri+(query_string?'?'+query_string:''); + } else { + if (String(val).trim()) uri = uri+'?'+key+'='+val; } - query_string = q_list.join('&'); - uri = uri+(query_string?'?'+query_string:''); - } else { - if (String(val).trim()) uri = uri+'?'+key+'='+val; - } + re = /^https:\/\/([^:\/]+)(:\d+|)/i; + if (re.test(uri)) { + toReplace = 'http://'+RegExp.$1; + if (window.http_port && http_port != 80) toReplace += ':' + http_port; + uri = uri.replace(re, toReplace); + } - re = /^https:\/\/([^:\/]+)(:\d+|)/i; - if (re.test(uri)) { - var toReplace = 'http://'+RegExp.$1; - if (window.http_port && http_port != 80) toReplace += ':' + http_port; - uri = uri.replace(re, toReplace); - } - - var bUseSSL = !!window.enforce_ssl; - if (!bUseSSL && isArray(window.ssl_actions) && (act=uri.getQuery('act'))) { - for (var i=0,c=ssl_actions.length; i < c; i++) { - if (ssl_actions[i] === act) { - bUseSSL = true; - break; + var bUseSSL = !!window.enforce_ssl; + if (!bUseSSL && isArray(window.ssl_actions) && (act=uri.getQuery('act'))) { + for (var i=0,c=ssl_actions.length; i < c; i++) { + if (ssl_actions[i] === act) { + bUseSSL = true; + break; + } } } - } - re = /http:\/\/([^:\/]+)(:\d+|)/i; - if (bUseSSL && re.test(uri)) { - var toReplace = 'https://'+RegExp.$1 - if (window.https_port && https_port != 443) toReplace += ':' + https_port; - uri = uri.replace(re, toReplace); - } + re = /http:\/\/([^:\/]+)(:\d+|)/i; + if (bUseSSL && re.test(uri)) { + toReplace = 'https://'+RegExp.$1; + if (window.https_port && https_port != 443) toReplace += ':' + https_port; + uri = uri.replace(re, toReplace); + } - // insert index.php if it isn't included - uri = uri.replace(/\/(index\.php)?\?/, '/index.php?'); + // insert index.php if it isn't included + uri = uri.replace(/\/(index\.php)?\?/, '/index.php?'); - return encodeURI(uri); -} + return encodeURI(uri); + }; -/** - * @brief string prototype으로 trim 함수 추가 - **/ -String.prototype.trim = function() { - return this.replace(/(^\s*)|(\s*$)/g, ""); -} + /** + * @brief string prototype으로 trim 함수 추가 + **/ + String.prototype.trim = function() { + return this.replace(/(^\s*)|(\s*$)/g, ""); + }; })(); @@ -330,7 +333,7 @@ function isDef() { * @brief 윈도우 오픈 * 열려진 윈도우의 관리를 통해 window.focus()등을 FF에서도 비슷하게 구현함 **/ -var winopen_list = new Array(); +var winopen_list = []; function winopen(url, target, attribute) { if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid); try { @@ -392,11 +395,12 @@ function move_url(url, open_window) { * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용) **/ function displayMultimedia(src, width, height, options) { + /*jslint evil: true */ var html = _displayMultimedia(src, width, height, options); if(html) document.writeln(html); } function _displayMultimedia(src, width, height, options) { - if(src.indexOf('files') == 0) src = request_uri + src; + if(src.indexOf('files') === 0) src = request_uri + src; var defaults = { wmode : 'transparent', @@ -426,13 +430,11 @@ function _displayMultimedia(src, width, height, options) { html = ''; html += ''; for(var name in params) { - if(params[name] != 'undefined' && params[name] != '') { + if(params[name] != 'undefined' && params[name] !== '') { html += ''; } } - html += '' - + '' - + ''; + html += '' + '' + ''; } else { if (jQuery.browser.mozilla || jQuery.browser.opera) { // firefox and opera uses 0 or 1 for autostart parameter. @@ -499,12 +501,12 @@ function doCallModuleAction(module, action, target_srl) { } function completeCallModuleAction(ret_obj, response_tags) { - if(ret_obj['message']!='success') alert(ret_obj['message']); + if(ret_obj.message!='success') alert(ret_obj.message); location.reload(); } function completeMessage(ret_obj) { - alert(ret_obj['message']); + alert(ret_obj.message); location.reload(); } @@ -564,13 +566,13 @@ function doDocumentPreview(obj) { /* 게시글 저장 */ function doDocumentSave(obj) { var editor_sequence = obj.form.getAttribute('editor_sequence'); - var prev_content = editorRelKeys[editor_sequence]['content'].value; + var prev_content = editorRelKeys[editor_sequence].content.value; if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { var content = editorGetContent(editor_sequence); - editorRelKeys[editor_sequence]['content'].value = content; + editorRelKeys[editor_sequence].content.value = content; } - var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();; + var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray(); jQuery.each(data, function(i, field){ var val = jQuery.trim(field.value); if(!val) return true; @@ -581,13 +583,13 @@ function doDocumentSave(obj) { exec_xml('document','procDocumentTempSave', params, completeDocumentSave, responses, params, obj.form); - editorRelKeys[editor_sequence]['content'].value = prev_content; + editorRelKeys[editor_sequence].content.value = prev_content; return false; } function completeDocumentSave(ret_obj) { - jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']); - alert(ret_obj['message']); + jQuery('input[name=document_srl]').eq(0).val(ret_obj.document_srl); + alert(ret_obj.message); } /* 저장된 게시글 불러오기 */ @@ -618,7 +620,7 @@ function viewSkinInfo(module, skin) { /* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */ -var addedDocument = new Array(); +var addedDocument = []; function doAddDocumentCart(obj) { var srl = obj.value; addedDocument[addedDocument.length] = srl; @@ -627,10 +629,10 @@ function doAddDocumentCart(obj) { function callAddDocumentCart(document_length) { if(addedDocument.length<1 || document_length != addedDocument.length) return; - var params = new Array(); - params["srls"] = addedDocument.join(","); + var params = []; + params.srls = addedDocument.join(","); exec_xml("document","procDocumentAddCart", params, null); - addedDocument = new Array(); + addedDocument = []; } /* ff의 rgb(a,b,c)를 #... 로 변경 */ @@ -719,7 +721,6 @@ var Base64 = { input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); while (i < input.length) { - enc1 = this._keyStr.indexOf(input.charAt(i++)); enc2 = this._keyStr.indexOf(input.charAt(i++)); enc3 = this._keyStr.indexOf(input.charAt(i++)); @@ -737,7 +738,6 @@ var Base64 = { if (enc4 != 64) { output = output + String.fromCharCode(chr3); } - } output = Base64._utf8_decode(output); @@ -752,7 +752,6 @@ var Base64 = { var utftext = ""; for (var n = 0; n < string.length; n++) { - var c = string.charCodeAt(n); if (c < 128) { @@ -767,7 +766,6 @@ var Base64 = { utftext += String.fromCharCode(((c >> 6) & 63) | 128); utftext += String.fromCharCode((c & 63) | 128); } - } return utftext; @@ -777,10 +775,9 @@ var Base64 = { _utf8_decode : function (utftext) { var string = ""; var i = 0; - var c = c1 = c2 = 0; + var c = 0, c1 = 0, c2 = 0, c3 = 0; while ( i < utftext.length ) { - c = utftext.charCodeAt(i); if (c < 128) { @@ -798,13 +795,11 @@ var Base64 = { string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); i += 3; } - } return string; } - -} +}; @@ -817,11 +812,11 @@ var Base64 = { * ------------------------------------------- */ if(typeof(resizeImageContents) == 'undefined') { - function resizeImageContents() {} + window.resizeImageContents = function() {}; } if(typeof(activateOptionDisabled) == 'undefined') { - function activateOptionDisabled() {} + window.activateOptionDisabled = function() {}; } objectExtend = jQuery.extend; diff --git a/common/js/js_app.js b/common/js/js_app.js index 5f2f1e9ad..6851ac180 100644 --- a/common/js/js_app.js +++ b/common/js/js_app.js @@ -6,274 +6,266 @@ * @update 20100701 */ (function($){ + var _xe_base, _app_base, _plugin_base; + var _apps = []; -var _xe_base, _app_base, _plugin_base; -var _apps = []; + _xe_base = { + /** + * @brief return the name of Core module + */ + getName : function() { + return 'Core'; + }, -_xe_base = { - /** - * @brief return the name of Core module - */ - getName : function() { - return 'Core'; - }, + /** + * @brief Create an application class + */ + createApp : function(sName, oDef) { + var _base = getTypeBase(); - /** - * @brief Create an application class - */ - createApp : function(sName, oDef) { - var _base = getTypeBase(); + $.extend(_base.prototype, _app_base, oDef); - $.extend(_base.prototype, _app_base, oDef); + _base.prototype.getName = function() { + return sName; + }; - _base.prototype.getName = function() { - return sName; - }; + return _base; + }, - return _base; - }, + /** + * @brief Create a plugin class + */ + createPlugin : function(sName, oDef) { + var _base = getTypeBase(); - /** - * @brief Create a plugin class - */ - createPlugin : function(sName, oDef) { - var _base = getTypeBase(); + $.extend(_base.prototype, _plugin_base, oDef); - $.extend(_base.prototype, _plugin_base, oDef); + _base.prototype.getName = function() { + return sName; + }; - _base.prototype.getName = function() { - return sName; - }; + return _base; + }, - return _base; - }, + /** + * @brief Get the array of applications + */ + getApps : function() { + return $.makeArray(_apps); + }, - /** - * @brief Get the array of applications - */ - getApps : function() { - return $.makeArray(_apps); - }, - - /** - * @brief Get one application - */ - getApp : function(indexOrName) { - indexOrName = (indexOrName||'').toLowerCase(); - if(typeof _apps[indexOrName] != 'undefined') { - return _apps[indexOrName]; - } else { - return null; - } - }, - - /** - * @brief Register an application instance - */ - registerApp : function(oApp) { - var sName = oApp.getName().toLowerCase(); - - _apps.push(oApp); - if (!$.isArray(_apps[sName])) { - _apps[sName] = []; - } - _apps[sName].push(oApp); - - oApp.parent = this; - - // register event - if ($.isFunction(oApp.activate)) oApp.activate(); - }, - - /** - * @brief Unregister an application instance - */ - unregisterApp : function(oApp) { - var sName = oApp.getName().toLowerCase(); - var nIndex = $.inArray(oApp, _apps); - - if (nIndex >= 0) _apps = _apps.splice(nIndex, 1); - - if ($.isArray(_apps[sName])) { - nIndex = $.inArray(oApp, _apps[sName]); - if (nIndex >= 0) _apps[sName] = _apps[sName].splice(nIndex, 1); - } - - // unregister event - if ($.isFunction(oApp.deactivate)) oApp.deactivate(); - }, - - /** - * @brief overrides broadcast method - */ - broadcast : function(msg, params) { - this._broadcast(this, msg, params); - }, - - _broadcast : function(sender, msg, params) { - for(var i=0; i < _apps.length; i++) { - _apps[i]._cast(sender, msg, params); - } - - - // cast to child plugins - this._cast(sender, msg, params); - } -} - -_app_base = { - _plugins : [], - _messages : {}, - - /** - * @brief get plugin - */ - getPlugin : function(sPluginName) { - sPluginName = sPluginName.toLowerCase(); - if ($.isArray(this._plugins[sPluginName])) { - return this._plugins[sPluginName]; - } else { - return []; - } - }, - - /** - * @brief register a plugin instance - */ - registerPlugin : function(oPlugin) { - var self = this; - var sName = oPlugin.getName().toLowerCase(); - - // check if the plugin is already registered - if ($.inArray(oPlugin, this._plugins) >= 0) return false; - - // push the plugin into the _plugins array - this._plugins.push(oPlugin); - - if (!$.isArray(this._plugins[sName])) this._plugins[sName] = []; - this._plugins[sName].push(oPlugin); - - // register method pool - $.each(oPlugin._binded_fn, function(api, fn){ self.registerHandler(api, fn); }); - - // binding - oPlugin.oApp = this; - - // registered event - if ($.isFunction(oPlugin.activate)) oPlugin.activate(); - - return true; - }, - - /** - * @brief register api message handler - */ - registerHandler : function(api, func) { - var msgs = this._messages; api = api.toUpperCase(); - if (!$.isArray(msgs[api])) msgs[api] = []; - msgs[api].push(func); - }, - - cast : function(msg, params) { - return this._cast(this, msg, params || []); - }, - - broadcast : function(sender, msg, params) { - if (this.parent && this.parent._broadcast) { - this.parent._broadcast(sender, msg, params); - } - }, - - _cast : function(sender, msg, params) { - var i, len; - var aMsg = this._messages; - - msg = msg.toUpperCase(); - - // BEFORE hooker - if (aMsg['BEFORE_'+msg] || this['API_BEFORE_'+msg]) { - var bContinue = this._cast(sender, 'BEFORE_'+msg, params); - if (!bContinue) return; - } - - // main api function - var vRet = [], sFn = 'API_'+msg; - if ($.isArray(aMsg[msg])) { - for(i=0; i < aMsg[msg].length; i++) { - vRet.push( aMsg[msg][i](sender, params) ); + /** + * @brief Get one application + */ + getApp : function(indexOrName) { + indexOrName = (indexOrName||'').toLowerCase(); + if(typeof _apps[indexOrName] != 'undefined') { + return _apps[indexOrName]; + } else { + return null; } + }, + + /** + * @brief Register an application instance + */ + registerApp : function(oApp) { + var sName = oApp.getName().toLowerCase(); + + _apps.push(oApp); + if (!$.isArray(_apps[sName])) { + _apps[sName] = []; + } + _apps[sName].push(oApp); + + oApp.parent = this; + + // register event + if ($.isFunction(oApp.activate)) oApp.activate(); + }, + + /** + * @brief Unregister an application instance + */ + unregisterApp : function(oApp) { + var sName = oApp.getName().toLowerCase(); + var nIndex = $.inArray(oApp, _apps); + + if (nIndex >= 0) _apps = _apps.splice(nIndex, 1); + + if ($.isArray(_apps[sName])) { + nIndex = $.inArray(oApp, _apps[sName]); + if (nIndex >= 0) _apps[sName] = _apps[sName].splice(nIndex, 1); + } + + // unregister event + if ($.isFunction(oApp.deactivate)) oApp.deactivate(); + }, + + /** + * @brief overrides broadcast method + */ + broadcast : function(msg, params) { + this._broadcast(this, msg, params); + }, + + _broadcast : function(sender, msg, params) { + for(var i=0; i < _apps.length; i++) { + _apps[i]._cast(sender, msg, params); + } + + + // cast to child plugins + this._cast(sender, msg, params); } - if (vRet.length < 2) vRet = vRet[0]; - - // AFTER hooker - if (aMsg['AFTER_'+msg] || this['API_AFTER_'+msg]) { - this._cast(sender, 'AFTER_'+msg, params); - } - - if (!/^(?:AFTER|BEFORE)_/.test(msg)) { // top level function - return vRet; - } else { - return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet); - } - } -}; - -_plugin_base = { - oApp : null, - - cast : function(msg, params) { - if (this.oApp && this.oApp._cast) { - return this.oApp._cast(this, msg, params || []); - } - }, - - broadcast : function(msg, params) { - if (this.oApp && this.oApp.broadcast) { - this.oApp.broadcast(this, mag, params || []); - } - } - - /** - * Event handler prototype - * - * function (oSender, params) - */ -}; - -function getTypeBase() { - var _base = function() { - var self = this; - var pool = null; - - if ($.isArray(this._plugins)) this._plugins = []; - if (this._messages) this._messages = {}; - else this._binded_fn = {}; - - // bind functions - $.each(this, function(key, val){ - if (!$.isFunction(val)) return true; - if (!/^API_([A-Z0-9_]+)$/.test(key)) return true; - - var api = RegExp.$1; - var fn = function(sender, params){ return self[key](sender, params) }; - - if (self._messages) self._messages[api] = [fn]; - else self._binded_fn[api] = fn; - }); - - if ($.isFunction(this.init)) this.init.apply(this, arguments); }; - return _base; -} + _app_base = { + _plugins : [], + _messages : {}, -window.xe = $.extend(_app_base, _xe_base); -window.xe.lang = {}; // language repository + /** + * @brief get plugin + */ + getPlugin : function(sPluginName) { + sPluginName = sPluginName.toLowerCase(); + if ($.isArray(this._plugins[sPluginName])) { + return this._plugins[sPluginName]; + } else { + return []; + } + }, -// domready event -$(function(){ xe.broadcast('ONREADY'); }); + /** + * @brief register a plugin instance + */ + registerPlugin : function(oPlugin) { + var self = this; + var sName = oPlugin.getName().toLowerCase(); -// load event -$(window).load(function(){ xe.broadcast('ONLOAD'); }); + // check if the plugin is already registered + if ($.inArray(oPlugin, this._plugins) >= 0) return false; + // push the plugin into the _plugins array + this._plugins.push(oPlugin); + + if (!$.isArray(this._plugins[sName])) this._plugins[sName] = []; + this._plugins[sName].push(oPlugin); + + // register method pool + $.each(oPlugin._binded_fn, function(api, fn){ self.registerHandler(api, fn); }); + + // binding + oPlugin.oApp = this; + + // registered event + if ($.isFunction(oPlugin.activate)) oPlugin.activate(); + + return true; + }, + + /** + * @brief register api message handler + */ + registerHandler : function(api, func) { + var msgs = this._messages; api = api.toUpperCase(); + if (!$.isArray(msgs[api])) msgs[api] = []; + msgs[api].push(func); + }, + + cast : function(msg, params) { + return this._cast(this, msg, params || []); + }, + + broadcast : function(sender, msg, params) { + if (this.parent && this.parent._broadcast) { + this.parent._broadcast(sender, msg, params); + } + }, + + _cast : function(sender, msg, params) { + var i, len; + var aMsg = this._messages; + + msg = msg.toUpperCase(); + + // BEFORE hooker + if (aMsg['BEFORE_'+msg] || this['API_BEFORE_'+msg]) { + var bContinue = this._cast(sender, 'BEFORE_'+msg, params); + if (!bContinue) return; + } + + // main api function + var vRet = [], sFn = 'API_'+msg; + if ($.isArray(aMsg[msg])) { + for(i=0; i < aMsg[msg].length; i++) { + vRet.push( aMsg[msg][i](sender, params) ); + } + } + if (vRet.length < 2) vRet = vRet[0]; + + // AFTER hooker + if (aMsg['AFTER_'+msg] || this['API_AFTER_'+msg]) { + this._cast(sender, 'AFTER_'+msg, params); + } + + if (!/^(?:AFTER|BEFORE)_/.test(msg)) { // top level function + return vRet; + } else { + return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet); + } + } + }; + + _plugin_base = { + oApp : null, + + cast : function(msg, params) { + if (this.oApp && this.oApp._cast) { + return this.oApp._cast(this, msg, params || []); + } + }, + + broadcast : function(msg, params) { + if (this.oApp && this.oApp.broadcast) { + this.oApp.broadcast(this, mag, params || []); + } + } + }; + + function getTypeBase() { + var _base = function() { + var self = this; + var pool = null; + + if ($.isArray(this._plugins)) this._plugins = []; + if (this._messages) this._messages = {}; + else this._binded_fn = {}; + + // bind functions + $.each(this, function(key, val){ + if (!$.isFunction(val)) return true; + if (!/^API_([A-Z0-9_]+)$/.test(key)) return true; + + var api = RegExp.$1; + var fn = function(sender, params){ return self[key](sender, params); }; + + if (self._messages) self._messages[api] = [fn]; + else self._binded_fn[api] = fn; + }); + + if ($.isFunction(this.init)) this.init.apply(this, arguments); + }; + + return _base; + } + + window.xe = $.extend(_app_base, _xe_base); + window.xe.lang = {}; // language repository + + // domready event + $(function(){ xe.broadcast('ONREADY'); }); + + // load event + $(window).load(function(){ xe.broadcast('ONLOAD'); }); })(jQuery); diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index 9ce8e2173..0e74c7f5e 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -6,445 +6,484 @@ // xml handler을 이용하는 user function var show_waiting_message = true; -/* This work is licensed under Creative Commons GNU LGPL License. - - License: http://creativecommons.org/licenses/LGPL/2.1/ - Version: 0.9 - Author: Stefan Goessner/2006 - Web: http://goessner.net/ -*/ +/** + * This work is licensed under Creative Commons GNU LGPL License. + * License: http://creativecommons.org/licenses/LGPL/2.1/ + * Version: 0.9 + * Author: Stefan Goessner/2006 + * Web: http://goessner.net/ + **/ function xml2json(xml, tab, ignoreAttrib) { - var X = { - toObj: function(xml) { - var o = {}; - if (xml.nodeType==1) { // element node .. - if (ignoreAttrib && xml.attributes.length) // element with attributes .. - for (var i=0; i 1) - o = X.escape(X.innerXml(xml)); - else - for (var n=xml.firstChild; n; n=n.nextSibling){ - //o["#cdata"] = X.escape(n.nodeValue); - o = X.escape(n.nodeValue); - } - } - } - if (!xml.attributes.length && !xml.firstChild) o = null; - } - else if (xml.nodeType==9) { // document.node - o = X.toObj(xml.documentElement); - } - else - alert("unhandled node type: " + xml.nodeType); - return o; - }, - toJson: function(o, name, ind) { - var json = name ? ("\""+name+"\"") : ""; - if (o instanceof Array) { - for (var i=0,n=o.length; i 1 ? ("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind) : o.join("")) + "]"; - } - else if (o == null) - json += (name&&":") + "null"; - else if (typeof(o) == "object") { - var arr = []; - for (var m in o) - arr[arr.length] = X.toJson(o[m], m, ind+"\t"); - json += (name?":{":"{") + (arr.length > 1 ? ("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind) : arr.join("")) + "}"; - } - else if (typeof(o) == "string") - json += (name&&":") + "\"" + o.toString() + "\""; - else - json += (name&&":") + o.toString(); - return json; - }, - innerXml: function(node) { - var s = "" - if ("innerHTML" in node) - s = node.innerHTML; - else { - var asXml = function(n) { - var s = ""; - if (n.nodeType == 1) { - s += "<" + n.nodeName; - for (var i=0; i"; - } - else - s += "/>"; - } - else if (n.nodeType == 3) - s += n.nodeValue; - else if (n.nodeType == 4) - s += ""; - return s; - }; - for (var c=node.firstChild; c; c=c.nextSibling) - s += asXml(c); - } - return s; - }, - escape: function(txt) { - return txt.replace(/[\\]/g, "\\\\") - .replace(/[\"]/g, '\\"') - .replace(/[\n]/g, '\\n') - .replace(/[\r]/g, '\\r'); - }, - removeWhite: function(e) { - e.normalize(); - for (var n = e.firstChild; n; ) { - if (n.nodeType == 3) { // text node - if (!n.nodeValue.match(/[^ \f\n\r\t\v]/)) { // pure whitespace text node - var nxt = n.nextSibling; - e.removeChild(n); - n = nxt; - } - else - n = n.nextSibling; - } - else if (n.nodeType == 1) { // element node - X.removeWhite(n); - n = n.nextSibling; - } - else // any other node - n = n.nextSibling; - } - return e; - } - }; - if (xml.nodeType == 9) // document node - xml = xml.documentElement; + var X = { + toObj: function(xml) { + var o = {}; + if (xml.nodeType==1) { // element node .. + if (ignoreAttrib && xml.attributes.length) { // element with attributes .. + for (var i=0; i 1) { + o = X.escape(X.innerXml(xml)); + } else { + for (var n2=xml.firstChild; n2; n2=n2.nextSibling) { + // o["#cdata"] = X.escape(n2.nodeValue); + o = X.escape(n2.nodeValue); + } + } + } + } - if (typeof(JSON)=='object' && jQuery.isFunction(JSON.stringify) && false) { - var obj = {}; obj[xml.nodeName] = json_obj; - json_str = JSON.stringify(obj); - return json_str; - } else { - json_str = X.toJson(json_obj, xml.nodeName, ""); - return "{" + (tab ? json_str.replace(/\t/g, tab) : json_str.replace(/\t|\n/g, "")) + "}"; - } + if (!xml.attributes.length && !xml.firstChild) { + o = null; + } + } else if (xml.nodeType==9) { // document.node + o = X.toObj(xml.documentElement); + } else { + alert("unhandled node type: " + xml.nodeType); + } + + return o; + }, + toJson: function(o, name, ind) { + var json = name ? ("\""+name+"\"") : ""; + if (o instanceof Array) { + for (var i=0,n=o.length; i 1 ? ("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind) : o.join("")) + "]"; + } else if (o === null) { + json += (name&&":") + "null"; + } else if (typeof(o) == "object") { + var arr = []; + for (var m in o) { + arr[arr.length] = X.toJson(o[m], m, ind+"\t"); + } + json += (name?":{":"{") + (arr.length > 1 ? ("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind) : arr.join("")) + "}"; + } else if (typeof(o) == "string") { + json += (name&&":") + "\"" + o.toString() + "\""; + } else { + json += (name&&":") + o.toString(); + } + return json; + }, + innerXml: function(node) { + var s = ""; + + if ("innerHTML" in node) { + s = node.innerHTML; + } else { + var asXml = function(n) { + var s = ""; + if (n.nodeType == 1) { + s += "<" + n.nodeName; + for (var i=0; i"; + } else { + s += "/>"; + } + } else if (n.nodeType == 3) { + s += n.nodeValue; + } else if (n.nodeType == 4) { + s += ""; + } + + return s; + }; + + for (var c=node.firstChild; c; c=c.nextSibling) { + s += asXml(c); + } + } + return s; + }, + escape: function(txt) { + return txt.replace(/[\\]/g, "\\\\") + .replace(/[\"]/g, '\\"') + .replace(/[\n]/g, '\\n') + .replace(/[\r]/g, '\\r'); + }, + removeWhite: function(e) { + e.normalize(); + for (var n3 = e.firstChild; n3; ) { + if (n3.nodeType == 3) { // text node + if (!n3.nodeValue.match(/[^ \f\n\r\t\v]/)) { // pure whitespace text node + var nxt = n3.nextSibling; + e.removeChild(n3); + n3 = nxt; + } else { + n3 = n3.nextSibling; + } + } else if (n3.nodeType == 1) { // element node + X.removeWhite(n3); + n3 = n3.nextSibling; + } else { // any other node + n3 = n3.nextSibling; + } + } + return e; + } + }; + + // document node + if (xml.nodeType == 9) xml = xml.documentElement; + + var json_obj = X.toObj(X.removeWhite(xml)), json_str; + + if (typeof(JSON)=='object' && jQuery.isFunction(JSON.stringify) && false) { + var obj = {}; obj[xml.nodeName] = json_obj; + json_str = JSON.stringify(obj); + + return json_str; + } else { + json_str = X.toJson(json_obj, xml.nodeName, ""); + + return "{" + (tab ? json_str.replace(/\t/g, tab) : json_str.replace(/\t|\n/g, "")) + "}"; + } } (function($){ -/** - * @brief exec_xml - * @author NAVER (developers@xpressengine.com) - **/ -$.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) { - var xml_path = request_uri+"index.php" - if(!params) params = {}; + /** + * @brief exec_xml + * @author NAVER (developers@xpressengine.com) + **/ + $.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) { + var xml_path = request_uri+"index.php"; + if(!params) params = {}; - // {{{ set parameters - if($.isArray(params)) params = arr2obj(params); - params['module'] = module; - params['act'] = act; + // {{{ set parameters + if($.isArray(params)) params = arr2obj(params); + params.module = module; + params.act = act; - if(typeof(xeVid)!='undefined') params['vid'] = xeVid; - if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = ['error','message']; - else { - response_tags.push('error', 'message'); - } - // }}} set parameters + if(typeof(xeVid)!='undefined') params.vid = xeVid; + if(typeof(response_tags) == "undefined" || response_tags.length<1) { + response_tags = ['error','message']; + } else { + response_tags.push('error', 'message'); + } + // }}} set parameters - // use ssl? - if ($.isArray(ssl_actions) && params['act'] && $.inArray(params['act'], ssl_actions) >= 0) - { - var url = default_url || request_uri; - var port = window.https_port || 443; - var _ul = $('').attr('href', url)[0]; - var target = 'https://' + _ul.hostname.replace(/:\d+$/, ''); + // use ssl? + if ($.isArray(ssl_actions) && params.act && $.inArray(params.act, ssl_actions) >= 0) { + var url = default_url || request_uri; + var port = window.https_port || 443; + var _ul = $('').attr('href', url)[0]; + var target = 'https://' + _ul.hostname.replace(/:\d+$/, ''); - if(port != 443) target += ':'+port; - if(_ul.pathname[0] != '/') target += '/'; + if(port != 443) target += ':'+port; + if(_ul.pathname[0] != '/') target += '/'; - target += _ul.pathname; - xml_path = target.replace(/\/$/, '')+'/index.php'; - } - - var _u1 = $('').attr('href', location.href)[0]; - var _u2 = $('').attr('href', xml_path)[0]; - - // 현 url과 ajax call 대상 url의 schema 또는 port가 다르면 직접 form 전송 - if(_u1.protocol != _u2.protocol || _u1.port != _u2.port) return send_by_form(xml_path, params); - - var xml = [], i = 0; - xml[i++] = ''; - xml[i++] = ''; - xml[i++] = ''; - - $.each(params, function(key, val) { - xml[i++] = '<'+key+'>'; - }); - - xml[i++] = ''; - xml[i++] = ''; - - var _xhr = null; - if (_xhr && _xhr.readyState != 0) _xhr.abort(); - - // 전송 성공시 - function onsuccess(data, textStatus, xhr) { - var resp_xml = $(data).find('response')[0], resp_obj, txt='', ret=[], tags={}, json_str=''; - - waiting_obj.css('display', 'none').trigger('cancel_confirm'); - - if(!resp_xml) { - alert(_xhr.responseText); - return null; + target += _ul.pathname; + xml_path = target.replace(/\/$/, '')+'/index.php'; } - json_str = xml2json(resp_xml, false, false); - resp_obj = (typeof(JSON)=='object' && $.isFunction(JSON.parse))?JSON.parse(json_str):eval('('+json_str+')'); - resp_obj = resp_obj.response; + var _u1 = $('').attr('href', location.href)[0]; + var _u2 = $('').attr('href', xml_path)[0]; - if (typeof(resp_obj)=='undefined') { - ret['error'] = -1; - ret['message'] = 'Unexpected error occured.'; - try { - if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined') ret['message'] += '\r\n'+txt; - } catch(e){}; - return ret; - } + // 현 url과 ajax call 대상 url의 schema 또는 port가 다르면 직접 form 전송 + if(_u1.protocol != _u2.protocol || _u1.port != _u2.port) return send_by_form(xml_path, params); - $.each(response_tags, function(key, val){ tags[val] = true; }); - tags["redirect_url"] = true; - tags["act"] = true; - $.each(resp_obj, function(key, val){ if(tags[key]) ret[key] = val; }); + var xml = [], i = 0; + xml[i++] = ''; + xml[i++] = ''; + xml[i++] = ''; - if(ret['error'] != 0) { - if ($.isFunction($.exec_xml.onerror)) { - return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj); - } - - alert( (ret['message']||'An unknown error occured while loading ['+module+'.'+act+']').replace(/\\n/g, '\n') ); - - return null; - } - - if(ret['redirect_url']) { - location.href = ret['redirect_url'].replace(/&/g, '&'); - return null; - } - - if($.isFunction(callback_func)) callback_func(ret, response_tags, callback_func_arg, fo_obj); - } - - // 모든 xml데이터는 POST방식으로 전송. try-catch문으로 오류 발생시 대처 - try { - $.ajax({ - url : xml_path, - type : 'POST', - dataType : 'xml', - data : xml.join('\n'), - contentType : 'text/plain', - beforeSend : function(xhr){ _xhr = xhr; }, - success : onsuccess, - error : function(xhr, textStatus) { - waiting_obj.css('display', 'none'); - - var msg = ''; - if (textStatus == 'parsererror') { - msg = 'The result is not valid XML :\n-------------------------------------\n'; - if(xhr.responseText == "") return; - msg += xhr.responseText.replace(/<[^>]+>/g, ''); - } else { - msg = textStatus; - } - - try{ - console.log(msg); - }catch(ee){} - } + $.each(params, function(key, val) { + xml[i++] = '<'+key+'>'; }); - } catch(e) { - alert(e); - return; - } - // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음) - var waiting_obj = $('.wfsr'); - if(show_waiting_message && waiting_obj.length) { - - var timeoutId = $(".wfsr").data('timeout_id'); - if(timeoutId) clearTimeout(timeoutId); - $(".wfsr").css('opacity', 0.0); - $(".wfsr").data('timeout_id', setTimeout(function(){ - $(".wfsr").css('opacity', ''); - }, 1000)); + xml[i++] = ''; + xml[i++] = ''; - waiting_obj.html(waiting_message).show(); - } -} -function send_by_form(url, params) { - var frame_id = 'xeTmpIframe'; - var form_id = 'xeVirtualForm'; + var _xhr = null; + if (_xhr && _xhr.readyState !== 0) _xhr.abort(); - if (!$('#'+frame_id).length) { - $(''.replace(/%id%/g, frame_id)).appendTo(document.body); - } + // 전송 성공시 + function onsuccess(data, textStatus, xhr) { + var resp_xml = $(data).find('response')[0], resp_obj, txt='', ret=[], tags={}, json_str=''; - $('#'+form_id).remove(); - var form = $('
    '.replace(/%id%/g, form_id)).attr({ - 'id' : form_id, - 'method' : 'post', - 'action' : url, - 'target' : frame_id - }); + waiting_obj.css('display', 'none').trigger('cancel_confirm'); - params['xeVirtualRequestMethod'] = 'xml'; - params['xeRequestURI'] = location.href.replace(/#(.*)$/i,''); - params['xeVirtualRequestUrl'] = request_uri; + if(!resp_xml) { + alert(_xhr.responseText); + return null; + } - $.each(params, function(key, value){ - $('').attr('name', key).attr('value', value).appendTo(form); - }); + json_str = xml2json(resp_xml, false, false); + resp_obj = jQuery.parseJSON(json_str); + resp_obj = resp_obj.response; - form.appendTo(document.body).submit(); -} -function arr2obj(arr) { - var ret = {}; - for(var key in arr) { - if(arr.hasOwnProperty(key)) ret[key] = arr[key]; - } - return ret; -} - - -/** - * @brief exec_json (exec_xml와 같은 용도) - **/ -$.exec_json = function(action,data,func,f_error){ - if(typeof(data) == 'undefined') data = {}; - action = action.split("."); - if(action.length == 2){ - // The cover can be disturbing if it consistently blinks (because ajax call usually takes very short time). So make it invisible for the 1st 0.5 sec and then make it visible. - var timeoutId = $(".wfsr").data('timeout_id'); - if(timeoutId) clearTimeout(timeoutId); - $(".wfsr").css('opacity', 0.0); - $(".wfsr").data('timeout_id', setTimeout(function(){ - $(".wfsr").css('opacity', ''); - }, 1000)); - if(show_waiting_message) $(".wfsr").html(waiting_message).show(); - - $.extend(data,{module:action[0],act:action[1]}); - if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid}); - $.ajax({ - type:"POST" - ,dataType:"json" - ,url:request_uri - ,contentType:"application/json" - ,data:$.param(data) - ,success : function(data){ - $(".wfsr").hide().trigger('cancel_confirm'); - if(data.error != 0 && data.error > -1000){ - if(data.error == -1 && data.message == 'msg_is_not_administrator'){ - alert('You are not logged in as an administrator'); - // window.location.reload(); - if($.isFunction(f_error)) f_error(data); - return; - }else{ - alert(data.message); - if($.isFunction(f_error)) f_error(data); - return; + if (typeof(resp_obj)=='undefined') { + ret.error = -1; + ret.message = 'Unexpected error occured.'; + try { + if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined') { + ret.message += '\r\n'+txt; } + } catch(e){} + + return ret; + } + + $.each(response_tags, function(key, val){ tags[val] = true; }); + tags.redirect_url = true; + tags.act = true; + $.each(resp_obj, function(key, val){ if(tags[key]) ret[key] = val; }); + + if(ret.error != '0') { + if ($.isFunction($.exec_xml.onerror)) { + return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj); } - if($.isFunction(func)) func(data); - } - }); - } -}; -$.fn.exec_html = function(action,data,type,func,args){ - if(typeof(data) == 'undefined') data = {}; - if(!$.inArray(type, ['html','append','prepend'])) type = 'html'; + alert( (ret.message || 'An unknown error occured while loading ['+module+'.'+act+']').replace(/\\n/g, '\n') ); - var self = $(this); - action = action.split("."); - if(action.length == 2){ - var timeoutId = $(".wfsr").data('timeout_id'); - if(timeoutId) clearTimeout(timeoutId); - $(".wfsr").css('opacity', 0.0); - $(".wfsr").data('timeout_id', setTimeout(function(){ - $(".wfsr").css('opacity', ''); - }, 1000)); - if(show_waiting_message) $(".wfsr").html(waiting_message).show(); + return null; + } - $.extend(data,{module:action[0],act:action[1]}); - $.ajax({ - type:"POST" - ,dataType:"html" - ,url:request_uri - ,data:$.param(data) - ,success : function(html){ - $(".wfsr").hide().trigger('cancel_confirm'); - self[type](html); - if($.isFunction(func)) func(args); - } - }); - } -}; + if(ret.redirect_url) { + location.href = ret.redirect_url.replace(/&/g, '&'); + return null; + } -function beforeUnloadHandler(){ - return ''; -} + if($.isFunction(callback_func)) callback_func(ret, response_tags, callback_func_arg, fo_obj); + } -$(function($){ - $('.wfsr') - .ajaxStart(function(){ - $(window).bind('beforeunload', beforeUnloadHandler); - }) - .bind('ajaxStop cancel_confirm', function(){ - $(window).unbind('beforeunload', beforeUnloadHandler); + // 모든 xml데이터는 POST방식으로 전송. try-catch문으로 오류 발생시 대처 + try { + $.ajax({ + url : xml_path, + type : 'POST', + dataType : 'xml', + data : xml.join('\n'), + contentType : 'text/plain', + beforeSend : function(xhr){ _xhr = xhr; }, + success : onsuccess, + error : function(xhr, textStatus) { + waiting_obj.css('display', 'none'); + + var msg = ''; + + if (textStatus == 'parsererror') { + msg = 'The result is not valid XML :\n-------------------------------------\n'; + + if(xhr.responseText === "") return; + + msg += xhr.responseText.replace(/<[^>]+>/g, ''); + } else { + msg = textStatus; + } + + try{ + console.log(msg); + } catch(ee){} + } + }); + } catch(e) { + alert(e); + return; + } + + // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음) + var waiting_obj = $('.wfsr'); + if(show_waiting_message && waiting_obj.length) { + + var timeoutId = $(".wfsr").data('timeout_id'); + if(timeoutId) clearTimeout(timeoutId); + $(".wfsr").css('opacity', 0.0); + $(".wfsr").data('timeout_id', setTimeout(function(){ + $(".wfsr").css('opacity', ''); + }, 1000)); + + waiting_obj.html(waiting_message).show(); + } + }; + + function send_by_form(url, params) { + var frame_id = 'xeTmpIframe'; + var form_id = 'xeVirtualForm'; + + if (!$('#'+frame_id).length) { + $(''.replace(/%id%/g, frame_id)).appendTo(document.body); + } + + $('#'+form_id).remove(); + var form = $('
    '.replace(/%id%/g, form_id)).attr({ + 'id' : form_id, + 'method' : 'post', + 'action' : url, + 'target' : frame_id }); -}); + + params.xeVirtualRequestMethod = 'xml'; + params.xeRequestURI = location.href.replace(/#(.*)$/i,''); + params.xeVirtualRequestUrl = request_uri; + + $.each(params, function(key, value){ + $('').attr('name', key).attr('value', value).appendTo(form); + }); + + form.appendTo(document.body).submit(); + } + + function arr2obj(arr) { + var ret = {}; + for(var key in arr) { + if(arr.hasOwnProperty(key)) ret[key] = arr[key]; + } + + return ret; + } + + + /** + * @brief exec_json (exec_xml와 같은 용도) + **/ + $.exec_json = function(action,data,func,f_error){ + if(typeof(data) == 'undefined') data = {}; + + action = action.split("."); + + if(action.length == 2) { + // The cover can be disturbing if it consistently blinks (because ajax call usually takes very short time). So make it invisible for the 1st 0.5 sec and then make it visible. + var timeoutId = $(".wfsr").data('timeout_id'); + + if(timeoutId) clearTimeout(timeoutId); + + $(".wfsr").css('opacity', 0.0); + $(".wfsr").data('timeout_id', setTimeout(function(){ + $(".wfsr").css('opacity', ''); + }, 1000)); + + if(show_waiting_message) $(".wfsr").html(waiting_message).show(); + + $.extend(data,{module:action[0],act:action[1]}); + + if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid}); + + $.ajax({ + type: "POST", + dataType: "json", + url: request_uri, + contentType: "application/json", + data: $.param(data), + success: function(data) { + $(".wfsr").hide().trigger('cancel_confirm'); + if(data.error != '0' && data.error > -1000) { + if(data.error == -1 && data.message == 'msg_is_not_administrator') { + alert('You are not logged in as an administrator'); + if($.isFunction(f_error)) f_error(data); + + return; + } else { + alert(data.message); + if($.isFunction(f_error)) f_error(data); + + return; + } + } + + if($.isFunction(func)) func(data); + } + }); + } + }; + + $.fn.exec_html = function(action,data,type,func,args){ + if(typeof(data) == 'undefined') data = {}; + if(!$.inArray(type, ['html','append','prepend'])) type = 'html'; + + var self = $(this); + action = action.split("."); + if(action.length == 2){ + var timeoutId = $(".wfsr").data('timeout_id'); + if(timeoutId) clearTimeout(timeoutId); + $(".wfsr").css('opacity', 0.0); + $(".wfsr").data('timeout_id', setTimeout(function(){ + $(".wfsr").css('opacity', ''); + }, 1000)); + if(show_waiting_message) $(".wfsr").html(waiting_message).show(); + + $.extend(data,{module:action[0],act:action[1]}); + $.ajax({ + type:"POST", + dataType:"html", + url:request_uri, + data:$.param(data), + success : function(html){ + $(".wfsr").hide().trigger('cancel_confirm'); + self[type](html); + if($.isFunction(func)) func(args); + } + }); + } + }; + + function beforeUnloadHandler(){ + return ''; + } + + $(function($){ + $('.wfsr') + .ajaxStart(function(){ + $(window).bind('beforeunload', beforeUnloadHandler); + }) + .bind('ajaxStop cancel_confirm', function(){ + $(window).unbind('beforeunload', beforeUnloadHandler); + }); + }); })(jQuery); diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index 5e2a8b40f..537fbde11 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -2,360 +2,366 @@ * @file common/js/xml_js_filter.js * @author NAVER (developers@xpressengine.com) * @brief xml filter (validator) plugin - * + * * A rule is a method validate one field. * A filter is made up of one or more rules. **/ (function($){ -var messages = []; -var rules = []; -var filters = {}; -var callbacks = []; -var extras = {}; + var messages = []; + var rules = []; + var filters = {}; + var callbacks = []; + var extras = {}; -var Validator = xe.createApp('Validator', { - init : function() { - // {{{ add filters - // email - var regEmail = /^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/; - this.cast('ADD_RULE', ['email', regEmail]); - this.cast('ADD_RULE', ['email_address', regEmail]); + var Validator = xe.createApp('Validator', { + init : function() { + // {{{ add filters + // email + var regEmail = /^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/; + this.cast('ADD_RULE', ['email', regEmail]); + this.cast('ADD_RULE', ['email_address', regEmail]); - // userid - var regUserid = /^[a-z]+[\w-]*[a-z0-9_]+$/i; - this.cast('ADD_RULE', ['userid', regUserid]); - this.cast('ADD_RULE', ['user_id', regUserid]); + // userid + var regUserid = /^[a-z]+[\w-]*[a-z0-9_]+$/i; + this.cast('ADD_RULE', ['userid', regUserid]); + this.cast('ADD_RULE', ['user_id', regUserid]); - // url - var regUrl = /^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/; - this.cast('ADD_RULE', ['url', regUrl]); - this.cast('ADD_RULE', ['homepage', regUrl]); + // url + var regUrl = /^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/; + this.cast('ADD_RULE', ['url', regUrl]); + this.cast('ADD_RULE', ['homepage', regUrl]); - // korean - var regKor = new RegExp('^[\uAC00-\uD7A3]*$'); - this.cast('ADD_RULE', ['korean', regKor]); + // korean + var regKor = new RegExp('^[\uAC00-\uD7A3]*$'); + this.cast('ADD_RULE', ['korean', regKor]); - // korean_number - var regKorNum = new RegExp('^[\uAC00-\uD7A30-9]*$'); - this.cast('ADD_RULE', ['korean_number', regKorNum]); + // korean_number + var regKorNum = new RegExp('^[\uAC00-\uD7A30-9]*$'); + this.cast('ADD_RULE', ['korean_number', regKorNum]); - // alpha - var regAlpha = /^[a-z]*$/i; - this.cast('ADD_RULE', ['alpha', regAlpha]); + // alpha + var regAlpha = /^[a-z]*$/i; + this.cast('ADD_RULE', ['alpha', regAlpha]); - // alpha_number - var regAlphaNum = /^[a-z][a-z0-9_]*$/i; - this.cast('ADD_RULE', ['alpha_number', regAlphaNum]); + // alpha_number + var regAlphaNum = /^[a-z][a-z0-9_]*$/i; + this.cast('ADD_RULE', ['alpha_number', regAlphaNum]); - // number - var regNum = /^[0-9]*$/; - this.cast('ADD_RULE', ['number', regNum]); - // }}} add filters - }, - // run validator - run : function(oForm) { - var filter = ''; + // number + var regNum = /^[0-9]*$/; + this.cast('ADD_RULE', ['number', regNum]); + // }}} add filters + }, + // run validator + run : function(oForm) { + var filter = ''; - if (oForm._filter) filter = oForm._filter.value; + if (oForm._filter) filter = oForm._filter.value; - var params = [oForm, filter]; - var result = this.cast('VALIDATE', params); - if (typeof result == 'undefined') result = false; + var params = [oForm, filter]; + var result = this.cast('VALIDATE', params); + if (typeof result == 'undefined') result = false; - return result; - }, - API_ONREADY : function() { - var self = this; + return result; + }, + API_ONREADY : function() { + var self = this; - // hook form submit event - $('form') - .each(function(){ - if (this.onsubmit) { - this['xe:onsubmit'] = this.onsubmit; - this.onsubmit = null; + // hook form submit event + $('form') + .each(function(){ + if (this.onsubmit) { + this['xe:onsubmit'] = this.onsubmit; + this.onsubmit = null; + } + }) + .submit(function(e){ + var legacyFn = this['xe:onsubmit']; + var hasLegacyFn = $.isFunction(legacyFn); + var bResult = hasLegacyFn?legacyFn.apply(this):self.run(this); + + if(!bResult) + { + e.stopImmediatePropagation(); + } + return bResult; + }); + }, + API_VALIDATE : function(sender, params) { + var result = true, form = params[0], elems = form.elements, filter, filter_to_add, ruleset, callback; + var fields, names, name, el, val, mod, len, lenb, max, min, maxb, minb, rules, e_el, e_val, i, c, r, if_, fn; + + if(elems.ruleset) { + filter = form.elements.ruleset.value; + } else if(elems._filter) { + filter = form.elements._filter.value; + } + + if(!filter) return true; + + if($.isFunction(callbacks[filter])) callback = callbacks[filter]; + filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras); + + function regex_quote(str) { + return str.replace(/([\.\+\-\[\]\{\}\(\)\\])/g, '\\$1'); + } + + // get form names + fields = []; + for(i=0,c=form.elements.length; i < c; i++) { + el = elems[i]; + name = el.name; + + if(!name || !elems[name]) continue; + if(!elems[name].length || elems[name][0] === el) fields.push(name); + } + fields = fields.join('\n'); + + // get field names matching patterns + filter_to_add = {}; + for(name in filter) { + if(!filter.hasOwnProperty(name)) continue; + + names = []; + if(name.substr(0,1) == '^') { + names = fields.match( (new RegExp('^'+regex_quote(name.substr(1))+'.*$','gm')) ); + } else { + continue; } - }) - .submit(function(e){ - var legacyFn = this['xe:onsubmit']; - var hasLegacyFn = $.isFunction(legacyFn); - var bResult = hasLegacyFn?legacyFn.apply(this):self.run(this); + if(!names) names = []; - if(!bResult) + for(i=0,c=names.length; i < c; i++) { + filter_to_add[names[i]]= filter[name]; + } + + filter[name] = null; + delete filter[name]; + } + + filter = $.extend(filter, filter_to_add); + + for(name in filter) { + if(!filter.hasOwnProperty(name)) continue; + + f = filter[name]; + el = elems[name]; + if(!el) { - e.stopImmediatePropagation(); + el = elems[name + '[]']; } - return bResult; - }); - }, - API_VALIDATE : function(sender, params) { - var result = true, form = params[0], elems = form.elements, filter, filter_to_add, ruleset, callback; - var fields, names, name, el, val, mod, len, lenb, max, min, maxb, minb, rules, e_el, e_val, i, c, r, if_, fn; - if(elems['ruleset']) filter = form.elements['ruleset'].value; - else if(elems['_filter']) filter = form.elements['_filter'].value; - if(!filter) return true; + val = el?$.trim(get_value($(el))):''; + mod = (f.modifier||'')+','; - if($.isFunction(callbacks[filter])) callback = callbacks[filter]; - filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras); - function regex_quote(str){ - return str.replace(/([\.\+\-\[\]\{\}\(\)\\])/g, '\\$1'); - }; + if(!el || el.disabled) continue; - // get form names - fields = []; - for(i=0,c=form.elements.length; i < c; i++) { - el = elems[i]; - name = el.name; + if(f['if']) { + if(!$.isArray(f['if'])) f['if'] = [f['if']]; + for(i=0;i (minb?lenb:len)) || (max && max < (maxb?lenb:len))) { + return this.cast('ALERT', [form, name, 'outofrange', min, max]) && false; + } + + if(f.equalto) { + e_el = elems[f.equalto]; + e_val = e_el?$.trim(get_value($(e_el))):''; + if(e_el && e_val !== val) { + return this.cast('ALERT', [form, name, 'equalto']) && false; + } + } + + rules = (f.rule || '').split(','); + for(i=0,c=rules.length; i < c; i++) { + if(!(r = rules[i])) continue; + + result = this.cast('APPLY_RULE', [r, val]); + if(mod.indexOf('not,') > -1) result = !result; + if(!result) { + return this.cast('ALERT', [form, name, 'invalid_'+r]) && false; + } + } + } + + if($.isFunction(callback)) return callback(form); + + return true; + }, + API_ADD_RULE : function(sender, params) { + var name = params[0].toLowerCase(); + rules[name] = params[1]; + }, + API_DEL_RULE : function(sender, params) { + var name = params[0].toLowerCase(); + delete rules[name]; + }, + API_GET_RULE : function(sender, params) { + var name = params[0].toLowerCase(); + + if (rules[name]) { + return rules[name]; } else { - continue; + return null; } - if(!names) names = []; + }, + API_ADD_FILTER : function(sender, params) { + var name = params[0].toLowerCase(); + var filter = params[1]; - for(i=0,c=names.length; i < c; i++) { - filter_to_add[names[i]]= filter[name]; + filters[name] = filter; + }, + API_DEL_FILTER : function(sender, params) { + var name = params[0].toLowerCase(); + delete filters[name]; + }, + API_GET_FILTER : function(sender, params) { + var name = params[0].toLowerCase(); + + if (filters[name]) { + return filters[name]; + } else { + return null; } + }, + API_ADD_EXTRA_FIELD : function(sender, params) { + var name = params[0].toLowerCase(); + var prop = params[1]; - filter[name] = null; - delete filter[name]; - }; + extras[name] = prop; + }, + API_GET_EXTRA_FIELD : function(sender, params) { + var name = params[0].toLowerCase(); + return extras[name]; + }, + API_DEL_EXTRA_FIELD : function(sender, params) { + var name = params[0].toLowerCase(); + delete extras[name]; + }, + API_APPLY_RULE : function(sender, params) { + var name = params[0]; + var value = params[1]; - filter = $.extend(filter, filter_to_add); + if(typeof(rules[name]) == 'undefined') return true; // no filter + if($.isFunction(rules[name])) return rules[name](value); + if(rules[name] instanceof RegExp) return rules[name].test(value); + if($.isArray(rules[name])) return ($.inArray(value, rules[name]) > -1); - for(name in filter) { - if(!filter.hasOwnProperty(name)) continue; + return true; + }, + API_ALERT : function(sender, params) { + var form = params[0]; + var field_name = params[1]; + var msg_code = params[2]; + var minlen = params[3]; + var maxlen = params[4]; - f = filter[name]; - el = elems[name]; - if(!el) - { - el = elems[name + '[]']; + var field_msg = this.cast('GET_MESSAGE', [field_name]); + var msg = this.cast('GET_MESSAGE', [msg_code]); + + if (msg != msg_code) msg = (msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg)); + if (minlen||maxlen) msg += '('+(minlen||'')+'~'+(maxlen||'')+')'; + + this.cast('SHOW_ALERT', [msg]); + + // set focus + $(form.elements[field_name]).focus(); + }, + API_SHOW_ALERT : function(sender, params) { + alert(params[0]); + }, + API_ADD_MESSAGE : function(sender, params) { + var msg_code = params[0]; + var msg_str = params[1]; + + messages[msg_code] = msg_str; + }, + API_GET_MESSAGE : function(sender, params) { + var msg_code = params[0]; + + return messages[msg_code] || msg_code; + }, + API_ADD_CALLBACK : function(sender, params) { + var name = params[0]; + var func = params[1]; + + callbacks[name] = func; + }, + API_REMOVE_CALLBACK : function(sender, params) { + var name = params[0]; + + delete callbacks[name]; + } + }); + + var oValidator = new Validator(); + + // register validator + xe.registerApp(oValidator); + + // 호환성을 위해 추가한 플러그인 - 에디터에서 컨텐트를 가져와서 설정한다. + var EditorStub = xe.createPlugin('editor_stub', { + API_BEFORE_VALIDATE : function(sender, params) { + var form = params[0]; + var seq = form.getAttribute('editor_sequence'); + + // bug fix for IE6,7 + if (seq && typeof seq == 'object') seq = seq.value; + + if (seq) { + try { + editorRelKeys[seq].content.value = editorRelKeys[seq].func(seq) || ''; + } catch(e) { } } - val = el?$.trim(get_value($(el))):''; - mod = (f.modifier||'')+','; + } + }); + oValidator.registerPlugin(new EditorStub()); - - if(!el || el.disabled) continue; - - if(f['if']) { - if(!$.isArray(f['if'])) f['if'] = [f['if']]; - for(i=0;i (minb?lenb:len)) || (max && max < (maxb?lenb:len))) { - return this.cast('ALERT', [form, name, 'outofrange', min, max]) && false; - } - - if(f.equalto) { - e_el = elems[f.equalto]; - e_val = e_el?$.trim(get_value($(e_el))):''; - if(e_el && e_val !== val) { - return this.cast('ALERT', [form, name, 'equalto']) && false; - } - } - - rules = (f.rule || '').split(','); - for(i=0,c=rules.length; i < c; i++) { - if(!(r = rules[i])) continue; - - result = this.cast('APPLY_RULE', [r, val]); - if(mod.indexOf('not,') > -1) result = !result; - if(!result) { - return this.cast('ALERT', [form, name, 'invalid_'+r]) && false; - } - } - }; - - if($.isFunction(callback)) return callback(form); - - return true; - }, - API_ADD_RULE : function(sender, params) { - var name = params[0].toLowerCase(); - rules[name] = params[1]; - }, - API_DEL_RULE : function(sender, params) { - var name = params[0].toLowerCase(); - delete rules[name]; - }, - API_GET_RULE : function(sender, params) { - var name = params[0].toLowerCase(); - - if (rules[name]) { - return rules[name]; + // functions + function get_value($elem) { + var vals = []; + if ($elem.is(':radio')){ + return $elem.filter(':checked').val(); + } else if ($elem.is(':checkbox')) { + $elem.filter(':checked').each(function(){ + vals.push(this.value); + }); + return vals.join('|@|'); } else { - return null; - } - }, - API_ADD_FILTER : function(sender, params) { - var name = params[0].toLowerCase(); - var filter = params[1]; - - filters[name] = filter; - }, - API_DEL_FILTER : function(sender, params) { - var name = params[0].toLowerCase(); - delete filters[name]; - }, - API_GET_FILTER : function(sender, params) { - var name = params[0].toLowerCase(); - - if (filters[name]) { - return filters[name]; - } else { - return null; - } - }, - API_ADD_EXTRA_FIELD : function(sender, params) { - var name = params[0].toLowerCase(); - var prop = params[1]; - - extras[name] = prop; - }, - API_GET_EXTRA_FIELD : function(sender, params) { - var name = params[0].toLowerCase(); - return extras[name]; - }, - API_DEL_EXTRA_FIELD : function(sender, params) { - var name = params[0].toLowerCase(); - delete extras[name]; - }, - API_APPLY_RULE : function(sender, params) { - var name = params[0]; - var value = params[1]; - - if(typeof(rules[name]) == 'undefined') return true; // no filter - if($.isFunction(rules[name])) return rules[name](value); - if(rules[name] instanceof RegExp) return rules[name].test(value); - if($.isArray(rules[name])) return ($.inArray(value, rules[name]) > -1); - - return true; - }, - API_ALERT : function(sender, params) { - var form = params[0]; - var field_name = params[1]; - var msg_code = params[2]; - var minlen = params[3]; - var maxlen = params[4]; - - var field_msg = this.cast('GET_MESSAGE', [field_name]); - var msg = this.cast('GET_MESSAGE', [msg_code]); - - if (msg != msg_code) msg = (msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg)); - if (minlen||maxlen) msg += '('+(minlen||'')+'~'+(maxlen||'')+')'; - - this.cast('SHOW_ALERT', [msg]); - - // set focus - $(form.elements[field_name]).focus(); - }, - API_SHOW_ALERT : function(sender, params) { - alert(params[0]); - }, - API_ADD_MESSAGE : function(sender, params) { - var msg_code = params[0]; - var msg_str = params[1]; - - messages[msg_code] = msg_str; - }, - API_GET_MESSAGE : function(sender, params) { - var msg_code = params[0]; - - return messages[msg_code] || msg_code; - }, - API_ADD_CALLBACK : function(sender, params) { - var name = params[0]; - var func = params[1]; - - callbacks[name] = func; - }, - API_REMOVE_CALLBACK : function(sender, params) { - var name = params[0]; - - delete callbacks[name]; - } -}); - -var oValidator = new Validator; - -// register validator -xe.registerApp(oValidator); - -// 호환성을 위해 추가한 플러그인 - 에디터에서 컨텐트를 가져와서 설정한다. -var EditorStub = xe.createPlugin('editor_stub', { - API_BEFORE_VALIDATE : function(sender, params) { - var form = params[0]; - var seq = form.getAttribute('editor_sequence'); - - // bug fix for IE6,7 - if (seq && typeof seq == 'object') seq = seq.value; - - if (seq) { - try { - editorRelKeys[seq].content.value = editorRelKeys[seq].func(seq) || ''; - } catch(e) { } + return $elem.val(); } } -}); -oValidator.registerPlugin(new EditorStub); -// functions -function get_value($elem) { - var vals = []; - if ($elem.is(':radio')){ - return $elem.filter(':checked').val(); - } else if ($elem.is(':checkbox')) { - $elem.filter(':checked').each(function(){ - vals.push(this.value); - }); - return vals.join('|@|'); - } else { - return $elem.val(); + function get_bytes(str) { + str += ''; + if(!str.length) return 0; + + str = encodeURI(str); + var c = str.split('%').length - 1; + + return str.length - c*2; } -} - -function get_bytes(str) { - str += ''; - if(!str.length) return 0; - - str = encodeURI(str); - var c = str.split('%').length - 1; - - return str.length - c*2; -} })(jQuery); @@ -364,16 +370,16 @@ function get_bytes(str) { * @brief ajax로 서버에 요청후 결과를 처리할 callback_function을 지정하지 않았을 시 호출되는 기본 함수 **/ function filterAlertMessage(ret_obj) { - var error = ret_obj["error"]; - var message = ret_obj["message"]; - var act = ret_obj["act"]; - var redirect_url = ret_obj["redirect_url"]; + var error = ret_obj.error; + var message = ret_obj.message; + var act = ret_obj.act; + var redirect_url = ret_obj.redirect_url; var url = location.href; - if(typeof(message)!="undefined"&&message&&message!="success") alert(message); + if(typeof(message) != "undefined" && message && message != "success") alert(message); if(typeof(act)!="undefined" && act) url = current_url.setQuery("act", act); - else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url; + else if(typeof(redirect_url) != "undefined" && redirect_url) url = redirect_url; if(url == location.href) url = url.replace(/#(.*)$/,''); @@ -394,8 +400,8 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf if (!v) return false; - if (!form.elements['_filter']) $(form).prepend(''); - form.elements['_filter'].value = filter_name; + if (!form.elements._filter) $(form).prepend(''); + form.elements._filter.value = filter_name; args[0] = filter_name; args[1] = function(f) { @@ -404,13 +410,17 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf var v = $.trim(field.value), n = field.name; if(!v || !n) return true; if(rename_params[n]) n = rename_params[n]; - + if(/\[\]$/.test(n)) n = n.replace(/\[\]$/, ''); - if(params[n]) params[n] += '|@|'+v; - else params[n] = field.value; + if(params[n]) { + params[n] += '|@|'+v; + } else { + params[n] = field.value; + } }); if (confirm_msg && !confirm(confirm_msg)) return false; + exec_xml(module, act, params, callback, responses, params, form); }; From c75af7e5189cd75f3d745e78d42c9c31a2cc4c68 Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 20 Nov 2013 19:25:45 +0900 Subject: [PATCH 059/473] =?UTF-8?q?fixed=20#30=20=EC=83=88=20=EC=AA=BD?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20=EA=B0=80=EC=A0=B8=EC=98=AC=20=EB=95=8C=20?= =?UTF-8?q?=EB=B0=9B=EC=9D=80=20=EC=AA=BD=EC=A7=80=EB=A7=8C=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=EB=A7=81=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20=ED=98=84=EC=9E=AC=20=EB=B3=B4=EB=82=B8=20?= =?UTF-8?q?=EC=AA=BD=EC=A7=80=EB=A5=BC=20=ED=95=A8=EA=BB=98=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=99=80=20=EC=A4=91=EB=B3=B5=EB=90=98=EC=96=B4=20?= =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=8C=85=20=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communication/queries/getNewMessage.xml | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/communication/queries/getNewMessage.xml b/modules/communication/queries/getNewMessage.xml index 0e2549ab9..1c5b4b72a 100644 --- a/modules/communication/queries/getNewMessage.xml +++ b/modules/communication/queries/getNewMessage.xml @@ -1,20 +1,21 @@ - - -
    - - - - - - - - - - - - - - - + +
    +
    + + + + + + + + + + + + + + + + From a00f2d1033d1f430a3f3380dc58db48308ddfd99 Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 20 Nov 2013 22:52:17 +0900 Subject: [PATCH 060/473] =?UTF-8?q?=5FZBXE=5FVERSION=5F=20=EB=8C=80?= =?UTF-8?q?=EC=B2=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/template/TemplateHandler.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 19e9a9d20..706008492 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -97,7 +97,7 @@ class TemplateHandler $this->web_path = $this->xe_path . '/' . ltrim(preg_replace('@^' . preg_quote(_XE_PATH_, '@') . '|\./@', '', $this->path), '/'); // get compiled file name - $hash = md5($this->file . __ZBXE_VERSION__); + $hash = md5($this->file . __XE_VERSION__); $this->compiled_file = "{$this->compiled_path}{$hash}.compiled.php"; // compare various file's modified time for check changed From 6ebf867277880731ca38ad28f3bbb0e34bd70125 Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 21 Nov 2013 07:17:22 +0900 Subject: [PATCH 061/473] =?UTF-8?q?#43=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=A0=EA=B8=88=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/help/index.html | 2 + classes/context/Context.class.php | 30 +++++++++++++ common/tpl/sitelock.html | 56 ++++++++++++++++++++++++ modules/admin/admin.admin.controller.php | 25 +++++++++++ modules/admin/admin.admin.view.php | 9 ++++ modules/admin/conf/module.xml | 1 + modules/admin/lang/lang.xml | 19 ++++++++ modules/admin/ruleset/sitelock.xml | 15 +++++++ modules/admin/tpl/config_general.html | 46 +++++++++++++++++++ 9 files changed, 203 insertions(+) create mode 100644 common/tpl/sitelock.html create mode 100644 modules/admin/ruleset/sitelock.xml diff --git a/admin/help/index.html b/admin/help/index.html index 857abd807..3de760e01 100644 --- a/admin/help/index.html +++ b/admin/help/index.html @@ -418,6 +418,8 @@ body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,
  • SSO 사용: 사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 됩니다. 가상 사이트를 사용할 때만 필요합니다.
  • 인증 세션 DB 사용: 인증 시 사용되는 PHP 세션을 DB로 사용하는 기능입니다. 웹서버의 사용률이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다. 단, 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.
  • Qmail 호환: Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.
    • +
  • 사이트 잠금: 지정한 IP 외 접근을 차단할 수 있습니다.
    • +
  • 접근 허용 IP: 이곳에 관리자의 IP가 반드시 포함되어야 합니다. 만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `$db_info->use_sitelock`를 'N'으로 변경하여 차단을 해제할 수 있습니다.
    • FTP 설정
    diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index f9e803b9f..a9c0e4212 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -214,6 +214,28 @@ class Context $this->loadDBInfo(); + $context = Context::getInstance(); + + if($context->db_info->use_sitelock == 'Y') { + $whitelist = array('127.0.0.1', '::1', 'fe80::1'); + if(is_array($context->db_info->sitelock_whitelist)) $whitelist = array_merge($whitelist, $context->db_info->sitelock_whitelist); + + if(in_array($_SERVER['REMOTE_ADDR'], $whitelist)) { + $title = ($context->db_info->sitelock_title) ? $context->db_info->sitelock_title : 'Maintenance in progress...'; + $message = $context->db_info->sitelock_message; + $image = './modules/admin/tpl/img/xe.h1.png'; + + define('_XE_SITELOCK_', TRUE); + define('_XE_SITELOCK_TITLE_', $title); + define('_XE_SITELOCK_MESSAGE_', nl2br($message)); + define('_XE_SITELOCK_IMAGE_', $image); + + header('403 Forbidden'); + include _XE_PATH_ . 'common/tpl/sitelock.html'; + exit; + } + } + // If XE is installed, get virtual site information if(Context::isInstalled()) { @@ -474,6 +496,14 @@ class Context if($db_info->https_port) $self->set('_https_port', $db_info->https_port); + if(!$db_info->sitelock_whitelist) { + $db_info->sitelock_whitelist = '127.0.0.1,::1,fe80::1'; + } + + if(is_string($db_info->sitelock_whitelist)) { + $db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist); + } + $self->setDBInfo($db_info); } diff --git a/common/tpl/sitelock.html b/common/tpl/sitelock.html new file mode 100644 index 000000000..dd4e775d8 --- /dev/null +++ b/common/tpl/sitelock.html @@ -0,0 +1,56 @@ + + + + + <?php echo _XE_SITELOCK_TITLE_?> + + + + +
    +
    + +

    +

     

    +
    +
    + + diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index e21a7443c..b783e35b9 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -480,6 +480,31 @@ class adminAdminController extends admin $this->setMessage('success_deleted'); } + function procAdminUpdateSitelock() + { + $vars = Context::getRequestVars(); + $oInstallController = &getController('install'); + + $config_file = Context::getConfigFile(); + $db_info = Context::getDbInfo(); + + $db_info->use_sitelock = ($vars->use_sitelock) ? $vars->use_sitelock : 'N'; + $db_info->sitelock_title = $vars->sitelock_title; + $db_info->sitelock_message = $vars->sitelock_message; + + $db_info->sitelock_whitelist = preg_replace("/[\r\n|\r|\n]+/", ",", $vars->sitelock_whitelist); + + $buff = $oInstallController->_getDBConfigFileContents($db_info); + FileHandler::writeFile($config_file, $buff); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) + { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral'); + header('location:'.$returnUrl); + return; + } + } + } /* End of file admin.admin.controller.php */ /* Location: ./modules/admin/admin.admin.controller.php */ diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index afe1fb678..2ba3863f4 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -412,6 +412,15 @@ class adminAdminView extends admin Context::set('default_url', $db_info->default_url); Context::set('langs', Context::loadLangSupported()); + // site lock + if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...'; + if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR']; + Context::set('remote_addr', $_SERVER['REMOTE_ADDR']); + Context::set('use_sitelock', $db_info->use_sitelock); + Context::set('sitelock_title', $db_info->sitelock_title); + Context::set('sitelock_message', $db_info->sitelock_message); + Context::set('sitelock_whitelist', implode(PHP_EOL, $db_info->sitelock_whitelist)); + Context::set('lang_selected', Context::loadLangSelected()); $admin_ip_list = preg_replace("/[,]+/", "\r\n", $db_info->admin_ip_list); diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml index 01b64e8fa..5d1fbad2c 100644 --- a/modules/admin/conf/module.xml +++ b/modules/admin/conf/module.xml @@ -17,6 +17,7 @@ + diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index c5b3d3ac8..604b53c6e 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -1503,4 +1503,23 @@ + + + + + + + + + + + + + + + 만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `$db_info->use_sitelock`를 'N'으로 변경하여 차단을 해제할 수 있습니다.]]> + + + + diff --git a/modules/admin/ruleset/sitelock.xml b/modules/admin/ruleset/sitelock.xml new file mode 100644 index 000000000..de7f8cbd0 --- /dev/null +++ b/modules/admin/ruleset/sitelock.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html index 766347010..1190361d3 100644 --- a/modules/admin/tpl/config_general.html +++ b/modules/admin/tpl/config_general.html @@ -199,6 +199,52 @@ + + +
    +

    사이트 잠금

    +
    + + + + +
    + +
    + + +
    +
    + +
    + +
    + + {$lang->sitelock_warning_whitelist} + {$lang->your_ip} : {$remote_addr} +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + \ No newline at end of file diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php index 8e1bb4269..b775494df 100644 --- a/modules/integration_search/integration_search.admin.view.php +++ b/modules/integration_search/integration_search.admin.view.php @@ -63,7 +63,7 @@ class integration_searchAdminView extends integration_search $security->encodeHTML('skin_list..title'); // Sample Code - Context::set('sample_code', htmlspecialchars('
    ') ); + Context::set('sample_code', htmlspecialchars('
    ', ENT_COMPAT | ENT_HTML401, 'UTF-8', false) ); $this->setTemplateFile("index"); } diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index b739917a1..023739c76 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -191,7 +191,7 @@ class integration_searchModel extends module $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop'); $thumbnail_url = Context::getRequestUri().$thumbnail_file; if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop'); - $obj->src = sprintf('%s', $thumbnail_url, htmlspecialchars($obj->filename), 120, 120); + $obj->src = sprintf('%s', $thumbnail_url, htmlspecialchars($obj->filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 120, 120); // Videos } else if(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) diff --git a/modules/integration_search/skins/default/trackback.html b/modules/integration_search/skins/default/trackback.html index 07f0ac52c..c37a70e15 100644 --- a/modules/integration_search/skins/default/trackback.html +++ b/modules/integration_search/skins/default/trackback.html @@ -16,10 +16,10 @@
  • -
    {htmlspecialchars($trackback->title)}
    -
    {cut_str(htmlspecialchars($trackback->excerpt))}
    +
    {htmlspecialchars($trackback->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}
    +
    {cut_str(htmlspecialchars($trackback->excerpt, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))}
    -
    {htmlspecialchars($trackback->blog_name)} | {zdate($trackback->regdate, "Y-m-d H:i")}
    +
    {htmlspecialchars($trackback->blog_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} | {zdate($trackback->regdate, "Y-m-d H:i")}
    • diff --git a/modules/integration_search/tpl/skin_info.html b/modules/integration_search/tpl/skin_info.html index e8bfe7e1d..0c42468be 100644 --- a/modules/integration_search/tpl/skin_info.html +++ b/modules/integration_search/tpl/skin_info.html @@ -97,10 +97,10 @@
    - + - + ") !== false)-->{htmlspecialchars($var->value)}{$var->value}" /> + ") !== false)-->{htmlspecialchars($var->value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}{$var->value}" />
    {@$use_multilang_textarea = true} - +
    diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index 06e344f7e..38d638472 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -73,7 +73,7 @@ class memberAdminModel extends member case 'nick_name' : if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword); $args->s_nick_name = $search_keyword; - $args->html_nick_name = htmlspecialchars($search_keyword); + $args->html_nick_name = htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); break; case 'email_address' : if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index e0c2c27ae..6a4d76910 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1874,9 +1874,9 @@ class memberController extends member $oDB->begin(); // Insert data into the DB $args->list_order = -1 * $args->member_srl; - $args->nick_name = htmlspecialchars($args->nick_name); - $args->homepage = htmlspecialchars($args->homepage); - $args->blog = htmlspecialchars($args->blog); + $args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); + $args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); + $args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); if($args->password && !$password_is_hashed) $args->password = md5($args->password); elseif(!$args->password) unset($args->password); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 08518a6db..1d96e7713 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -141,16 +141,16 @@ class memberModel extends member // Send an email if($member_info->email_address) { - $url = 'mailto:'.htmlspecialchars($member_info->email_address); + $url = 'mailto:'.htmlspecialchars($member_info->email_address, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); $oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path); } } // View homepage info if($member_info->homepage) - $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', '', 'blank'); + $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank'); // View blog info if($member_info->blog) - $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', '', 'blank'); + $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank'); // Call a trigger (after) ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null); // Display a menu for editting member info to a top administrator diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 8edab4b28..380cecffd 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -416,7 +416,7 @@ class memberView extends member Context::set('identifier', $config->identifier); // Set a template file - Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'])); + Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); $this->setTemplateFile('login_form'); } diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index 559b1911a..93e74f865 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -16,7 +16,7 @@ - +
    diff --git a/modules/member/skins/default/scrapped_list.html b/modules/member/skins/default/scrapped_list.html index 3d4c3d267..f80d4e635 100644 --- a/modules/member/skins/default/scrapped_list.html +++ b/modules/member/skins/default/scrapped_list.html @@ -14,7 +14,7 @@
    - + diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index f36cf5971..65be4c827 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -52,7 +52,7 @@
    - + {$lang->help}
    @@ -60,7 +60,7 @@ diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index f7530a2bd..e931028ff 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -17,7 +17,7 @@ - + diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index cadab8c32..9a5d6901e 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -124,7 +124,7 @@ {@$lang->search_target_list = array_merge($lang->search_target_list, $usedIdentifiers)} - + {$lang->cmd_cancel} diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index c113fd16b..06da686d8 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1731,7 +1731,7 @@ class menuAdminController extends menu $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl); foreach($names as $key => $val) { - $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val))); + $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))); } $name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str); @@ -1765,7 +1765,7 @@ class menuAdminController extends menu else $classname = ''; if($hover_btn) $hover_str = sprintf('onmouseover="this.src=\'%s\'"', $hover_btn); else $hover_str = ''; if($active_btn) $active_str = sprintf('onmousedown="this.src=\'%s\'"', $active_btn); else $active_str = ''; - $link = sprintf('<img src="%s" onmouseout="this.src=\'%s\'" alt="" %s %s %s />', $normal_btn, $normal_btn, $hover_str, $active_str, $classname); + $link = sprintf('<img src="%s" onmouseout="this.src=\'%s\'" alt="" %s %s %s />', $normal_btn, $normal_btn, $hover_str, $active_str, $classname); } else { diff --git a/modules/module/tpl/adminFileBox.html b/modules/module/tpl/adminFileBox.html index 3668b7465..7173737a2 100644 --- a/modules/module/tpl/adminFileBox.html +++ b/modules/module/tpl/adminFileBox.html @@ -67,7 +67,7 @@ - {@ $browser_title = str_replace("'", "\\'", htmlspecialchars($v->browser_title)); } + {@ $browser_title = str_replace("'", "\\'", htmlspecialchars($v->browser_title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } diff --git a/modules/module/tpl/module_setup.html b/modules/module/tpl/module_setup.html index 6cbb282fb..43cbc7ef2 100644 --- a/modules/module/tpl/module_setup.html +++ b/modules/module/tpl/module_setup.html @@ -49,7 +49,7 @@
    - + {$lang->help}
    @@ -57,7 +57,7 @@
    - + {$lang->help}
    @@ -65,7 +65,7 @@
    - + {$lang->help}
    diff --git a/modules/module/tpl/multilingual_v17_list.html b/modules/module/tpl/multilingual_v17_list.html index 2bc170b16..e6944e073 100644 --- a/modules/module/tpl/multilingual_v17_list.html +++ b/modules/module/tpl/multilingual_v17_list.html @@ -25,9 +25,9 @@
    -
    +
    - + diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html index 33f054a6b..03b705bbf 100644 --- a/modules/module/tpl/skin_config.html +++ b/modules/module/tpl/skin_config.html @@ -90,10 +90,10 @@
    - + - +
    - +
    {$oDocument->getEditor()}
    - +

    {$lang->about_tag}

    diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index 885a96123..5f733005f 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -19,7 +19,7 @@ - + {$lang->cmd_cancel} @@ -156,4 +156,4 @@ jQuery(function($){ } }); }); - \ No newline at end of file + diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 520abe078..f9f99c332 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -9,7 +9,7 @@ - +
    diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index 7d540a6c3..b0aae9a12 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -99,7 +99,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}'; - + {$lang->cmd_cancel} @@ -123,4 +123,4 @@ jQuery(function($){ } }); }); - \ No newline at end of file + diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php index afdcacfa8..b00382355 100644 --- a/modules/rss/rss.view.php +++ b/modules/rss/rss.view.php @@ -104,17 +104,17 @@ class rssView extends rss $info->title = str_replace('\'', ''',$info->title); if($config->feed_description) { - $info->description = str_replace('\'', ''', htmlspecialchars($config->feed_description)); + $info->description = str_replace('\'', ''', htmlspecialchars($config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } else { - $info->description = str_replace('\'', ''', htmlspecialchars($this->module_info->description)); + $info->description = str_replace('\'', ''', htmlspecialchars($this->module_info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } $info->link = getUrl('','mid',$mid); - $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($feed_config->feed_copyright)); + $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($feed_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); if(!$info->feed_copyright) { - $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($total_config->feed_copyright)); + $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } } } @@ -131,14 +131,14 @@ class rssView extends rss } $oModuleController->replaceDefinedLangCode($info->title); - $info->title = str_replace('\'', ''', htmlspecialchars($info->title)); - $info->description = str_replace('\'', ''', htmlspecialchars($total_config->feed_description)); + $info->title = str_replace('\'', ''', htmlspecialchars($info->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); + $info->description = str_replace('\'', ''', htmlspecialchars($total_config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); $info->link = Context::getRequestUri(); - $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($total_config->feed_copyright)); + $info->feed_copyright = str_replace('\'', ''', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } if($add_description) $info->description .= "\r\n".$add_description; - if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', ''', htmlspecialchars($total_config->image)); + if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', ''', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); switch(Context::get('format')) { case 'atom': diff --git a/modules/rss/tpl/atom10.html b/modules/rss/tpl/atom10.html index 4a4b6b0fd..6e0d96b87 100644 --- a/modules/rss/tpl/atom10.html +++ b/modules/rss/tpl/atom10.html @@ -3,7 +3,7 @@ {$info->title} - {str_replace('\'', ''', htmlspecialchars($info->description))} + {str_replace('\'', ''', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$info->date} {$info->id} @@ -11,7 +11,7 @@ XpressEngine - {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText()))} + {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getPermanentUrl()} {$oDocument->getRegdate('Y-m-d\TH:i:sP')} {zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')} @@ -24,12 +24,12 @@ - {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} - {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} - + diff --git a/modules/rss/tpl/rss10.html b/modules/rss/tpl/rss10.html index 9bffb2dba..170a25346 100644 --- a/modules/rss/tpl/rss10.html +++ b/modules/rss/tpl/rss10.html @@ -4,7 +4,7 @@ {$info->title} {$info->link} - {str_replace('\'', ''', htmlspecialchars($info->description))} + {str_replace('\'', ''', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} @@ -17,9 +17,9 @@ - {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText()))} + {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getPermanentUrl()} - {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(200)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(200), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getRegdate('Y-m-d\TH:i:sP')} diff --git a/modules/rss/tpl/rss20.html b/modules/rss/tpl/rss20.html index 9cddb2024..25524f78e 100644 --- a/modules/rss/tpl/rss20.html +++ b/modules/rss/tpl/rss20.html @@ -21,7 +21,7 @@ - {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText()))} + {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {str_replace('\'', ''',$oDocument->getNickName())} {$oDocument->getPermanentUrl()} {$oDocument->getPermanentUrl()} @@ -29,13 +29,13 @@ {$oDocument->getPermanentUrl()}#comment - {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} - {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getRegdateGM()} - {str_replace('\'', ''', htmlspecialchars($tag))} + {str_replace('\'', ''', htmlspecialchars($tag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getCommentcount()} diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html index 772cac2c7..aa0ae58d9 100644 --- a/modules/rss/tpl/rss_admin_index.html +++ b/modules/rss/tpl/rss_admin_index.html @@ -28,7 +28,7 @@
    - +
    @@ -57,7 +57,7 @@
    - +
    diff --git a/modules/rss/tpl/rss_module_config.html b/modules/rss/tpl/rss_module_config.html index a9cc970e9..b0bff0107 100644 --- a/modules/rss/tpl/rss_module_config.html +++ b/modules/rss/tpl/rss_module_config.html @@ -28,14 +28,14 @@
    - +

    {$lang->about_feed_description}

    - +

    {$lang->about_feed_copyright}

    diff --git a/modules/rss/tpl/xe_rss.html b/modules/rss/tpl/xe_rss.html index 6aae31cc4..233e237b3 100644 --- a/modules/rss/tpl/xe_rss.html +++ b/modules/rss/tpl/xe_rss.html @@ -4,22 +4,22 @@ {$info->title} {$info->link} - {str_replace('\'', ''', htmlspecialchars($info->description))} + {str_replace('\'', ''', htmlspecialchars($info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$info->language} {$info->date} {$info->total_count} {$info->total_page} - {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText()))} + {str_replace('\'', ''',htmlspecialchars($oDocument->getTitleText(), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {str_replace('\'', ''',$oDocument->getNickName())} {$oDocument->getPermanentUrl()} - {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getTransContent(false,false,true), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} - {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100)))} + {str_replace('\'', ''', htmlspecialchars($oDocument->getContentText(100), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} - {str_replace('\'', ''', htmlspecialchars($oDocument->get('tags')))} + {str_replace('\'', ''', htmlspecialchars($oDocument->get('tags'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false))} {$oDocument->getCommentCount()} {$oDocument->getTrackbackCount()} {$oDocument->getRegdateGM()} diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 10ed25382..4ebd91dd1 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -29,10 +29,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
    - + @@ -90,7 +90,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - + {$lang->cmd_cancel} @@ -142,4 +142,4 @@ jQuery(function($){ } }); }); - \ No newline at end of file + diff --git a/modules/trash/model/TrashVO.php b/modules/trash/model/TrashVO.php index 154f0befc..98296387d 100644 --- a/modules/trash/model/TrashVO.php +++ b/modules/trash/model/TrashVO.php @@ -24,7 +24,7 @@ class TrashVO function getTitle() { if(empty($this->title)) return $lang->untitle; - return htmlspecialchars($this->title); + return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); } function setTitle($title) { @@ -49,7 +49,7 @@ class TrashVO } function getDescription() { - return htmlspecialchars($this->description); + return htmlspecialchars($this->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); } function setDescription($description) { @@ -81,7 +81,7 @@ class TrashVO } function getNickName() { - return htmlspecialchars($this->nickName); + return htmlspecialchars($this->nickName, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); } function setNickName($nickName) { diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 94beded98..61700979f 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -530,7 +530,7 @@ class widgetController extends widget { if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue; if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val); - $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val)); + $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } } @@ -566,7 +566,7 @@ class widgetController extends widget if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue; if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue; if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val); - $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val)); + $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } } @@ -591,7 +591,7 @@ class widgetController extends widget if(in_array($key, $allowed_key)) continue; if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue; if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val); - $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val)); + $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } } @@ -763,7 +763,7 @@ class widgetController extends widget } if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val); $vars->{$key} = Context::convertEncodingStr($val); - $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val))); + $attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } return $attribute; diff --git a/tests/classes/db/QueryTester.class.php b/tests/classes/db/QueryTester.class.php index 27c44aaa4..f827529da 100644 --- a/tests/classes/db/QueryTester.class.php +++ b/tests/classes/db/QueryTester.class.php @@ -43,7 +43,7 @@ if(is_object($output)) { var_dump($output); return; } - $output = htmlspecialchars($output); + $output = htmlspecialchars($output, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); $output = preg_replace('/select/i', 'SELECT', $output); $output = preg_replace('/from/i', '
    FROM', $output); diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 95a0d9a8a..ab69883b6 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -611,14 +611,14 @@ class content extends WidgetHandler $item->description = preg_replace('!description) { $item->description = $item->summary; if($item->description) { - if(stripos($value->summary->attrs->type, "html") === FALSE) $item->description = htmlspecialchars($item->description); + if(!preg_match("/html/i", $value->summary->attrs->type)) $item->description = htmlspecialchars($item->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); } } $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size)); diff --git a/widgets/login_info/skins/default/login_form.html b/widgets/login_info/skins/default/login_form.html index 61efef1d3..863ce0a89 100644 --- a/widgets/login_info/skins/default/login_form.html +++ b/widgets/login_info/skins/default/login_form.html @@ -6,7 +6,7 @@

    {$lang->cmd_login}

    - +

    {$XE_VALIDATOR_MESSAGE}

    @@ -30,4 +30,4 @@
  • {$lang->cmd_find_member_account}
    • - \ No newline at end of file + diff --git a/widgets/login_info/skins/xe_global/login_form.html b/widgets/login_info/skins/xe_global/login_form.html index 749f8aa42..b788c2875 100644 --- a/widgets/login_info/skins/xe_global/login_form.html +++ b/widgets/login_info/skins/xe_global/login_form.html @@ -21,7 +21,7 @@ {$lang->cmd_login}

    Login

    - +
    diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html index c47ef8c73..93e875cf6 100644 --- a/widgets/login_info/skins/xe_globalTwo/login_form.html +++ b/widgets/login_info/skins/xe_globalTwo/login_form.html @@ -21,7 +21,7 @@
    {$no}{htmlspecialchars($val->title)}{htmlspecialchars($val->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} {$val->nick_name} {zdate($val->regdate, "Y-m-d")} - {htmlspecialchars($group_info->title)} + {htmlspecialchars($group_info->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} {$lang->cmd_modify}

    - {htmlspecialchars($name)}: {$value} + {htmlspecialchars($name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}: {$value}

    		diff --git a/modules/module/tpl/filebox_list_html.html b/modules/module/tpl/filebox_list_html.html index 3480e970c..b46a743fa 100644 --- a/modules/module/tpl/filebox_list_html.html +++ b/modules/module/tpl/filebox_list_html.html @@ -21,7 +21,7 @@

    - {htmlspecialchars($name)} : {$value} + {htmlspecialchars($name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} : {$value}

    		diff --git a/modules/module/tpl/include.module_setup.html b/modules/module/tpl/include.module_setup.html index dadf0e442..0fb50fadd 100644 --- a/modules/module/tpl/include.module_setup.html +++ b/modules/module/tpl/include.module_setup.html @@ -69,7 +69,7 @@
    - +

    {$lang->about_description}

    diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html index 6e52fb174..008313f97 100644 --- a/modules/module/tpl/module_selector.html +++ b/modules/module/tpl/module_selector.html @@ -42,7 +42,7 @@ {@ $_idx =0; }
    {$k} {$v->browser_title} {$type=='single'?$lang->cmd_select:$lang->cmd_insert}
    - {htmlspecialchars($val->title)} + {htmlspecialchars($val->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}

    {$val->excerpt}

    		{htmlspecialchars($val->blog_name)}{htmlspecialchars($val->blog_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} {zdate($val->regdate,"Y-m-d")} {$val->ipaddress}
    ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/modules/comment/queries/getCommentListByMemberSrl.xml b/modules/comment/queries/getCommentListByMemberSrl.xml +new file mode 100644 +index 0000000..6d8c680 +--- /dev/null ++++ b/modules/comment/queries/getCommentListByMemberSrl.xml +@@ -0,0 +1,19 @@ ++ ++ ++
    ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/modules/document/document.model.php b/modules/document/document.model.php +index 94840fc..b8938eb 100644 +--- a/modules/document/document.model.php ++++ b/modules/document/document.model.php +@@ -1490,6 +1490,44 @@ class documentModel extends document + } + } + } ++ ++ /** ++ * Get the total number of Document in corresponding with member_srl. ++ * @param int $member_srl ++ * @return int ++ */ ++ function getDocumentCountByMemberSrl($member_srl) ++ { ++ $args = new stdClass(); ++ $args->member_srl = $member_srl; ++ $output = executeQuery('document.getDocumentCountByMemberSrl', $args); ++ $total_count = $output->data->count; ++ ++ return (int) $total_count; ++ } ++ ++ /** ++ * Get document list of the doc in corresponding woth member_srl. ++ * @param int $member_srl ++ * @param array $columnList ++ * @param int $page ++ * @param bool $is_admin ++ * @param int $count ++ * @return object ++ */ ++ function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 ) ++ { ++ $args = new stdClass(); ++ $args->member_srl = $member_srl; ++ $args->list_count = $count; ++ $output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList); ++ $document_list = $output->data; ++ ++ if(!$document_list) return; ++ if(!is_array($document_list)) $document_list = array($document_list); ++ ++ return $document_list; ++ } + } + /* End of file document.model.php */ + /* Location: ./modules/document/document.model.php */ +diff --git a/modules/document/document.view.php b/modules/document/document.view.php +index 788708b..497050d 100644 +--- a/modules/document/document.view.php ++++ b/modules/document/document.view.php +@@ -176,6 +176,7 @@ class documentView extends document + $this->setTemplatePath($this->module_path.'tpl'); + $this->setTemplateFile('saved_list_popup'); + } ++ + } + /* End of file document.view.php */ + /* Location: ./modules/document/document.view.php */ +diff --git a/modules/document/queries/getDocumentCountByMemberSrl.xml b/modules/document/queries/getDocumentCountByMemberSrl.xml +new file mode 100644 +index 0000000..ed457fb +--- /dev/null ++++ b/modules/document/queries/getDocumentCountByMemberSrl.xml +@@ -0,0 +1,11 @@ ++ ++ ++
    ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/modules/document/queries/getDocumentListByMemberSrl.xml b/modules/document/queries/getDocumentListByMemberSrl.xml +new file mode 100644 +index 0000000..49e8035 +--- /dev/null ++++ b/modules/document/queries/getDocumentListByMemberSrl.xml +@@ -0,0 +1,17 @@ ++ ++ ++
    ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml +index 5cbe433..a2f7f2b 100644 +--- a/modules/member/conf/module.xml ++++ b/modules/member/conf/module.xml +@@ -20,6 +20,7 @@ + + + ++ + + + +@@ -68,6 +69,7 @@ + + + ++ + + + +diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml +index 0a9eced..d5524e7 100644 +--- a/modules/member/lang/lang.xml ++++ b/modules/member/lang/lang.xml +@@ -2619,5 +2619,16 @@ + + + +- ++ ++ ++ ++ ++ ++ 스팸 작성자 차단/삭제 및 회원이 남긴 글과 댓글을 모두 휴지통 이동 또는 삭제 합니다. 이 처리는 회원이 작성한 게시물의 양에 따라 오래걸릴 수 있습니다.

    ]]>     ++ Spam user management. This function remove all of documents, comments

    ]]>     ++     ++ ++ ++ ++ + +diff --git a/modules/member/member.class.php b/modules/member/member.class.php +index e7bde82..86f7059 100644 +--- a/modules/member/member.class.php ++++ b/modules/member/member.class.php +@@ -144,6 +144,9 @@ class member extends ModuleObject { + FileHandler::makeDir('./files/member_extra_info/profile_image'); + FileHandler::makeDir('./files/member_extra_info/signature'); + ++ // 2013. 11. 22 add menu when popup document menu called ++ $oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'); ++ + return new Object(); + } + +@@ -208,6 +211,9 @@ class member extends ModuleObject { + if(!is_readable('./files/ruleset/login.xml')) return true; + if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true; + ++ // 2013. 11. 22 add menu when popup document menu called ++ if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true; ++ + return false; + } + +@@ -345,6 +351,10 @@ class member extends ModuleObject { + if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) + $oMemberAdminController->_createFindAccountByQuestion($config->identifier); + ++ // 2013. 11. 22 add menu when popup document menu called ++ if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) ++ $oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'); ++ + return new Object(0, 'success_updated'); + } + +diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php +index 6a4d769..af0331c 100644 +--- a/modules/member/member.controller.php ++++ b/modules/member/member.controller.php +@@ -2354,6 +2354,186 @@ class memberController extends member + $this->setTemplatePath($this->module_path.'tpl'); + $this->setTemplateFile('msg_success_modify_email_address'); + } ++ ++ /** ++ * trigger for document.getDocumentMenu. Append to popup menu a button for procMemberSpammerManage() ++ * ++ * @param array &$menu_list ++ * ++ * @return object ++ **/ ++ function triggerGetDocumentMenu(&$menu_list) ++ { ++ $is_logged = Context::get('is_logged'); ++ $logged_info = Context::get('logged_info'); ++ ++ ++ $document_srl = Context::get('target_srl'); ++ ++ $oDocumentModel = &getModel('document'); ++ $columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress'); ++ $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); ++ $member_srl = $oDocument->get('member_srl'); ++ $module_srl = $oDocument->get('module_srl'); ++ ++ if(!$member_srl) return new Object(); ++ if(!$is_logged) return new Object(); ++ if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object(); ++ ++ $oDocumentController = &getController('document'); ++ $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); ++ $oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup'); ++ ++ return new Object(); ++ } ++ ++ /** ++ * Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string ++ * ++ * @return object ++ **/ ++ function procMemberSpammerManage() ++ { ++ $logged_info = Context::get('logged_info'); ++ $member_srl = Context::get('member_srl'); ++ $module_srl = Context::get('module_srl'); ++ $cnt_loop = Context::get('cnt_loop'); ++ $proc_type = Context::get('proc_type'); ++ $isMoveToTrash = true; ++ if($proc_type == "delete") ++ $isMoveToTrash = false; ++ ++ // check grant ++ $oModuleModel = &getModel('module'); ++ $columnList = array('module_srl', 'module'); ++ $args = new stdClass(); ++ $args->module_srl = $module_srl; ++ $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); ++ $grant = $oModuleModel->getGrant($module_info, $logged_info); ++ ++ if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); ++ if(!$grant->manager) return new Object(-1,'msg_not_permitted'); ++ ++ $proc_msg = ""; ++ ++ $oDocumentController = &getController('document'); ++ $oDocumentModel = &getModel('document'); ++ $oCommentController = &getController('comment'); ++ $oCommentModel = &getModel('comment'); ++ ++ // delete or trash destination ++ // proc member ++ if($cnt_loop == 1) ++ { ++ $this->_spammerMember($member_srl); ++ } ++ // proc document and comment ++ elseif($cnt_loop>1) ++ { ++ $this->_spammerDocuments($member_srl, $isMoveToTrash); ++ } ++ ++ // get destination count ++ $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); ++ $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); ++ ++ $total_count = Context::get('total_count'); ++ $remain_count = $cnt_document + $cnt_comment; ++ if($cnt_loop == 1) { ++ $total_count = $remain_count; ++ } ++ ++ // get progress percent ++ if( $total_count > 0 ) ++ $progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 ); ++ else ++ $progress = 100; ++ ++ $this->add('total_count', $total_count); ++ $this->add('remain_count', $remain_count); ++ $this->add('progress', $progress); ++ $this->add('member_srl', $member_srl); ++ $this->add('module_srl', $module_srl); ++ $this->add('cnt_loop', ++$cnt_loop); ++ $this->add('proc_type', $proc_type); ++ ++ $this->add( "retdata", $arrJson); ++ return new Object(0); ++ } ++ ++ /** ++ * Denied user login and write description ++ * ++ * @param int $member_srl ++ * ++ * @return bool ++ **/ ++ private function _spammerMember($member_srl) { ++ $logged_info = Context::get('logged_info'); ++ $spam_description = Context::get('spam_description'); ++ ++ $oMemberModel = &getModel('member'); ++ $columnList = array(); ++ // get member current infomation ++ $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); ++ // set change infomations ++ $member_info->denied = "Y"; ++ ++ if( $member_info->description != "" ) $member_info->description .= "\n"; // add new line ++ $member_info->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . "]"; ++ ++ $oMemberController = &getController('member'); ++ $output = executeQuery('member.updateMember', $member_info); ++ $proc_msg .= "member info updated\t"; ++ ++ return true; ++ } ++ ++ /** ++ * Delete or trash all documents ++ * ++ * @param int $member_srl ++ * @param bool $isMoveToTrash ++ * ++ * @return bool ++ **/ ++ private function _spammerDocuments($member_srl, $isMoveToTrash) { ++ ++ $logged_info = Context::get('logged_info'); ++ ++ $oDocumentController = &getController('document'); ++ $oDocumentModel = &getModel('document'); ++ $oCommentController = &getController('comment'); ++ $oCommentModel = &getModel('comment'); ++ ++ // delete count by one request ++ $getContentsCount = 10; ++ ++ // 1. proc comment, 2. proc document ++ $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); ++ $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); ++ if($cnt_comment > 0) ++ { ++ $columnList = array(); ++ $commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); ++ if($commentList) { ++ foreach($commentList as $v) { ++ $oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash); ++ } ++ } ++ } elseif($cnt_document > 0) { ++ $columnList = array(); ++ $documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); ++ if($documentList) { ++ foreach($documentList as $v) { ++ if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v); ++ else $oDocumentController->deleteDocument($v->document_srl); ++ } ++ } ++ } ++ ++ return true; ++ } + } + /* End of file member.controller.php */ + /* Location: ./modules/member/member.controller.php */ +diff --git a/modules/member/member.view.php b/modules/member/member.view.php +index 380cecf..31c49a7 100644 +--- a/modules/member/member.view.php ++++ b/modules/member/member.view.php +@@ -611,6 +611,43 @@ class memberView extends member + + Context::addHtmlHeader($js_code); + } ++ ++ /** ++ * Spammer manage popup ++ * ++ * @return void ++ **/ ++ function dispMemberSpammer() ++ { ++ $member_srl = Context::get('member_srl'); ++ $module_srl = Context::get('module_srl'); ++ ++ // check grant ++ $oModuleModel = &getModel('module'); ++ $columnList = array('module_srl', 'module'); ++ $args = new stdClass(); ++ $args->module_srl = $module_srl; ++ $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); ++ $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); ++ ++ if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); ++ if(!$grant->manager) return new Object(-1,'msg_not_permitted'); ++ ++ $oMemberModel = &getModel('member'); ++ $spammer_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); ++ ++ Context::loadLang('modules/document/lang/'); ++ Context::set('spammer_info',$spammer_info); ++ Context::set('module_srl',$module_srl); ++ ++ // Select Pop-up layout ++ $this->setLayoutPath('./common/tpl'); ++ $this->setLayoutFile('popup_layout'); ++ ++ $this->setTemplatePath($this->module_path.'tpl'); ++ $this->setTemplateFile('spammer'); ++ } ++ + } + /* End of file member.view.php */ + /* Location: ./modules/member/member.view.php */ +diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js +index 9422cfd..41c8e72 100644 +--- a/modules/member/skins/default/js/member.js ++++ b/modules/member/skins/default/js/member.js +@@ -160,3 +160,4 @@ function doDeleteSavedDocument(document_srl, confirm_message) { + function insertSelectedModule(id, module_srl, mid, browser_title) { + location.href = current_url.setQuery('selected_module_srl',module_srl); + } ++ +diff --git a/modules/member/tpl/spammer.html b/modules/member/tpl/spammer.html +new file mode 100644 +index 0000000..d371f0f +--- /dev/null ++++ b/modules/member/tpl/spammer.html +@@ -0,0 +1,110 @@ ++ ++ ++ ++
    ++

    {$lang->cmd_spammer}

    ++
    ++ ++ ++ ++ ++ ++ ++ ++ ++
    ++
    {$lang->description} : {$lang->spammer_description}
    ++
    {$lang->nick_name} : {$spammer_info->nick_name}
    ++ ++
    ++

    {$lang->about_member_description}

    ++ ++
    ++
    ++ ++ ++
    ++ ++
    ++
    Document Count :
    ++
    ++
    ++
    ++
    {$lang->cmd_complete}
    ++
    ++
    ++
    {$lang->success_declare_canceled}
    ++
    ++ ++ diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index 3afb79f37..dda143681 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -26,7 +26,7 @@ class addonAdminModel extends addon */ function getAddonPath($addon_name) { - $class_path = sprintf('./addons/%s/', $addon_name); + $class_path = sprintf(_XE_PATH_ . 'addons/%s/', $addon_name); if(is_dir($class_path)) { return $class_path; diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index b86fdc985..8fb817201 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -173,7 +173,7 @@ class adminAdminController extends admin $buff = ''; if(is_readable($siteDesignFile)) { - @include($siteDesignFile); + include($siteDesignFile); } else { @@ -294,8 +294,7 @@ class adminAdminController extends admin { if($favorite->type == 'module') { - $modulePath = './modules/' . $favorite->module; - $modulePath = FileHandler::getRealPath($modulePath); + $modulePath = _XE_PATH_ . 'modules/' . $favorite->module; if(!is_dir($modulePath)) { $deleteTargets[] = $favorite->admin_favorite_srl; diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index b10d5480b..f1513f25a 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -100,7 +100,7 @@ class adminAdminModel extends admin */ function getAdminFTPPath() { - Context::loadLang('./modules/autoinstall/lang'); + Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); @set_time_limit(5); require_once(_XE_PATH_ . 'libs/ftp.class.php'); @@ -236,9 +236,11 @@ class adminAdminModel extends admin */ function getAdminFTPList() { - Context::loadLang('./modules/autoinstall/lang'); + Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); @set_time_limit(5); + require_once(_XE_PATH_ . 'libs/ftp.class.php'); + $ftp_info = Context::getRequestVars(); if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) { @@ -435,7 +437,7 @@ class adminAdminModel extends admin $theme_info->name = $theme_name; $theme_info->title = $xml_obj->title->body; $thumbnail = './themes/' . $theme_name . '/thumbnail.png'; - $theme_info->thumbnail = (file_exists($thumbnail)) ? $thumbnail : NULL; + $theme_info->thumbnail = (FileHandler::exists($thumbnail)) ? $thumbnail : NULL; $theme_info->version = $xml_obj->version->body; $date_obj = new stdClass(); sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d); @@ -595,7 +597,7 @@ class adminAdminModel extends admin $oModuleModel = getModel('module'); foreach($searched_list as $val) { - $skin_list = $oModuleModel->getSkins('./modules/' . $val); + $skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $val); if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule)) { @@ -770,7 +772,7 @@ class adminAdminModel extends admin foreach($list as $k => $v) { - if(!is_dir('./modules/' . $v->module)) + if(!is_dir(_XE_PATH_ . 'modules/' . $v->module)) { unset($list[$k]); } diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php index d3294a509..70f0b5c60 100644 --- a/modules/autoinstall/autoinstall.class.php +++ b/modules/autoinstall/autoinstall.class.php @@ -103,12 +103,11 @@ class autoinstall extends ModuleObject $oDB = DB::getInstance(); $oModuleModel = getModel('module'); - if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml")) - && $oDB->isTableExists("autoinstall_installed_packages")) + if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml') && $oDB->isTableExists("autoinstall_installed_packages")) { return TRUE; } - if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml")) + if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml') && $oDB->isTableExists("autoinstall_remote_categories")) { return TRUE; @@ -147,12 +146,12 @@ class autoinstall extends ModuleObject $oModuleModel = getModel('module'); $oModuleController = getController('module'); - if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml")) + if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml') && $oDB->isTableExists("autoinstall_installed_packages")) { $oDB->dropTable("autoinstall_installed_packages"); } - if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml")) + if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml') && $oDB->isTableExists("autoinstall_remote_categories")) { $oDB->dropTable("autoinstall_remote_categories"); diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 94840fca6..03fe68923 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -698,7 +698,7 @@ class documentModel extends document function getCategoryList($module_srl, $columnList = array()) { // Category of the target module file swollen - $filename = sprintf("./files/cache/document_category/%s.php", $module_srl); + $filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl); // If the target file to the cache file regeneration category if(!file_exists($filename)) { @@ -706,7 +706,8 @@ class documentModel extends document if(!$oDocumentController->makeCategoryFile($module_srl)) return array(); } - @include($filename); + include($filename); + // Cleanup of category $document_category = array(); $this->_arrangeCategory($document_category, $menu->list, 0); diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index 1ff5a8571..21af7fde6 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -27,7 +27,7 @@ class poll_maker extends EditorHandler { // Wanted Skins survey $oModuleModel = &getModel('module'); - $skin_list = $oModuleModel->getSkins("./modules/poll/"); + $skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/'); Context::set('skin_list', $skin_list); // Pre-compiled source code to compile template return to $tpl_path = $this->component_path.'tpl'; diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index acfe070d9..61ce397f1 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -3,7 +3,7 @@ /** * @class editorModel * @author NAVER (developers@xpressengine.com) - * @brief model class of the editor odule + * @brief model class of the editor odule */ class editorModel extends editor { @@ -15,7 +15,7 @@ class editorModel extends editor * That means there is a limitation that more than 30 editors cannot be displayed on a single page. * * However, editor_sequence can be value from getNextSequence() in case of the modified or the auto-saved for file upload - * + * */ /** @@ -29,7 +29,7 @@ class editorModel extends editor $oModuleModel = &getModel('module'); $GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl); } - $editor_config = $GLOBALS['__editor_module_config__'][$module_srl]; + $editor_config = $GLOBALS['__editor_module_config__'][$module_srl]; $oModuleModel = &getModel('module'); $editor_default_config = $oModuleModel->getModuleConfig('editor'); @@ -64,7 +64,7 @@ class editorModel extends editor function loadDrComponents() { - $drComponentPath = './modules/editor/skins/dreditor/drcomponents/'; + $drComponentPath = _XE_PATH_ . 'modules/editor/skins/dreditor/drcomponents/'; $drComponentList = FileHandler::readDir($drComponentPath); $oTemplate = &TemplateHandler::getInstance(); @@ -76,7 +76,7 @@ class editorModel extends editor { unset($obj); $obj = $this->getDrComponentXmlInfo($drComponent); - Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent)); + Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent)); $path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent); $obj->html = $oTemplate->compile($path,$drComponent); $drComponentInfo[$drComponent] = $obj; @@ -250,7 +250,7 @@ class editorModel extends editor if($skin=='dreditor') { - $this->loadDrComponents(); + $this->loadDrComponents(); } /** @@ -371,7 +371,7 @@ class editorModel extends editor $editor_config = $this->getEditorConfig($module_srl); $config = new stdClass(); - + // Configurations listed according to a type if($type == 'document') { @@ -602,7 +602,7 @@ class editorModel extends editor if(!file_exists($cache_file)) return; @include($cache_file); $logged_info = Context::get('logged_info'); - if($logged_info && is_array($logged_info->group_list)) + if($logged_info && is_array($logged_info->group_list)) { $group_list = array_keys($logged_info->group_list); } @@ -632,16 +632,16 @@ class editorModel extends editor { if(!$logged_info) { - $val->enabled = "N"; + $val->enabled = "N"; } else { $is_granted = false; foreach($group_list as $group_srl) { - if(in_array($group_srl, $val->target_group)) $is_granted = true; + if(in_array($group_srl, $val->target_group)) $is_granted = true; } - if(!$is_granted) $val->enabled = "N"; + if(!$is_granted) $val->enabled = "N"; } } if($val->enabled != "N" && $val->mid_list) diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 59792a95c..060fe6c4e 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -302,7 +302,9 @@ class importerAdminController extends importer $columnList = array('module_srl', 'module'); $target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList); - require_once('./modules/importer/ttimport.class.php'); + $ttimporter = FileHandler::exists(_XE_PATH_ . 'modules/importer/ttimport.class.php'); + if($ttimporter) require_once($ttimporter); + $oTT = new ttimport(); $cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id, $target_module_info->module); break; diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index cad2494f9..549846b88 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -142,7 +142,7 @@ class installAdminController extends install $homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile(); if(file_exists($homeMenuCacheFile)) { - @include($homeMenuCacheFile); + include($homeMenuCacheFile); } if(!$homeMenuSrl || $homeMenuSrl != $output->menu_srl) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 55f89ea66..90e27686b 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -176,13 +176,14 @@ class installController extends install if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed'); // load script - $scripts = FileHandler::readDir('./modules/install/script','/(\.php)$/'); + $scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/'); if(count($scripts)>0) { sort($scripts); foreach($scripts as $script) { - $output = include(FileHandler::getRealPath('./modules/install/script/'.$script)); + $script_path = FileHandler::getRealPath('./modules/install/script/'); + $output = include($script_path . $script)); } } diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php index c6e99ee27..61e01a792 100644 --- a/modules/install/script/ko.install.php +++ b/modules/install/script/ko.install.php @@ -114,7 +114,7 @@ $obj->module_srl = $module_srl; Context::set('version', __XE_VERSION__); $obj->title = 'Welcome XE'; -$obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang); +$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang); $output = $oDocumentController->insertDocument($obj); if(!$output->toBool()) return $output; diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index cbcd27311..5be33c0c0 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -184,8 +184,8 @@ class layoutAdminModel extends layout public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0) { $target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl'; - $designInfoFile = sprintf(_XE_PATH_.'/files/site_design/design_%s.php', $siteSrl); - @include($designInfoFile); + $designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl); + if(FileHandler::exists($designInfoFile)) include($designInfoFile); if(!$designInfo || !$designInfo->{$target}) { diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 6f427aaaa..f81bcaed8 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -319,7 +319,8 @@ class layoutAdminView extends layout { foreach($layout_info->menu as $menu_id => $menu) { - if(file_exists($menu->php_file)) @include($menu->php_file); + $menu->php_file = FileHandler::getRealPath($menu->php_file); + if(FileHandler::exists($menu->php_file)) include($menu->php_file); Context::set($menu_id, $menu); } } diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index e0a9b8f49..a51da7185 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -760,7 +760,7 @@ class layoutModel extends layout $buff = ''; FileHandler::writeFile($cache_file, $buff); - if(file_exists($cache_file)) @include($cache_file); + if(FileHandler::exists($cache_file)) include($cache_file); if(!$layout_info->title) { @@ -807,7 +807,7 @@ class layoutModel extends layout */ function getUserLayoutPath($layout_srl) { - return sprintf("./files/faceOff/%s",getNumberingPath($layout_srl,3)); + return sprintf("%sfiles/faceOff/%s", _XE_PATH_, getNumberingPath($layout_srl,3)); } /** @@ -942,7 +942,7 @@ class layoutModel extends layout */ function getLayoutCache($layout_name,$lang_type) { - return sprintf("./files/cache/layout/%s.%s.cache.php",$layout_name,$lang_type); + return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type); } /** diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index 89fed4ec1..c7e63ea63 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -87,12 +87,12 @@ class layoutView extends layout if ($skinType == 'M') { - $templatePath = './modules/page/m.skins/' . $skin; + $templatePath = _XE_PATH_ . 'modules/page/m.skins/' . $skin; $templateFile = 'mobile'; } else { - $templatePath = './modules/page/skins/' . $skin; + $templatePath = _XE_PATH_ . 'modules/page/skins/' . $skin; $templateFile = 'content'; } @@ -113,8 +113,8 @@ class layoutView extends layout if($layoutSrl == -1) { $site_srl = ($oModule) ? $oModule->module_info->site_srl : 0; - $designInfoFile = sprintf(_XE_PATH_.'/files/site_design/design_%s.php', $site_srl); - @include($designInfoFile); + $designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $site_srl); + include($designInfoFile); if($skinType == 'M') { @@ -164,7 +164,7 @@ class layoutView extends layout if(file_exists($homeMenuCacheFile)) { - @include($homeMenuCacheFile); + include($homeMenuCacheFile); } if(!$menu->menu_srl) @@ -179,9 +179,11 @@ class layoutView extends layout $menu->php_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->php_file); } } - if(file_exists($menu->php_file)) + + $menu->php_file = FileHandler::getRealPath($menu->php_file); + if(FileHandler::exists($menu->php_file)) { - @include($menu->php_file); + include($menu->php_file); } Context::set($menu_id, $menu); } @@ -304,7 +306,7 @@ class layoutView extends layout } // get module html - require_once("./classes/display/HTMLDisplayHandler.php"); + require_once(_XE_PATH_ . "classes/display/HTMLDisplayHandler.php"); $handler = new HTMLDisplayHandler(); return $handler->toDoc($oModule); } @@ -346,7 +348,9 @@ class layoutView extends layout { foreach($layout_info->menu as $menu_id => $menu) { - if(file_exists($menu->php_file)) @include($menu->php_file); + $menu->php_file = FileHandler::getRealPath($menu->php_file); + if(FileHandler::exists($menu->php_file)) include($menu->php_file); + Context::set($menu_id, $menu); } } @@ -354,7 +358,7 @@ class layoutView extends layout Context::set('layout_info', $layout_info); Context::set('content', Context::getLang('layout_preview_content')); // Temporary save the codes - $edited_layout_file = sprintf('./files/cache/layout/tmp.tpl'); + $edited_layout_file = _XE_PATH_ . 'files/cache/layout/tmp.tpl'; FileHandler::writeFile($edited_layout_file, $code); // Compile diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index a12225cda..1dd7944cf 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -44,7 +44,7 @@ class menuAdminController extends menu * home menu cache file * @var string */ - private $homeMenuCacheFile = './files/cache/menu/homeSitemap.php'; + private $homeMenuCacheFile = 'files/cache/menu/homeSitemap.php'; /** * Initialization @@ -53,7 +53,10 @@ class menuAdminController extends menu function init() { $this->setTemplatePath($this->module_path.'tpl'); - //$this->homeMenuCacheFile = sprintf('./files/cache/menu/homeSitemap.php'); + } + + function __construct() { + $this->homeMenuCacheFile = _XE_PATH_ . $this->homeMenuCacheFile; } /** @@ -142,7 +145,7 @@ class menuAdminController extends menu if(is_readable(FileHandler::getRealPath($phpFile))) { - @include(FileHandler::getRealPath($phpFile)); + include(FileHandler::getRealPath($phpFile)); } // check home menu in originMenu @@ -742,7 +745,7 @@ class menuAdminController extends menu if(is_readable(FileHandler::getRealPath($phpFile))) { - @include(FileHandler::getRealPath($phpFile)); + include(FileHandler::getRealPath($phpFile)); if(is_array($menu->list)) { @@ -889,12 +892,12 @@ class menuAdminController extends menu } // get menu properies with child menu - $phpFile = sprintf("./files/cache/menu/%s.php", $originalItemInfo->menu_srl); + $phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $originalItemInfo->menu_srl); $originMenu = NULL; if(is_readable(FileHandler::getRealPath($phpFile))) { - @include(FileHandler::getRealPath($phpFile)); + include(FileHandler::getRealPath($phpFile)); if(is_array($menu->list)) { @@ -988,12 +991,12 @@ class menuAdminController extends menu $menuSrl = $itemInfo->menu_srl; // get menu properies with child menu - $phpFile = sprintf("./files/cache/menu/%s.php", $menuSrl); + $phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menuSrl); $originMenu = NULL; if(is_readable(FileHandler::getRealPath($phpFile))) { - @include(FileHandler::getRealPath($phpFile)); + include(FileHandler::getRealPath($phpFile)); if(is_array($menu->list)) { @@ -1306,7 +1309,7 @@ class menuAdminController extends menu { if(file_exists($this->homeMenuCacheFile)) { - @include($this->homeMenuCacheFile); + include($this->homeMenuCacheFile); } if(!$homeMenuSrl || $homeMenuSrl != $menu_srl) { @@ -1618,8 +1621,8 @@ class menuAdminController extends menu $output = executeQuery('menu.getMenuItems', $args); if(!$output->toBool()) return; // Specify the name of the cache file - $xml_file = sprintf("./files/cache/menu/%s.xml.php", $menu_srl); - $php_file = sprintf("./files/cache/menu/%s.php", $menu_srl); + $xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl); + $php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl); // If no data found, generate an XML file without node data $list = $output->data; if(!$list) diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 1abd14579..5c6585159 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -493,12 +493,9 @@ class menuAdminModel extends menu { $isMenuFixed = false; $output = $this->getMenu($menuSrl); - $php_file = sprintf('./files/cache/menu/%s.php',$output->menu_srl); - if(file_exists($php_file)) @include($php_file); - else - { - $oMenuAdminController->makeXmlFile($menuSrl); - } + $php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl); + if(file_exists($php_file)) include($php_file); + else $oMenuAdminController->makeXmlFile($menuSrl); if(count($menu->list)>0) { @@ -532,15 +529,18 @@ class menuAdminModel extends menu { unset($menu); unset($menuItems); - $value->php_file = sprintf('./files/cache/menu/%s.php',$value->menu_srl); - if(file_exists($value->php_file)) @include($value->php_file); + $value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl); + if(file_exists($value->php_file)) + { + include($value->php_file); + } else { $oMenuAdminController->makeXmlFile($value->menu_srl); } $isMenuFixed = false; - if(count($menu->list)>0) + if(count($menu->list) > 0) { foreach($menu->list AS $key2=>$value2) { diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 1f46ddcfa..0b0735c9d 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -57,8 +57,8 @@ class menuAdminView extends menu unset($menu); unset($menuItems); //$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl); - $value->php_file = sprintf('./files/cache/menu/%s.php',$value->menu_srl); - if(file_exists($value->php_file)) @include($value->php_file); + $value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl); + if(file_exists($value->php_file)) include($value->php_file); if(count($menu->list)>0) { @@ -80,7 +80,7 @@ class menuAdminView extends menu Context::set('menu_list', $menuList); // get installed module list - $oPageController = &getController('page'); //for lang + $oPageController = &getController('page'); //for lang $resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl); Context::set('module_list', $resultModuleList); diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 55cf1b9c5..7d6bbd40c 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -392,7 +392,7 @@ class moduleAdminController extends module } // Get skin information (to check extra_vars) - $module_path = './modules/'.$module_info->module; + $module_path = _XE_PATH_ . 'modules/'.$module_info->module; if($mode === 'M') { diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index fad0674d3..2c35a5c79 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -527,7 +527,7 @@ class moduleAdminModel extends module function getModuleAdminMultilingualHtml() { $oTemplate = TemplateHandler::getInstance(); - $tpl = $oTemplate->compile('./modules/module/tpl', 'multilingual_v17.html'); + $tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17.html'); $this->add('html', $tpl); } @@ -566,7 +566,7 @@ class moduleAdminModel extends module $oSecurity->encodeHTML('lang_code_list..'); $oTemplate = TemplateHandler::getInstance(); - $tpl = $oTemplate->compile('./modules/module/tpl', 'multilingual_v17_list.html'); + $tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17_list.html'); $this->add('html', $tpl); } @@ -576,9 +576,9 @@ class moduleAdminModel extends module */ function getModuleAdminModuleSearcherHtml() { - Context::loadLang('./modules/admin/lang'); + Context::loadLang(_XE_PATH_ . 'modules/admin/lang'); $oTemplate = TemplateHandler::getInstance(); - $tpl = $oTemplate->compile('./modules/module/tpl', 'module_searcher_v17.html'); + $tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'module_searcher_v17.html'); $this->add('html', $tpl); } diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index c261632c9..519456e0a 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -171,7 +171,7 @@ class moduleAdminView extends module $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList); // Get a skin list of the module - $skin_list = $oModuleModel->getSkins('./modules/'.$module_info->module); + $skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module); Context::set('skin_list',$skin_list); // Get a layout list $oLayoutMode = &getModel('layout'); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index a7010a3af..a7832ac69 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -82,10 +82,10 @@ class moduleModel extends module function getDefaultMid() { $default_url = Context::getDefaultUrl(); - if(substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1); + if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1); $request_url = Context::getRequestUri(); - if(substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1); + if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1); $default_url_parse = parse_url($default_url); $request_url_parse = parse_url($request_url); @@ -747,7 +747,7 @@ class moduleModel extends module $xml_file = sprintf("%sconf/module.xml", $class_path); if(!file_exists($xml_file)) return; // Check if cached file exists - $cache_file = sprintf("./files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__); + $cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__); // Update if no cache file exists or it is older than xml file if(!file_exists($cache_file) || filemtime($cache_file)module->{$module_name}->{$target}; } @@ -2077,7 +2077,7 @@ class moduleModel extends module $security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); $oTemplate = &TemplateHandler::getInstance(); - $html = $oTemplate->compile('./modules/module/tpl/', 'filebox_list_html'); + $html = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl/', 'filebox_list_html'); $this->add('html', $html); } diff --git a/modules/page/page.view.php b/modules/page/page.view.php index 6fa030ce1..c4cea5c74 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -32,7 +32,7 @@ class pageView extends page } case 'OUTSIDE' : { - $this->cache_file = sprintf("./files/cache/opage/%d.%s.cache.php", $this->module_info->module_srl, Context::getSslStatus()); + $this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus()); $this->interval = (int)($this->module_info->page_caching_interval); $this->path = $this->module_info->path; break; @@ -166,24 +166,28 @@ class pageView extends page /** * @brief Create a cache file in order to include if it is an internal file */ - function executeFile($path, $caching_interval, $cache_file) + function executeFile($target_file, $caching_interval, $cache_file) { // Cancel if the file doesn't exist - if(!file_exists($path)) return; + if(!file_exists(FileHandler::getRealPath($target_file))) return; + // Get a path and filename $tmp_path = explode('/',$cache_file); $filename = $tmp_path[count($tmp_path)-1]; $filepath = preg_replace('/'.$filename."$/i","",$cache_file); + $cache_file = FileHandler::getRealPath($cache_file); + // Verify cache - if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)path = str_replace('\\', '/', realpath(dirname($path))) . '/'; + $this->path = str_replace('\\', '/', realpath(dirname($target_file))) . '/'; $content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content); $content = preg_replace_callback('/( -@@ -68,6 +69,7 @@ - - - -+ - - - -diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml -index 0a9eced..d5524e7 100644 ---- a/modules/member/lang/lang.xml -+++ b/modules/member/lang/lang.xml -@@ -2619,5 +2619,16 @@ - - - -- -+ -+ -+ -+ -+ -+ 스팸 작성자 차단/삭제 및 회원이 남긴 글과 댓글을 모두 휴지통 이동 또는 삭제 합니다. 이 처리는 회원이 작성한 게시물의 양에 따라 오래걸릴 수 있습니다.

    ]]>     -+ Spam user management. This function remove all of documents, comments

    ]]>     -+     -+ -+ -+ -+ - -diff --git a/modules/member/member.class.php b/modules/member/member.class.php -index e7bde82..86f7059 100644 ---- a/modules/member/member.class.php -+++ b/modules/member/member.class.php -@@ -144,6 +144,9 @@ class member extends ModuleObject { - FileHandler::makeDir('./files/member_extra_info/profile_image'); - FileHandler::makeDir('./files/member_extra_info/signature'); - -+ // 2013. 11. 22 add menu when popup document menu called -+ $oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'); -+ - return new Object(); - } - -@@ -208,6 +211,9 @@ class member extends ModuleObject { - if(!is_readable('./files/ruleset/login.xml')) return true; - if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true; - -+ // 2013. 11. 22 add menu when popup document menu called -+ if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true; -+ - return false; - } - -@@ -345,6 +351,10 @@ class member extends ModuleObject { - if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) - $oMemberAdminController->_createFindAccountByQuestion($config->identifier); - -+ // 2013. 11. 22 add menu when popup document menu called -+ if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) -+ $oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'); -+ - return new Object(0, 'success_updated'); - } - -diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php -index 6a4d769..af0331c 100644 ---- a/modules/member/member.controller.php -+++ b/modules/member/member.controller.php -@@ -2354,6 +2354,186 @@ class memberController extends member - $this->setTemplatePath($this->module_path.'tpl'); - $this->setTemplateFile('msg_success_modify_email_address'); - } -+ -+ /** -+ * trigger for document.getDocumentMenu. Append to popup menu a button for procMemberSpammerManage() -+ * -+ * @param array &$menu_list -+ * -+ * @return object -+ **/ -+ function triggerGetDocumentMenu(&$menu_list) -+ { -+ $is_logged = Context::get('is_logged'); -+ $logged_info = Context::get('logged_info'); -+ -+ -+ $document_srl = Context::get('target_srl'); -+ -+ $oDocumentModel = &getModel('document'); -+ $columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress'); -+ $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); -+ $member_srl = $oDocument->get('member_srl'); -+ $module_srl = $oDocument->get('module_srl'); -+ -+ if(!$member_srl) return new Object(); -+ if(!$is_logged) return new Object(); -+ if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object(); -+ -+ $oDocumentController = &getController('document'); -+ $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); -+ $oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup'); -+ -+ return new Object(); -+ } -+ -+ /** -+ * Spammer manage. Denied user login. And delete or trash all documents. Response Ajax string -+ * -+ * @return object -+ **/ -+ function procMemberSpammerManage() -+ { -+ $logged_info = Context::get('logged_info'); -+ $member_srl = Context::get('member_srl'); -+ $module_srl = Context::get('module_srl'); -+ $cnt_loop = Context::get('cnt_loop'); -+ $proc_type = Context::get('proc_type'); -+ $isMoveToTrash = true; -+ if($proc_type == "delete") -+ $isMoveToTrash = false; -+ -+ // check grant -+ $oModuleModel = &getModel('module'); -+ $columnList = array('module_srl', 'module'); -+ $args = new stdClass(); -+ $args->module_srl = $module_srl; -+ $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); -+ $grant = $oModuleModel->getGrant($module_info, $logged_info); -+ -+ if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); -+ if(!$grant->manager) return new Object(-1,'msg_not_permitted'); -+ -+ $proc_msg = ""; -+ -+ $oDocumentController = &getController('document'); -+ $oDocumentModel = &getModel('document'); -+ $oCommentController = &getController('comment'); -+ $oCommentModel = &getModel('comment'); -+ -+ // delete or trash destination -+ // proc member -+ if($cnt_loop == 1) -+ { -+ $this->_spammerMember($member_srl); -+ } -+ // proc document and comment -+ elseif($cnt_loop>1) -+ { -+ $this->_spammerDocuments($member_srl, $isMoveToTrash); -+ } -+ -+ // get destination count -+ $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); -+ $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); -+ -+ $total_count = Context::get('total_count'); -+ $remain_count = $cnt_document + $cnt_comment; -+ if($cnt_loop == 1) { -+ $total_count = $remain_count; -+ } -+ -+ // get progress percent -+ if( $total_count > 0 ) -+ $progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 ); -+ else -+ $progress = 100; -+ -+ $this->add('total_count', $total_count); -+ $this->add('remain_count', $remain_count); -+ $this->add('progress', $progress); -+ $this->add('member_srl', $member_srl); -+ $this->add('module_srl', $module_srl); -+ $this->add('cnt_loop', ++$cnt_loop); -+ $this->add('proc_type', $proc_type); -+ -+ $this->add( "retdata", $arrJson); -+ return new Object(0); -+ } -+ -+ /** -+ * Denied user login and write description -+ * -+ * @param int $member_srl -+ * -+ * @return bool -+ **/ -+ private function _spammerMember($member_srl) { -+ $logged_info = Context::get('logged_info'); -+ $spam_description = Context::get('spam_description'); -+ -+ $oMemberModel = &getModel('member'); -+ $columnList = array(); -+ // get member current infomation -+ $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); -+ // set change infomations -+ $member_info->denied = "Y"; -+ -+ if( $member_info->description != "" ) $member_info->description .= "\n"; // add new line -+ $member_info->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . "]"; -+ -+ $oMemberController = &getController('member'); -+ $output = executeQuery('member.updateMember', $member_info); -+ $proc_msg .= "member info updated\t"; -+ -+ return true; -+ } -+ -+ /** -+ * Delete or trash all documents -+ * -+ * @param int $member_srl -+ * @param bool $isMoveToTrash -+ * -+ * @return bool -+ **/ -+ private function _spammerDocuments($member_srl, $isMoveToTrash) { -+ -+ $logged_info = Context::get('logged_info'); -+ -+ $oDocumentController = &getController('document'); -+ $oDocumentModel = &getModel('document'); -+ $oCommentController = &getController('comment'); -+ $oCommentModel = &getModel('comment'); -+ -+ // delete count by one request -+ $getContentsCount = 10; -+ -+ // 1. proc comment, 2. proc document -+ $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); -+ $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); -+ if($cnt_comment > 0) -+ { -+ $columnList = array(); -+ $commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); -+ if($commentList) { -+ foreach($commentList as $v) { -+ $oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash); -+ } -+ } -+ } elseif($cnt_document > 0) { -+ $columnList = array(); -+ $documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); -+ if($documentList) { -+ foreach($documentList as $v) { -+ if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v); -+ else $oDocumentController->deleteDocument($v->document_srl); -+ } -+ } -+ } -+ -+ return true; -+ } - } - /* End of file member.controller.php */ - /* Location: ./modules/member/member.controller.php */ -diff --git a/modules/member/member.view.php b/modules/member/member.view.php -index 380cecf..31c49a7 100644 ---- a/modules/member/member.view.php -+++ b/modules/member/member.view.php -@@ -611,6 +611,43 @@ class memberView extends member - - Context::addHtmlHeader($js_code); - } -+ -+ /** -+ * Spammer manage popup -+ * -+ * @return void -+ **/ -+ function dispMemberSpammer() -+ { -+ $member_srl = Context::get('member_srl'); -+ $module_srl = Context::get('module_srl'); -+ -+ // check grant -+ $oModuleModel = &getModel('module'); -+ $columnList = array('module_srl', 'module'); -+ $args = new stdClass(); -+ $args->module_srl = $module_srl; -+ $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); -+ $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); -+ -+ if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); -+ if(!$grant->manager) return new Object(-1,'msg_not_permitted'); -+ -+ $oMemberModel = &getModel('member'); -+ $spammer_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); -+ -+ Context::loadLang('modules/document/lang/'); -+ Context::set('spammer_info',$spammer_info); -+ Context::set('module_srl',$module_srl); -+ -+ // Select Pop-up layout -+ $this->setLayoutPath('./common/tpl'); -+ $this->setLayoutFile('popup_layout'); -+ -+ $this->setTemplatePath($this->module_path.'tpl'); -+ $this->setTemplateFile('spammer'); -+ } -+ - } - /* End of file member.view.php */ - /* Location: ./modules/member/member.view.php */ -diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js -index 9422cfd..41c8e72 100644 ---- a/modules/member/skins/default/js/member.js -+++ b/modules/member/skins/default/js/member.js -@@ -160,3 +160,4 @@ function doDeleteSavedDocument(document_srl, confirm_message) { - function insertSelectedModule(id, module_srl, mid, browser_title) { - location.href = current_url.setQuery('selected_module_srl',module_srl); - } -+ -diff --git a/modules/member/tpl/spammer.html b/modules/member/tpl/spammer.html -new file mode 100644 -index 0000000..d371f0f ---- /dev/null -+++ b/modules/member/tpl/spammer.html -@@ -0,0 +1,110 @@ -+ -+ -+ -+
    -+

    {$lang->cmd_spammer}

    -+
    -+ -+
    -+ -+ -+ -+ -+ -+ -+
    -+
    {$lang->description} : {$lang->spammer_description}
    -+
    {$lang->nick_name} : {$spammer_info->nick_name}
    -+ -+
    -+

    {$lang->about_member_description}

    -+ -+
    -+
    -+ -+ -+
    -+ -+
    -+
    Document Count :
    -+
    -+
    -+
    -+
    {$lang->cmd_complete}
    -+
    -+
    -+
    {$lang->success_declare_canceled}
    -+
    -+ -+ From 46e8b01f94117b24a55ee30acdc750f52db8f9e9 Mon Sep 17 00:00:00 2001 From: sol Date: Sat, 23 Nov 2013 12:09:13 +0900 Subject: [PATCH 105/473] NOISSUE code rearrange on install.controller.php --- modules/install/install.controller.php | 101 +++++++++++-------------- 1 file changed, 45 insertions(+), 56 deletions(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 55f89ea66..d81b56393 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -87,25 +87,22 @@ class installController extends install // Get DB-related variables $con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix'); + $db_info = new stdClass(); $db_info->master_db = get_object_vars($con_string); - $db_info->slave_db[] = get_object_vars($con_string); - - if(!$db_info->default_url) $db_info->default_url = Context::getRequestUri(); + $db_info->slave_db = array($db_info->master_db); + $db_info->default_url = Context::getRequestUri(); $db_info->lang_type = Context::getLangType(); $db_info->use_mobile_view = 'Y'; // Set DB type and information Context::setDBInfo($db_info); - // Create DB Instance - $oDB = &DB::getInstance(); + // Check if available to connect to the DB + $oDB = &DB::getInstance(); $output = $oDB->getError(); if(!$output->toBool()) return $output; if(!$oDB->isConnected()) return $oDB->getError(); - // When installing firebird DB, transaction will not be used - if($db_info->db_type != "firebird") $oDB->begin(); - if($db_info->db_type != "firebird") $oDB->commit(); // Create a db temp config file if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed'); @@ -144,7 +141,9 @@ class installController extends install { // Check if it is already installed if(Context::isInstalled()) return new Object(-1, 'msg_already_installed'); + // Assign a temporary administrator when installing + $logged_info = new stdClass(); $logged_info->is_admin = 'Y'; Context::set('logged_info', $logged_info); @@ -166,12 +165,12 @@ class installController extends install $oDB = &DB::getInstance(); // Check if available to connect to the DB if(!$oDB->isConnected()) return $oDB->getError(); - // When installing firebire DB, transaction will not be used - if($db_info->db_type != "firebird") $oDB->begin(); - // Install all the modules - $this->installDownloadedModule(); - if($db_info->db_type != "firebird") $oDB->commit(); + // Install all the modules + $oDB->begin(); + $this->installDownloadedModule(); + $oDB->commit(); + // Create a config file if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed'); @@ -208,18 +207,22 @@ class installController extends install */ function _makeDbInfoByInstallConfig() { - $db_info->master_db['db_type'] = Context::get('db_type'); - $db_info->master_db['db_port'] = Context::get('db_port'); - $db_info->master_db['db_hostname'] = Context::get('db_hostname'); - $db_info->master_db['db_userid'] = Context::get('db_userid'); - $db_info->master_db['db_password'] = Context::get('db_password'); - $db_info->master_db['db_database'] = Context::get('db_database'); - $db_info->master_db['db_table_prefix'] = Context::get('db_table_prefix'); + $db_info = new stdClass(); + $db_info->master_db = array( + 'db_type' => Context::get('db_type'), + 'db_port' => Context::get('db_port'), + 'db_hostname' => Context::get('db_hostname'), + 'db_userid' => Context::get('db_userid'), + 'db_password' => Context::get('db_password'), + 'db_database' => Context::get('db_database'), + 'db_table_prefix' => Context::get('db_table_prefix') + ); $db_info->slave_db = array($db_info->master_db); $db_info->default_url = Context::getRequestUri(); $db_info->lang_type = Context::getLangType(); $db_info->use_rewrite = Context::get('use_rewrite'); $db_info->time_zone = Context::get('time_zone'); + return $db_info; } @@ -235,12 +238,12 @@ class installController extends install if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1'; if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/'; - $buff = ' $val) { - $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val)); + $buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val)); } - $buff .= "?".">"; + // If safe_mode if(ini_get('safe_mode')) { @@ -283,8 +286,7 @@ class installController extends install $oFtp->ftp_quit(); } - $config_file = Context::getFTPConfigFile(); - FileHandler::WriteFile($config_file, $buff); + FileHandler::WriteFile(Context::getFTPConfigFile(), join(PHP_EOL, $buff)); } function procInstallCheckFtp() @@ -308,14 +310,13 @@ class installController extends install { require_once(_XE_PATH_.'libs/ftp.class.php'); $oFtp = new ftp(); - if(!$oFtp->ftp_connect('localhost', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost')); + if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost')); if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { $oFtp->ftp_quit(); return new Object(-1,'msg_ftp_invalid_auth_info'); } - $oFtp->ftp_quit(); } @@ -359,7 +360,6 @@ class installController extends install Context::set('install_enable', $install_enable); Context::set('phpversion', PHP_VERSION); - return $install_enable; } @@ -392,13 +392,10 @@ class installController extends install if($start) $buff .= $str; } fclose($fp); - $ret = trim($buff); FileHandler::removeFile(_XE_PATH_.$checkFilePath); - if( $ret == $checkString ) - return true; - else - return false; + + return (trim($buff) == $checkString); } /** @@ -515,34 +512,27 @@ class installController extends install return new Object(); } - function _getDbConnText($key, $val, $with_array = false){ - $buff = ''; - if($with_array) - $buff .= "\$db_info->$key = array("; - else - $buff .= "\$db_info->$key = "; - if(!$with_array) $val = array($val); + function _getDbConnText($key, $val, $with_array = false) + { + $buff = array("\$db_info->$key = "); + if($with_array) $buff[] = "array("; + else $val = array($val); + foreach($val as $con_string) { - $buff .= 'array('; + $buff[] = 'array('; foreach($con_string as $k => $v) { - if(in_array($k, array('resource', 'is_connected'))) continue; - if($k == 'db_table_prefix' && !empty($v)) - { - if(substr($v,-1)!='_') $v .= '_'; - } - $buff .= "'$k' => '$v',"; + if($k == 'resource' || $k == 'is_connected') continue; + if($k == 'db_table_prefix' && !empty($v) && substr($v,-1)!='_') $v .= '_'; + $buff[] = "'$k' => '$v',"; } - $buff = substr($buff, 0, -1); - $buff .= '),'; + $buff[] = '),'; } - $buff = substr($buff, 0, -1); - if($with_array) - $buff .= ');' . PHP_EOL; - else - $buff .= ';' . PHP_EOL; - return $buff; + + if($with_array) $buff[] = ')'; + + return join(PHP_EOL, $buff) . ';' . PHP_EOL; } function _getDBConfigFileContents($db_info) @@ -620,7 +610,6 @@ class installController extends install { $buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val)); } - $buff .= "?>"; FileHandler::writeFile($etc_tmp_config_file, $buff); From c9ca182135fb5359eaec5e93a3ab923775ab6f2c Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 23 Nov 2013 12:14:40 +0900 Subject: [PATCH 106/473] =?UTF-8?q?#47=20=EC=B6=94=EA=B0=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/menu/menu.admin.controller.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index a12225cda..b31f604de 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1365,13 +1365,13 @@ class menuAdminController extends menu if(!$menu_srl || !$menu_item_srl) { Context::set('error_messge', Context::getLang('msg_invalid_request')); - + } else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name'])) { Context::set('error_messge', Context::getLang('msg_invalid_request')); } - + // Move the file to a specific director if the uploaded file meets requirement else { @@ -1565,6 +1565,8 @@ class menuAdminController extends menu continue; } + $htPerm[$grantName] = explode(',', $htPerm[$grantName]); + // users in a particular group if(is_array($htPerm[$grantName])) { @@ -1996,7 +1998,7 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext); - + if(checkUploadedFile($args->menu_hover_btn['tmp_name'])) { move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename); @@ -2011,13 +2013,13 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext); - + if(checkUploadedFile($args->menu_active_btn['tmp_name'])) { move_uploaded_file($args->menu_active_btn['tmp_name'], $filename); $returnArray['active_btn'] = $filename; } - + } return $returnArray; } From 714af7cbeb6821a969a371a07d95e9af54217a8c Mon Sep 17 00:00:00 2001 From: ngleader Date: Sat, 23 Nov 2013 12:33:14 +0900 Subject: [PATCH 107/473] NOISSUE code rearrange on install.model.php --- modules/install/install.model.php | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/modules/install/install.model.php b/modules/install/install.model.php index 654610672..0e2da7183 100644 --- a/modules/install/install.model.php +++ b/modules/install/install.model.php @@ -11,6 +11,7 @@ class installModel extends install { $ftp_info->ftp_host = "127.0.0.1"; } + $connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { @@ -21,18 +22,12 @@ class installModel extends install $curpwd = "ssh2.sftp://$sftp".$this->pwd; $dh = @opendir($curpwd); if(!$dh) return new Object(-1, 'msg_ftp_invalid_path'); + $list = array(); while(($file = readdir($dh)) !== false) { - if(is_dir($curpwd.$file)) - { - $file .= "/"; - } - else - { - continue; - } - $list[] = $file; + if(!is_dir($curpwd.$file)) continue; + $list[] = $file . "/"; } closedir($dh); $this->add('list', $list); @@ -40,8 +35,7 @@ class installModel extends install function getInstallFTPList() { - $ftp_info = Context::getRequestVars(); - if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) + if(!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) { return new Object(-1, 'msg_ftp_invalid_auth_info'); } @@ -56,12 +50,12 @@ class installModel extends install return $this->getSFTPList(); } - if(function_exists(ftp_connect)) + $_list = NULL; + if(function_exists('ftp_connect')) { $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host)); - $login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password); - if(!$login_result) + if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { ftp_close($connection); return new Object(-1,'msg_ftp_invalid_auth_info'); @@ -93,13 +87,13 @@ class installModel extends install } } } - $list = array(); + $list = array(); if($_list) { foreach($_list as $k => $v) { - $src = null; + $src = new stdClass(); $src->data = $v; $res = Context::convertEncoding($src); $v = $res->data; From 5f253adbfc93cc9c29a49f54f65d704f5fd73fac Mon Sep 17 00:00:00 2001 From: ngleader Date: Sat, 23 Nov 2013 12:58:37 +0900 Subject: [PATCH 108/473] NOISSUE code rearrange on addon.controller.php --- modules/addon/addon.controller.php | 72 +++++++++++------------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index 8e690e1e6..1405b3ad9 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -15,7 +15,6 @@ class addonController extends addon */ function init() { - } /** @@ -36,7 +35,6 @@ class addonController extends addon $site_srl = $site_module_info->site_srl; $addon_path = _XE_PATH_ . 'files/cache/addons/'; - $addon_file = $addon_path . $site_srl . $type . '.acivated_addons.cache.php'; if($this->addon_file_called) @@ -46,10 +44,8 @@ class addonController extends addon $this->addon_file_called = TRUE; - if(!is_dir($addon_path)) - { - FileHandler::makeDir($addon_path); - } + FileHandler::makeDir($addon_path); + if(!file_exists($addon_file)) { $this->makeCacheFile($site_srl, $type); @@ -83,42 +79,38 @@ class addonController extends addon function makeCacheFile($site_srl = 0, $type = "pc", $gtype = 'site') { // Add-on module for use in creating the cache file - $buff = ''; + $buff = array('getInsertedAddons($site_srl, $gtype); foreach($addon_list as $addon => $val) { - if($val->addon == "smartphone") - { - continue; - } - if(!is_dir(_XE_PATH_ . 'addons/' . $addon)) - { - continue; - } - if(($type == "pc" && $val->is_used != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y') || ($gtype == 'global' && $val->is_fixed != 'Y')) + if($val->addon == "smartphone" + || ($type == "pc" && $val->is_used != 'Y') + || ($type == "mobile" && $val->is_used_m != 'Y') + || ($gtype == 'global' && $val->is_fixed != 'Y') + || !is_dir(_XE_PATH_ . 'addons/' . $addon)) { continue; } $extra_vars = unserialize($val->extra_vars); $mid_list = $extra_vars->mid_list; - if(!is_array($mid_list) || !count($mid_list)) + if(!is_array($mid_list) || count($mid_list) < 1) { $mid_list = NULL; } - $buff .= '$rm = \'' . $extra_vars->xe_run_method . "';"; - $buff .= '$ml = array('; + $buff[] = '$rm = \'' . $extra_vars->xe_run_method . "';"; + $buff[] = '$ml = array('; if($mid_list) { foreach($mid_list as $mid) { - $buff .= "'$mid' => 1,"; + $buff[] = "'$mid' => 1,"; } } - $buff .= ');'; - $buff .= sprintf('$addon_file = \'./addons/%s/%s.addon.php\';', $addon, $addon); + $buff[] = ');'; + $buff[] = sprintf('$addon_file = \'./addons/%s/%s.addon.php\';', $addon, $addon); if($val->extra_vars) { @@ -127,34 +119,20 @@ class addonController extends addon } $addon_include = sprintf('unset($addon_info); $addon_info = unserialize(base64_decode(\'%s\')); @include($addon_file);', $extra_vars); - $buff .= 'if(file_exists($addon_file)){'; - $buff .= 'if($rm === \'no_run_selected\'){'; - $buff .= 'if(!isset($ml[$_m])){'; - $buff .= $addon_include; - $buff .= '}}else{'; - $buff .= 'if(isset($ml[$_m]) || count($ml) === 0){'; - $buff .= $addon_include; - $buff .= '}}}'; + $buff[] = 'if(file_exists($addon_file)){'; + $buff[] = 'if($rm === \'no_run_selected\'){'; + $buff[] = 'if(!isset($ml[$_m])){'; + $buff[] = $addon_include; + $buff[] = '}}else{'; + $buff[] = 'if(isset($ml[$_m]) || count($ml) === 0){'; + $buff[] = $addon_include; + $buff[] = '}}}'; } - $buff = sprintf('', $buff); - $addon_path = _XE_PATH_ . 'files/cache/addons/'; - if(!is_dir($addon_path)) - { - FileHandler::makeDir($addon_path); - } - - if($gtype == 'site') - { - $addon_file = $addon_path . $site_srl . $type . '.acivated_addons.cache.php'; - } - else - { - $addon_file = $addon_path . $type . '.acivated_addons.cache.php'; - } - - FileHandler::writeFile($addon_file, $buff); + FileHandler::makeDir($addon_path); + $addon_file = $addon_path . ($gtype == 'site' ? $site_srl : '') . $type . '.acivated_addons.cache.php'; + FileHandler::writeFile($addon_file, join(PHP_EOL, $buff)); } /** From f16c2aced03e743a8a84fa5b2f492c6df6d337f3 Mon Sep 17 00:00:00 2001 From: ngleader Date: Sat, 23 Nov 2013 19:58:42 +0900 Subject: [PATCH 109/473] NOISSUE code rearrange on counter.model.php --- modules/counter/counter.model.php | 117 ++++++------------------------ 1 file changed, 24 insertions(+), 93 deletions(-) diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php index d961ae44c..f60aea505 100644 --- a/modules/counter/counter.model.php +++ b/modules/counter/counter.model.php @@ -48,7 +48,7 @@ class counterModel extends counter $result = $output->data->count ? TRUE : FALSE; if($result && $oCacheHandler->isSupport()) { - $oCacheHandler->put($cache_key, $result); + $oCacheHandler->put($cache_key, TRUE); } return $result; @@ -88,7 +88,7 @@ class counterModel extends counter $result = $output->data->count ? TRUE : FALSE; if($result && $oCacheHandler->isSupport()) { - $oCacheHandler->put($cache_key, $result); + $oCacheHandler->put($cache_key, TRUE); $_old_date = date('Ymd', strtotime('-1 day')); $oCacheHandler->delete('object:insertedTodayStatus:' . $site_srl . '_' . $_old_date); } @@ -106,22 +106,8 @@ class counterModel extends counter 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 = new stdClass(); - $args->regdate = implode(',', $selected_date); - // If a single date log is selected - } - else - { - if(strlen($selected_date) == 8) - { - $selected_date = $selected_date; - } - $args->regdate = $selected_date; - } - + $args = new stdClass(); + $args->regdate = is_array($selected_date) ? join(',', $selected_date) : $selected_date; if($site_srl) { $args->site_srl = $site_srl; @@ -131,7 +117,6 @@ class counterModel extends counter { $output = executeQuery('counter.getCounterStatusDays', $args); } - $status = $output->data; if(!is_array($selected_date)) @@ -139,14 +124,9 @@ class counterModel extends counter return $status; } - if(!is_array($status)) - { - $status = array($status); - } - - unset($output); - - foreach($status as $key => $val) + if(!is_array($status)) $status = array($status); + $output = array(); + foreach($status as $val) { $output[substr($val->regdate, 0, 8)] = $val; } @@ -182,14 +162,12 @@ class counterModel extends counter $output = executeQuery('counter.getStartLogDate'); } - $start_year = substr($output->data->regdate, 0, 4); - - if(!$start_year) + if(!($start_year = substr($output->data->regdate, 0, 4))) { $start_year = date("Y"); } - for($i = $start_year; $i <= date("Y"); $i++) + for($i = $start_year, $y = date("Y"); $i <= $y; $i++) { $args = new stdClass(); $args->start_date = sprintf('%04d0000', $i); @@ -205,21 +183,10 @@ class counterModel extends counter $output = executeQuery('counter.getCounterStatus', $args); } - if(!$isPageView) - { - $count = (int) $output->data->unique_visitor; - } - else - { - $count = (int) $output->data->pageview; - } - + $count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor); $status->list[$i] = $count; - if($count > $max) - { - $max = $count; - } + if($count > $max) $max = $count; $sum += $count; } @@ -262,21 +229,10 @@ class counterModel extends counter $output = executeQuery('counter.getCounterStatus', $args); } - if(!$isPageView) - { - $count = (int) $output->data->unique_visitor; - } - else - { - $count = (int) $output->data->pageview; - } + $count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor); + $status->list[$day] = $count; - $status->list[$day] = (int) $count; - - if($count > $max) - { - $max = $count; - } + if($count > $max) $max = $count; $sum += $count; } @@ -300,21 +256,10 @@ class counterModel extends counter $output = executeQuery('counter.getCounterStatus', $args); } - if(!$isPageView) - { - $count = (int) $output->data->unique_visitor; - } - else - { - $count = (int) $output->data->pageview; - } + $count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor); + $status->list[$i] = $count; - $status->list[$i] = (int) $count; - - if($count > $max) - { - $max = $count; - } + if($count > $max) $max = $count; $sum += $count; } @@ -341,10 +286,7 @@ class counterModel extends counter $count = (int) $output->data->count; $status->list[$i] = $count; - if($count > $max) - { - $max = $count; - } + if($count > $max) $max = $count; $sum += $count; } @@ -371,21 +313,10 @@ class counterModel extends counter $output = executeQuery('counter.getCounterStatus', $args); } - if(!$isPageView) - { - $count = (int) $output->data->unique_visitor; - } - else - { - $count = (int) $output->data->pageview; - } - + $count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor); $status->list[$i] = $count; - if($count > $max) - { - $max = $count; - } + if($count > $max) $max = $count; $sum += $count; } @@ -405,7 +336,7 @@ class counterModel extends counter $output1 = $this->getHourlyStatus('week', $date1); $tmp = array(); - foreach($output1->list AS $key => $value) + foreach($output1->list as $key => $value) { $tmp["'" . $key . "'"] = $value; } @@ -416,7 +347,7 @@ class counterModel extends counter $output2 = $this->getHourlyStatus('week', $date2); $tmp = array(); - foreach($output2->list AS $key => $value) + foreach($output2->list as $key => $value) { $tmp["'" . $key . "'"] = $value; } @@ -433,7 +364,7 @@ class counterModel extends counter $output1 = $this->getHourlyStatus('week', $date1, 0, TRUE); $tmp = array(); - foreach($output1->list AS $key => $value) + foreach($output1->list as $key => $value) { $tmp["'" . $key . "'"] = $value; } @@ -444,7 +375,7 @@ class counterModel extends counter $output2 = $this->getHourlyStatus('week', $date2, 0, TRUE); $tmp = array(); - foreach($output2->list AS $key => $value) + foreach($output2->list as $key => $value) { $tmp["'" . $key . "'"] = $value; } From c2b39338316da3df5d5305173c3de23e5b4f425a Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 23 Nov 2013 19:59:00 +0900 Subject: [PATCH 110/473] =?UTF-8?q?#55=20=EC=8A=A4=ED=8C=B8=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EC=B0=A8=EB=8B=A8=20=EC=8B=9C=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EB=90=98=EC=97=88=EB=8B=A4=EB=8A=94=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EC=9E=98=EB=AA=BB=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/communication/communication.controller.php | 7 ++++++- modules/spamfilter/spamfilter.controller.php | 13 ++++--------- modules/spamfilter/spamfilter.model.php | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index a2ea2fd39..133221fa1 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -114,8 +114,13 @@ class communicationController extends communication // send a message $output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content); + if(!$output->toBool()) + { + return $output; + } + // send an e-mail - if($output->toBool() && $send_mail == 'Y') + if($send_mail == 'Y') { $view_url = Context::getRequestUri(); $content = sprintf("%s

    From : %s", $content, $view_url, $view_url); diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 97e78d05b..719ea7857 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -176,25 +176,20 @@ class spamfilterController extends spamfilter function triggerSendMessage(&$obj) { if($_SESSION['avoid_log']) return new Object(); - // Check the login status, login information, and permission - $is_logged = Context::get('is_logged'); + $logged_info = Context::get('logged_info'); - // In case logged in, check if it is an administrator - if($is_logged) - { - if($logged_info->is_admin == 'Y') return new Object(); - } + if($logged_info->is_admin == 'Y') return new Object(); $oFilterModel = getModel('spamfilter'); // Check if the IP is prohibited $output = $oFilterModel->isDeniedIP(); if(!$output->toBool()) return $output; // Check if there is a ban on the word - $text = $obj->title.$obj->content; + $text = $obj->title . ' ' . $obj->content; $output = $oFilterModel->isDeniedWord($text); if(!$output->toBool()) return $output; // Check the specified time - $output = $oFilterModel->checkLimited(); + $output = $oFilterModel->checkLimited(TRUE); if(!$output->toBool()) return $output; // Save a log $this->insertLog(); diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index 3a4822a7c..b3762a13b 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -120,11 +120,11 @@ class spamfilterModel extends spamfilter { if($isMessage) { - $message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval); + $message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval); } else { - $message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval); + $message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval); } $oSpamFilterController = &getController('spamfilter'); From 7e379bfee93e0ceab046eac5fab467ca10bea70a Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 23 Nov 2013 20:14:34 +0900 Subject: [PATCH 111/473] =?UTF-8?q?#55=20radio=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EA=B0=92=EC=9D=B4=20=EC=B1=84=EC=9B=8C?= =?UTF-8?q?=EC=A7=80=EB=8F=84=EB=A1=9D=20=EB=B3=B4=EC=99=84=20=EB=B0=8F=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/widget/tpl/js/generate_code.js | 1 + .../tpl/widget_generate_code.include.html | 58 ++++++++++++------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js index 94bc3fac4..f6e2946bb 100644 --- a/modules/widget/tpl/js/generate_code.js +++ b/modules/widget/tpl/js/generate_code.js @@ -132,6 +132,7 @@ function doFillWidgetVars() { else node.value = unescaped_val; jQuery('#'+name).val(node.value); break; + case "radio" : case "checkbox" : if(selected_node.getAttribute(name)) { var val = selected_node.getAttribute(name).split(','); diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html index 5eeebd320..8c956f9d0 100644 --- a/modules/widget/tpl/widget_generate_code.include.html +++ b/modules/widget/tpl/widget_generate_code.include.html @@ -1,7 +1,8 @@ - - - + + + +
    @@ -12,6 +13,7 @@
    +
    @@ -19,6 +21,7 @@
    +
    @@ -26,6 +29,7 @@

    {$lang->about_widget_cache}

    + {@$suggestion_id = 0} {@$suggestion_id++} @@ -36,20 +40,25 @@

    {$var->group}

    {@$group = $var->group}     + {@$not_first = true}
    -
    + -
    - -
    + + + + + -
    - + + + + {@$inits = array_keys($var->init_options)} @@ -122,21 +131,28 @@ {$lang->cmd_select} - - - + + + + + + + + +

    {$var->description}

    + From 80fa661fc707903615fa1bccf308b28571a33a93 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 23 Nov 2013 21:36:06 +0900 Subject: [PATCH 112/473] =?UTF-8?q?modules/widget/tpl=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20minify=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 19 +- modules/widget/tpl/css/widget.css | 238 +++- modules/widget/tpl/js/generate_code.js | 309 ++--- modules/widget/tpl/js/widget.js | 1477 ++++++++++++------------ modules/widget/tpl/js/widget_admin.js | 629 +++++----- 5 files changed, 1446 insertions(+), 1226 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3e580cfcb..4bc54e98d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -44,18 +44,13 @@ module.exports = function(grunt) { uglify: { 'common-js': { options: { - banner: banner_xe_js, - report: 'min' + banner: banner_xe_js }, files: { 'common/js/xe.min.js': ['common/js/xe.js'] } }, 'modules': { - options: { - banner: banner, - report: 'min' - }, files: { // addon 'addons/captcha/captcha.min.js' : ['addons/captcha/captcha.js'], @@ -80,6 +75,10 @@ module.exports = function(grunt) { 'modules/editor/components/image_gallery/tpl/slide_gallery.min.js' : ['modules/editor/components/image_gallery/tpl/slide_gallery.js'], // module/importer 'modules/importer/tpl/js/importer_admin.min.js': ['modules/importer/tpl/js/importer_admin.js'], + // modules/widget + 'modules/widget/tpl/js/generate_code.min.js': ['modules/widget/tpl/js/generate_code.js'], + 'modules/widget/tpl/js/widget.min.js': ['modules/widget/tpl/js/widget.js'], + 'modules/widget/tpl/js/widget_admin.min.js': ['modules/widget/tpl/js/widget_admin.js'], } } }, @@ -105,12 +104,20 @@ module.exports = function(grunt) { files: { 'modules/editor/components/multimedia_link/tpl/popup.min.css': ['modules/editor/components/multimedia_link/tpl/popup.css'], } + }, + 'moudle-widget-tpl': { + files: { + 'modules/widget/tpl/css/widget.min.css': ['modules/widget/tpl/css/widget.css'], + } } }, jshint: { files: [ 'Gruntfile.js', 'common/js/*.js', '!common/js/html5.js', '!common/js/jquery.js', '!common/js/x.js', '!common/js/xe.js', + 'modules/widget/tpl/js/generate_code.js', + 'modules/widget/tpl/js/widget.js', + 'modules/widget/tpl/js/widget_admin.js', '!**/*.min.js', '!**/*-packed.js' ], diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css index 04b185981..2fae1b591 100644 --- a/modules/widget/tpl/css/widget.css +++ b/modules/widget/tpl/css/widget.css @@ -1,38 +1,210 @@ @charset "utf-8"; -.widget_title{border:1px solid #ddd;margin:10px 5px 5px 0;padding:3px} -.widget_mid_list{margin:0 0 5px 10px} -.widget_description{color:#aaa;border-top:1px dotted #eee;margin:5px 0 0 0;padding:5px 0 0 0} -#colorset_area{margin-top:.5em} -#colorset_area .header{float:left;margin-right:.5em;padding-top:.2em} -#colorset_area .footer{float:left} -#zonePageContent{overflow:hidden;width:100%;padding:0 !important;margin:0 !important} -.pageAddContent{width:700px} -.widgetOutput{float:left;cursor:move;z-index:998;overflow:hidden;position:relative;width:100%;min-height:24px} + + +.widget_title { + margin: 10px 5px 5px 0; + padding: 3px; + border: 1px solid #ddd; +} +.widget_mid_list { + margin: 0 0 5px 10px; +} +.widget_description { + margin: 5px 0 0 0; + padding: 5px 0 0 0; + border-top: 1px dotted #eee; + color: #aaa; +} + +#colorset_area { + margin-top: .5em; +} +#colorset_area .header { + float: left; + margin-right: .5em; + padding-top: .2em; +} +#colorset_area .footer { + float: left; +} +#zonePageContent { + overflow: hidden; + margin: 0 !important; + padding: 0 !important; + width: 100%; +} + +.pageAddContent { + width: 700px; +} +.widgetOutput { + float: left; + z-index: 998; + position: relative; + overflow: hidden; + width: 100%; + min-height: 24px; + cursor: move; +} .widgetOutput .widgetBorder, -.widgetOutput .widgetBoxBorder{height:100%;border:1px dashed #ccc;z-index:999;box-sizing:border-box;min-height:24px} -.widgetOutput .widgetResize {border:0;background:transparent url("../images/btn_resize.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:1px;right:1px;cursor:pointer;z-index:1000} -.widgetOutput .widgetResizeLeft {border:0;background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:1px;left:1px;cursor:pointer;z-index:1000} -.widgetOutput .widgetBoxResize {border:0;background:transparent url("../images/btn_resize.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:1px;right:1px;cursor:pointer;z-index:1000} -.widgetOutput .widgetBoxResizeLeft{border:0;background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:0;left:1px;cursor:pointer;z-index:1000} -.widgetButtons{z-index:1000;overflow:hidden;*zoom:1;float:left;padding:0 10px;line-height:24px;position:absolute;top:0;visibility:hidden;box-shadow:0 0 3px #333 inset} -.widgetButtons#widgetButton{background-color:#C7DBE9;left:0} -.widgetButtons#widgetBoxButton{background-color:#D2E9C7;right:0} -.widgetButtons>button{border:0;width:14px;height:14px;padding:14px 0 0 0;overflow:hidden;cursor:pointer;z-index:99;background:transparent url("../../../admin/tpl/img/glyphicons-halflings.png") no-repeat} -.widgetButtons .widgetSetup{background-position:-432px 0} +.widgetOutput .widgetBoxBorder { + z-index: 999; + box-sizing: border-box; + height: 100%; + min-height: 24px; + border: 1px dashed #ccc; +} +.widgetOutput .widgetResize { + z-index: 1000; + position: absolute; + bottom: 1px; + right: 1px; + width: 12px; + height: 12px; + border: 0; + cursor: pointer; + background: transparent url("../images/btn_resize.gif") no-repeat left bottom; +} +.widgetOutput .widgetResizeLeft { + height: 12px; + bottom: 1px; + position: absolute; + border: 0; + width: 12px; + z-index: 1000; + left: 1px; + cursor: pointer; + background: transparent url("../images/btn_resize_left.gif") no-repeat left bottom; +} +.widgetOutput .widgetBoxResize { + z-index: 1000; + position: absolute; + right: 1px; + bottom: 1px; + width: 12px; + height: 12px; + border: 0; + cursor: pointer; + background: transparent url("../images/btn_resize.gif") no-repeat left bottom; +} +.widgetOutput .widgetBoxResizeLeft { + z-index: 1000; + position: absolute; + left: 1px; + bottom: 0; + width: 12px; + height: 12px; + border: 0; + cursor: pointer; + background: transparent url("../images/btn_resize_left.gif") no-repeat left bottom; +} + +.widgetButtons { + float: left; + z-index: 1000; + visibility: hidden; + position: absolute; + top: 0; + overflow: hidden; + padding: 0 10px; + line-height: 24px; + box-shadow: 0 0 3px #333 inset; + *zoom: 1; +} +.widgetButtons#widgetButton { + left: 0; + background-color: #C7DBE9; +} +.widgetButtons#widgetBoxButton { + right: 0; + background-color: #D2E9C7; +} +.widgetButtons>button { + z-index: 99; + padding: 14px 0 0 0; + overflow: hidden; + width: 14px; + height: 14px; + border: 0; + cursor: pointer; + background: transparent url("../../../admin/tpl/img/glyphicons-halflings.png") no-repeat; +} +.widgetButtons .widgetSetup { + background-position: -432px 0; +} .widgetButtons .widgetSize, -.widgetButtons .widgetBoxSize{background-position:-96px -120px} -.widgetButtons .widgetStyle{background-position:-456px -144px} +.widgetButtons .widgetBoxSize { + background-position: -96px -120px; +} +.widgetButtons .widgetStyle { + background-position: -456px -144px; +} .widgetButtons .widgetCopy, -.widgetButtons .widgetBoxCopy{background-position:0 -96px} +.widgetButtons .widgetBoxCopy { + background-position: 0 -96px; +} .widgetButtons .widgetRemove, -.widgetButtons .widgetBoxRemove{background-position:-456px 0} -.help{padding:5px 0;background-color:#EFEFEF;border-top:1px solid #ccc} -ul.midCommand{float:left;margin:0 0 0 10px;;padding:0;*zoom:1} -ul.midCommand li{display:block;margin-bottom:5px;list-style:none} -a.widgetStyle{display:inline-block;margin:0 10px 10px 0;border:1px solid #fff;overflow:hidden;*zoom:1;width:96px;height:96px;position:relative;text-decoration:none} -a.widgetStyle:hover{border:1px dashed #ccc} -a.widgetStyle:hover span{display:none} -a.widgetStyle.selected{border:1px dashed #999} -a.widgetStyle img {width:96px;height:96px;margin:1px} -a.widgetStyle span{position:absolute;left:0;bottom:0;display:block;width:96px;background-color:#888;color:#fff;padding:4px 3px 3px 3px;opacity:.8;filter:alpha(opacity=80);text-align:center;font-family:tahoma} -#zonePageContent .widgetContainer{min-height:20px} \ No newline at end of file +.widgetButtons .widgetBoxRemove { + background-position: -456px 0; +} + +.help { + padding: 5px 0; + border-top: 1px solid #ccc; + background-color: #EFEFEF; +} +ul.midCommand { + float: left; + margin: 0 0 0 10px; + padding: 0; + *zoom: 1; +} +ul.midCommand li { + display: block; + margin-bottom: 5px; + list-style: none; +} + +a.widgetStyle { + display: inline-block; + position: relative; + margin: 0 10px 10px 0; + overflow: hidden; + width: 96px; + height: 96px; + border: 1px solid #fff; + text-decoration: none; + *zoom: 1; +} +a.widgetStyle:hover { + border: 1px dashed #ccc; +} +a.widgetStyle:hover span { + display: none; +} +a.widgetStyle.selected { + border: 1px dashed #999; +} +a.widgetStyle img { + margin: 1px; + width: 96px; + height: 96px; +} +a.widgetStyle span { + display: block; + position: absolute; + left: 0; + bottom: 0; + width: 96px; + padding: 4px 3px 3px 3px; + text-align: center; + font-family: tahoma; + color: #fff; + filter: alpha(opacity=80); + opacity: .8; + background-color: #888; +} + +#zonePageContent .widgetContainer { + min-height: 20px; +} diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js index f6e2946bb..87eb393f6 100644 --- a/modules/widget/tpl/js/generate_code.js +++ b/modules/widget/tpl/js/generate_code.js @@ -8,16 +8,17 @@ function doDisplaySkinColorset(colorset) function completeGetSkinColorset(ret_obj) { + /*jshint -W004*/ var sel = jQuery("select[name=colorset]").get(0); var length = sel.options.length; var selected_colorset = colorset; - for(var i=0;i    ');a.fn.xeSortableTable=function(){return this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(d){var e,f,g,h,i,j,k,l,m,n,o,p;if(1==d.which){if(e=a(this),f=e.closest("tr"),g=e.closest("table"),p=g.get(0).offsetParent,i=f.height(),j=f.width(),before_event=a.Event("before-drag.st"),g.trigger(before_event),before_event.isDefaultPrevented())return!1;l={x:d.pageX,y:d.pageY},k=getOffset(f.get(0),p),$clone=f.attr("target",!0).clone(!0).appendTo(g),o=(h=g.find("thead th")).length,h.filter("[colspan]").attr("colspan",function(a,b){o+=b-1}),c.find("td").attr("colspan",o),m=[],g.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var b,c=a(this);b=getOffset(this,p),m.push({top:b.top,bottom:b.top+c.height(),$item:c})}),$clone.addClass("draggable").css({position:"absolute",opacity:.6,width:j,height:i,left:k.left,top:k.top,zIndex:100}),c.css({position:"absolute",opacity:.6,width:j,height:"10px",left:k.left,top:k.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(g),f.css("opacity",.6),a(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(a){var b,d,e,f,g;for(n=null,b={x:l.x-a.pageX,y:l.y-a.pageY},d=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],e&&g.top>d||f-1>e&&g.bottomd-12?(n.state="before",c.css("top",g.top-5)):(n.state="after",c.css("top",g.bottom-5)));$clone.css({top:d})}).bind("mouseup.st",function(){var d;b=!1,a(document).unbind("mousemove.st mouseup.st"),f.removeAttr("target").css("opacity",""),$clone.remove(),c.remove(),n&&(d=a(n.element),d[n.state](f),g.trigger("after-drag.st"))})}}),this},a("table.sortable").xeSortableTable()}),jQuery(function(a){a(".filebox").bind("before-open.mw",function(){function b(e){d.html(e.html),d.find(".select").bind("click",function(){var b=a("input.select_checkbox:checked");if(0==b.length){var d=a(this).closest("tr").find("img.filebox_item").attr("src");d?(c.trigger("filebox.selected",[d]),c.trigger("close.mw")):alert("None selected!")}else c.trigger("filebox.selected",[b]),c.trigger("close.mw");return!1}),d.find(".x_pagination").find("a").filter(function(){return a(this).data("toggle")?!1:a(this).parent().hasClass("x_disabled")?!1:a(this).parent().hasClass("x_active")?!1:!0}).bind("click",function(){var c=a(this).attr("page");return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),a("#goToFileBox").find("button").bind("click",function(){var c=a(this).prev("input").val();return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),d.closest(".x_modal-body").scrollTop(0)}var c,d,e;c=a(this),e=c.attr("href"),d=a(e).find(".filebox_list"),a.exec_json("module.getFileBoxListHtml",{page:"1"},b)});var b=a(".x .dsTg .__simple"),c=a(".x .dsTg .__detail"),d=a(".x .dsTg td.title");d.each(function(){var b=a(this);0==b.find("p.x_alert").length&&b.addClass("tg").find(">*:not(:first-child)").hide()});var e=a(".x .dsTg td.tg>*:not(:first-child)");b.click(function(){e.hide(),c.removeClass("x_active"),b.addClass("x_active")}),c.click(function(){e.show(),c.addClass("x_active"),b.removeClass("x_active")})}),jQuery(function(a){a.fn.xeMultilingualWindow=function(b){function c(){return o.is(":visible")&&q&&confirm(xe.msg_confirm_save_and_use_multilingual)&&o.find(".save-useit").trigger("click"),!0}function d(){if(p.is(":visible")&&p.find(".editMode").length){var a=p.find(".editMode");confirm(xe.msg_confirm_save_and_use_multilingual)?a.find(".save").trigger("click"):a.find(".cancel").trigger("click")}return!0}function e(){return p.find(".item > fieldset").hide().prev("a").children("i").removeClass("x_icon-chevrom-up").addClass("x_icon-chevron-down"),n.find('[href="#lang_create"]').trigger("click"),o.find(".editMode").children("textarea").val(""),q=!1,!0}function f(a){a?(i(1,xe.current_lang,"",a,!1),n.find('[href="#lang_search"]').trigger("click",!0)):i(1,xe.current_lang,"","",!1)}function g(){return c()?d()?e()?void 0:!1:!1:!1}function h(a,b){var c=n.data("lang-target");q=!1,c&&c.trigger("selected.g11n",[a,b])}function i(c,d,e,f,g){"undefined"==typeof c&&(c=1),"undefined"==typeof d&&(d=xe.current_lang),"undefined"==typeof e&&(e=""),"undefined"==typeof f&&(f=""),"undefined"==typeof g&&(g=!0),a.exec_json("module.getModuleAdminLangListHtml",{page:c,lang_code:d,search_keyword:e,name:f,list_count:b.list_count,mid:current_url.getQuery("mid")},function(b){b&&b.html&&(p.html(b.html),j(),k(),l(),m(),g&&(document.location.href="#lang_search"),f&&a("#lang_search").find('[href^="#lang-"]').trigger("click"))})}function j(){p.find(".x_pagination a").click(function(){var b=a(this).data("page"),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):void 0}),p.find(".x_pagination").submit(function(){var b=a(this).find('[name="page"]').val(),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):!1})}function k(){p.find(".search").submit(function(){var b=a(this).find('[name="search_keyword"]').val(),c=a(this).find('[name="lang_code"]').val();return i(1,c,b),!1}),p.find("#search_cancel").click(function(){i(1,xe.current_lang,"")})}function l(){p.find(".set").append('').click(function(){function b(b){var d=c.next("fieldset").find("textarea");d.each(function(){var c=a(this),d=b.langs[c.data("lang")],e=/^\$user_lang->/;e.test(d)?c.val("").data("value",""):c.val(d).data("value",d)}),c.data("is_loaded",!0)}var c=a(this),e=c.data("lang_code");d();var f="x_icon-chevron-up",g="x_icon-chevron-down";c.next("fieldset").is(":visible")?c.children("i").removeClass(f).addClass(g):(c.parent(".item").siblings(".item").find("a > i").removeClass(f).addClass(g).end().children("fieldset").hide(),c.children("i").removeClass(g).addClass(f)),"undefined"==typeof c.data("is_loaded")&&a.exec_json("module.getModuleAdminLangCode",{name:e,mid:current_url.getQuery("mid")},b)})}function m(){b.view_use||p.find(".useit").hide(),b.view_modify||p.find(".modify").hide(),b.view_delete||p.find(".delete").hide(),"save"==b.modify_type&&p.find(".save").text(xe.cmd_save),p.find(".modify").click(function(){a(this).closest("fieldset").addClass("editMode").find("textarea").removeAttr("disabled"),a(this).siblings(".cancel").prependTo(a(this).parent()),a(this).siblings(".delete").attr("disabled","disabled")}),p.find(".cancel").click(function(){return a(this).closest("fieldset").removeClass("editMode").find("textarea").attr("disabled","disabled").each(function(){var b=a(this);b.val(b.data("value"))}),a(this).siblings(".modify").prependTo(a(this).parent()),a(this).siblings(".delete").removeAttr("disabled"),!1}),p.find(".delete").click(function(){if(confirm(xe.confirm_delete)){var b=a(this);lang_name=b.closest(".item").find('[href^="#lang-"]').data("lang_code"),a.exec_json("module.procModuleAdminDeleteLang",{name:lang_name,mid:current_url.getQuery("mid")},function(a){if(a){if(a.error)return alert(a.message),void 0;var b=p.find(".x_pagination"),c=b.data("page"),d=b.data("search_keyword"),e=b.data("lang_code");c||($page=1),i(c,e,d)}})}}),p.find(".item").submit(function(){var b=a(this),c=b.find(".editMode").children("textarea"),d=b.find('[href^="#lang-"]'),e={},f=null;return c.each(function(){var b=a(this);e[b.attr("class")]=b.val(),b.data("tmp_value",b.val()),xe.current_lang==b.attr("class")&&(f=b.val())}),e.lang_name=d.data("lang_code"),e.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",e,function(e){e&&!e.error&&e.name&&(c.each(function(){var b=a(this);b.data("value",b.data("tmp_value"))}),d.children("span").html(f),p.find(".cancel").trigger("click"),b.find(".useit").trigger("click"))}),!1}),p.find(".useit").click(function(){var b=a(this),c=b.closest(".item").find('[href^="#lang-"]'),d=c.data("lang_code"),e=c.children("span").text();h(d,e)})}var n=a(this),o=n.find("#lang_create"),p=n.find("#lang_search"),q=!1;return b=a.extend({create_type:"save_and_use",modify_type:"save_and_use",view_use:!0,view_modify:!0,view_delete:!1,list_count:5},b||{}),"save_and_use"!=b.create_type&&o.find(".save-useit").text(xe.cmd_save),n.find(".x_tabbable").xeTabbable(),o.find(".editMode textarea").change(function(){q=!0}),o.submit(function(){function c(a){a&&!a.error&&a.name&&("save_and_use"==b.create_type?h(a.name,g):(alert(a.message),e()))}var d=a(this),f={},g=null;return d.find(".editMode").children("textarea").each(function(){var b=a(this);f[b.attr("class")]=b.val(),xe.current_lang==b.attr("class")&&(g=b.val())}),g?(f.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",f,c),!1):(alert(xe.msg_empty_multilingual),!1)}),n.find('[href="#lang_search"]').click(function(a,b){"undefined"==typeof b&&i()}),n.bind("reset.g11n",function(){e()}),n.bind("before-open.g11n",function(a,b){f(b)}),n.bind("before-close.g11n",function(){return g()}),this}});var is_loaded_multilingual_window_html=!1;jQuery(function(a){a.fn.xeLoadMultilingualWindowHtml=function(){function b(b){var c=a("#content");a(b.html).appendTo(c).xeMultilingualWindow(),a(".lang_code").trigger("loaded-multilingualWindow")}return a.exec_json("module.getModuleAdminMultilingualHtml",{mid:current_url.getQuery("mid")},b),this}});var multilingual_id_count=0;jQuery(function(a){a.fn.xeApplyMultilingualUI=function(){return a(this).each(function(){function b(){function b(){i.val(l.val()).width(i.data("width")).removeAttr("disabled").data("active",!1),i.parent(".g11n").removeClass("active")}function f(){function c(a){if(a&&a.langs){var b=i.width();i.closest(".g11n").addClass("active"),i.val(a.langs[xe.current_lang]).attr("disabled","disabled").width(b-44).data("active",!0)}}b();var d=/^\$user_lang->/;d.test(i.val())&&a.exec_json("module.getModuleAdminLangCode",{name:i.val().replace("$user_lang->",""),mid:current_url.getQuery("mid")},c)}var g=a("#g11n"),h=c.width();if("TEXTAREA"==d.tagName||"textarea"==c.data("type"))var i=a(''),n=k.get(0).form;n.setAttribute("editor_sequence",a),k.css("display","none");var o="";jQuery("input[name=content]",n).size()>0&&(o=jQuery("input[name=content]",n).val().replace(/src=\"files\/attach/g,'src="'+request_uri+"files/attach"),jQuery("#xpress-editor-"+a).val(o)),k.hide().css("width","100%").before(l).after(m);var p=new xe.XpressCore,q=l.get(0),r=k.get(0),t=m.get(0),u=jQuery(".xpress-editor",n).get(0);p.getFrame=function(){return q},p.getContent=function(){editorGetContentTextarea_xe(a)};var v=n[c].value;return xFF&&!v&&(v="
    "),v=editorReplacePath(v),n[c].value=v,jQuery("#xpress-editor-"+a).val(v),editorRelKeys[a]=new Array,editorRelKeys[a].primary=n[b],editorRelKeys[a].content=n[c],editorRelKeys[a].func=editorGetContentTextarea_xe,editorRelKeys[a].editor=p,editorRelKeys[a].pasteHTML=function(a){p.exec("PASTE_HTML",[a])},xe.Editors[a]=p,p.registerPlugin(new xe.CorePlugin(null)),p.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+a).val())),p.registerPlugin(new xe.StringConverterManager),p.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG",r,{nHeight:parseInt(d),nMinHeight:100},null,u)),p.registerPlugin(new xe.XE_EditingArea_HTMLSrc(t)),p.registerPlugin(new xe.XE_EditingAreaVerticalResizer(u)),p.registerPlugin(new xe.Utils),p.registerPlugin(new xe.DialogLayerManager),p.registerPlugin(new xe.ActiveLayerManager),p.registerPlugin(new xe.Hotkey),p.registerPlugin(new xe.XE_WYSIWYGStyler),p.registerPlugin(new xe.XE_WYSIWYGStyleGetter),p.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap)),p.registerPlugin(new xe.XE_Toolbar(u)),p.registerPlugin(new xe.XE_XHTMLFormatter),p.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(a)),jQuery("ul.extra1").length&&(p.registerPlugin(new xe.XE_ColorPalette(u)),p.registerPlugin(new xe.XE_FontColor(u)),p.registerPlugin(new xe.XE_BGColor(u)),p.registerPlugin(new xe.XE_Quote(u)),p.registerPlugin(new xe.XE_FontNameWithSelectUI(u)),p.registerPlugin(new xe.XE_FontSizeWithSelectUI(u)),p.registerPlugin(new xe.XE_LineHeightWithSelectUI(u)),p.registerPlugin(new xe.XE_UndoRedo),p.registerPlugin(new xe.XE_Table(u)),p.registerPlugin(new xe.XE_Hyperlink(u)),p.registerPlugin(new xe.XE_FormatWithSelectUI(u)),p.registerPlugin(new xe.XE_SCharacter(u))),jQuery("ul.extra2").length&&p.registerPlugin(new xe.XE_Extension(u,a)),jQuery("ul.extra3").length&&p.registerPlugin(new xe.XE_EditingModeToggler(u)),jQuery("#editorresize").length&&p.registerPlugin(new xe.XE_Editorresize(u,q)),jQuery.browser.msie||jQuery.browser.opera||p.registerPlugin(new xe.XE_WYSIWYGEnterKey(q)),(s=n._saved_doc_title)&&p.registerPlugin(new xe.XE_AutoSave(r,u)),i(),p}function editorGetContentTextarea_xe(a){var b=xe.Editors[a]||null;if(!b)return"";var c=b.getIR();if(!jQuery.trim(c.replace(/( |<\/?(p|br|span|div)([^>]+)?>)/gi,"")))return"";if(c=c.replace(/
    $/i,""),c.length<1024){var d=Array("#text","A","BR","IMG","EM","STRONG","SPAN","BIG","CITE","CODE","DD","DFN","HR","INS","KBD","LINK","Q","SAMP","SMALL","SUB","SUP","TT"),e=!0,f=jQuery("
    "+c+"
    ").eq(0),g=f.contents();jQuery.each(g,function(){3!=this.nodeType&&-1==jQuery.inArray(this.nodeName,d)&&(e=!1)}),e&&(c="

    "+c+"

    ")}return c=c.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/gi,function(a,b,c){return"src="+(b||"")+c}),c=c.replace(/\<(\/)?([A-Z]+)([^>]*)\>/gi,function(a,b,c,d){return d=d?d.replace(/ ([A-Z]+?)\=/gi,function(a,b){return b=b.toLowerCase()," "+b+"="}):"",c=c.toLowerCase(),b||(b=""),"<"+b+c+d+">"}),c=c.replace("
    ","
    ")}function editorGetIframe(a){return jQuery("iframe#editor_iframe_"+a).get(0)}function editorReplaceHTML(a,b){b=editorReplacePath(b);var c=parseInt(a.id.replace(/^.*_/,""),10);editorRelKeys[c].pasteHTML(b)}function editorReplacePath(a){return a=a.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/gi,function(a,b,c,d,e,f,g){"url("==c?(d="",f=")"):("undefined"==typeof d&&(d='"'),"undefined"==typeof f&&(f='"'),"undefined"==typeof g&&(g=""));var h=jQuery.trim(e).replace(/^\.\//,"");return/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(h)?a:"<"+b+c+d+request_uri+h+f+g})}function editorGetAutoSavedDoc(a){var b=new Array;b.mid=current_mid,b.editor_sequence=a.getAttribute("editor_sequence"),setTimeout(function(){var a=new Array("error","message","editor_sequence","title","content","document_srl");exec_xml("editor","procEditorLoadSavedDocument",b,function(a){editorRelKeys[b.editor_sequence].primary.value=a.document_srl,"object"==typeof uploadSettingObj[b.editor_sequence]&&editorUploadInit(uploadSettingObj[b.editor_sequence],!0)},a)},0)}!function(a){function b(b){function c(a){return function(){return a.apply(this.$this,arguments)}}var d=b.prototype;this.prototype.$super={};for(var e in d)d.propertyIsEnumerable(e)&&("undefined"==typeof this.prototype[e]&&(this.prototype[e]=d[e]),this.prototype.$super[e]=a.isFunction(d[e])?c(d[e]):d[e]);return this}a.extend({Class:function(c){function d(){"undefined"!=typeof this.$super&&(this.$super.$this=this),a.isFunction(this.$init)&&this.$init.apply(this,arguments)}return d.prototype=c,d.constructor=d,d.extend=b,d},$:function(b){return"string"==typeof b?"<"==b.substring(0,1)?a(b).get(0):a("#"+b).get(0):b},fnBind:function(b,c){var d=a.makeArray(arguments);return d.shift(),d.shift(),function(){var e=d.concat(a.makeArray(arguments));return b.apply(c,e)}}}),a.browser.nVersion=parseFloat(a.browser.version),"undefined"==typeof window.xe&&(window.xe={}),xe.XpressCore=a.Class({name:"XpressCore",$init:function(b){b=b?a.Class({}).extend({oDebugger:null}).extend(b):{},b.oDebugger&&(this.oDebugger=b.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,c){return this.appStatus==xe.APP_STATUS.NOT_READY?(this.commandQueue[this.commandQueue.length]={msg:a,args:b,event:c},!0):(this.exec=this._exec,this.exec(a,b,c),void 0)},delayedExec:function(b,c,d,e){var f=a.fnBind(this.exec,this,b,c,e);setTimeout(f,d)},_exec:function(a,b,c){return(this._exec=this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this,a,b,c)},_execWithDebugger:function(a,b,c){this.oDebugger.log_MessageStart(a,b);var d=this._doExec(a,b,c);return this.oDebugger.log_MessageEnd(a,b),d},_execWithoutDebugger:function(a,b,c){return this._doExec(a,b,c)},_doExec:function(a,b,c){var d=!1;if(!this.oDisabledCommand[a]){var e=[];if(b&&b.length)for(var f=b.length,g=0;f>g;g++)e[g]=b[g];c&&(e[e.length]=c);var d=!0;d=this._execMsgStep("BEFORE",a,e),d&&(d=this._execMsgStep("ON",a,e)),d&&(d=this._execMsgStep("AFTER",a,e))}return d},registerPlugin:function(a){if(!a)throw"An error occured in registerPlugin(): invalid plug-in";return a.nIdx=this.aPlugins.length,a.oApp=this,this.aPlugins[a.nIdx]=a,a.status!=xe.PLUGIN_STATUS.NOT_READY&&(a.status=xe.PLUGIN_STATUS.READY),this.exec("MSG_PLUGIN_REGISTERED",[a]),a.nIdx},disableCommand:function(a,b){this.oDisabledCommand[a]=b},registerBrowserEvent:function(b,c,d,e,f){if(b){e=e||[];var g=f?a.fnBind(this.delayedExec,this,d,e,f):a.fnBind(this.exec,this,d,e);a(b).bind(c,g)}},run:function(){this._changeAppStatus(xe.APP_STATUS.WAITING_FOR_PLUGINS_READY);var a=this.commandQueue.length;for(i=0;a>i;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,c=0;b>c;c++)this._doAddToCommandMap(a,this.aPlugins[c])},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,c){return(this._execMsgStep=this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this,a,b,c)},_execMsgStepWithDebugger:function(a,b,c){this.oDebugger.log_MessageStepStart(a,b,c);var d=this._execMsgHandler("$"+a+"_"+b,c);return this.oDebugger.log_MessageStepEnd(a,b,c),d},_execMsgStepWithoutDebugger:function(a,b,c){return this._execMsgHandler("$"+a+"_"+b,c)},_execMsgHandler:function(a,b){this.oCommandMap[a]||this.createCommandMap(a);var c=this.oCommandMap[a],d=c.length;if(0==d)return!0;var e,f=!0;if(a.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){for(var g=0;d>g;g++)if(e=this._execHandler(c[g],a,b),e===!1){f=!1;break}}else for(var g=0;d>g;g++)if(("function"!=typeof c[g].$PRECONDITION||this._execHandler(c[g],"$PRECONDITION",[a,b]))&&(e=this._execHandler(c[g],a,b),e===!1)){f=!1;break}return f},_execHandler:function(a,b,c){return(this._execHandler=this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this,a,b,c)},_execHandlerWithDebugger:function(a,b,c){this.oDebugger.log_CallHandlerStart(a,b,c);var d=a[b].apply(a,c);return this.oDebugger.log_CallHandlerEnd(a,b,c),d},_execHandlerWithoutDebugger:function(a,b,c){return a[b].apply(a,c)},_doAddToCommandMap:function(a,b){"function"==typeof b[a]&&(this.oCommandMap[a][this.oCommandMap[a].length]=b)},_waitForPluginReady:function(){for(var b=!0,c=0;cb)return b;var i=b-1,j=a[b].cloneNode(!1);for(a[b]==e&&(c=j),a[b]==f&&(d=j);i>=0&&xe.DOMFix.parentNode(a[i])==a[b];)i=this._recurConstructClonedTree(a,i,a[b],j,c,d);return h.insertBefore(j,h.firstChild),i},a[a.length]=xe.DOMFix.parentNode(a[a.length-1]),_recurConstructClonedTree(a,a.length-1,a[a.length-1],b),{oStartContainer:c,oEndContainer:d}},cloneRange:function(){return this._copyRange(new xe.W3CDOMRange(this._document))},_copyRange:function(a){return 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,a},collapse:function(a){a?(this.endContainer=this.startContainer,this.endOffset=this.startOffset):(this.startContainer=this.endContainer,this.startOffset=this.endOffset),this._updateRangeInfo()},compareBoundaryPoints:function(a,b){switch(a){case xe.W3CDOMRange.START_TO_START:return this._compareEndPoint(this.startContainer,this.startOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.START_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.END_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.endContainer,b.endOffset);case xe.W3CDOMRange.END_TO_START:return this._compareEndPoint(this.startContainer,this.startOffset,b.endContainer,b.endOffset)}},_findBody:function(a){if(!a)return null;for(;a;){if("BODY"==a.tagName)return a;a=xe.DOMFix.parentNode(a)}return null},_compareEndPoint:function(a,b,c,d){var e,f;a&&this._findBody(a)==this._document.body||(a=this._document.body,b=0),c&&this._findBody(c)==this._document.body||(c=this._document.body,d=0);var g=function(a,b){return-1==b&&(b=a+1),b>a?-1:a==b?0:1},h=this._getCommonAncestorContainer(a,c),i=a;if(i!=h){for(;(oTmpNode=xe.DOMFix.parentNode(i))!=h;)i=oTmpNode;e=this._getPosIdx(i)+.5}else e=b;var j=c;if(j!=h){for(;(oTmpNode=xe.DOMFix.parentNode(j))!=h;)j=oTmpNode;f=this._getPosIdx(j)+.5}else f=d;return g(e,f)},_getCommonAncestorContainer:function(a,b){for(var c=b;a;){for(;c;){if(a==c)return a;c=xe.DOMFix.parentNode(c)}c=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 c,d;b||(c=xe.DOMFix.parentNode(a[0]),d=0);for(var e=0;ea.nodeValue.length&&(b=a.nodeValue.length):b>xe.DOMFix.childNodes(a).length&&(b=xe.DOMFix.childNodes(a).length),b},setEnd:function(a,b){b=this._endsNodeValidation(a,b),this.endContainer=a,this.endOffset=b,this.startContainer&&-1==this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)||this.collapse(!1),this._updateRangeInfo()},setEndAfter:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");return"BODY"==a.tagName?(this.setEnd(a,xe.DOMFix.childNodes(a).length),void 0):(this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1),void 0)},setEndBefore:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");return"BODY"==a.tagName?(this.setEnd(a,0),void 0):(this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a)),void 0)},setStart:function(a,b){b=this._endsNodeValidation(a,b),this.startContainer=a,this.startOffset=b,this.endContainer&&-1==this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)||this.collapse(!0),this._updateRangeInfo()},setStartAfter:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");return"BODY"==a.tagName?(this.setStart(a,xe.DOMFix.childNodes(a).length),void 0):(this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1),void 0)},setStartBefore:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");return"BODY"==a.tagName?(this.setStart(a,0),void 0):(this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a)),void 0)},surroundContents:function(a){a.appendChild(this.extractContents()),this.insertNode(a),this.selectNode(a)},toString:function(){var a=this._document.createElement("DIV");return a.appendChild(this.cloneContents()),a.textContent||a.innerText||""},_isBlankTextNode:function(a){return 3==a.nodeType&&""==a.nodeValue?!0:!1},_getPosIdx:function(a){for(var b=0,c=a.previousSibling;c;c=c.previousSibling)b++;return b},_updateRangeInfo:function(){return this.startContainer?(this.collapsed=this._isCollapsed(this.startContainer,this.startOffset,this.endContainer,this.endOffset),this.commonAncestorContainer=this._getCommonAncestorContainer(this.startContainer,this.endContainer),void 0):(this.init(this._document),void 0)},_isCollapsed:function(a,b,c,d){var e=!1;if(a==c&&b==d)e=!0;else{var f=this._getActualStartNode(a,b),g=this._getActualEndNode(c,d);f=this._getNextNode(this._getPrevNode(f)),g=this._getPrevNode(this._getNextNode(g)),f&&g&&"BODY"!=g.tagName&&(this._getNextNode(g)==f||g==f&&this._isBlankTextNode(g))&&(e=!0)}return e},_splitTextEndNodesOfTheRange:function(){var a=this._splitTextEndNodes({oStartContainer:this.startContainer,iStartOffset:this.startOffset,oEndContainer:this.endContainer,iEndOffset:this.endOffset});this.startContainer=a.oStartContainer,this.startOffset=a.iStartOffset,this.endContainer=a.oEndContainer,this.endOffset=a.iEndOffset},_splitTextEndNodes:function(a){return a=this._splitStartTextNode(a),a=this._splitEndTextNode(a)},_splitStartTextNode:function(a){var b=a.oStartContainer,c=a.iStartOffset,d=a.oEndContainer,e=a.iEndOffset;if(!b)return a;if(3!=b.nodeType)return a;if(0==c)return a;if(b.nodeValue.length<=c)return a;var f=b.splitText(c);return b==d&&(e-=c,d=f),b=f,c=0,{oStartContainer:b,iStartOffset:c,oEndContainer:d,iEndOffset:e}},_splitEndTextNode:function(a){var b=a.oStartContainer,c=a.iStartOffset,d=a.oEndContainer,e=a.iEndOffset;return d?3!=d.nodeType?a:e>=d.nodeValue.length?a:0==e?a:(d.splitText(e),{oStartContainer:b,iStartOffset:c,oEndContainer:d,iEndOffset:e}):a},_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 c=a;return 3==a.nodeType?b>=a.nodeValue.length?(c=this._getNextNode(a),"BODY"==c.tagName&&(c=null)):c=a:b=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():3==this.endContainer.nodeType?0==this.endOffset?this._getPrevNode(this.endContainer):this.endContainer:0==this.endOffset?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1]},getNodeAroundRange:function(a,b){if(this.collapsed&&this.startContainer&&3==this.startContainer.nodeType)return this.startContainer;if(!this.collapsed||this.startContainer&&3==this.startContainer.nodeType)return this.getStartNode();var c,d,e;return d=this.startOffset>=xe.DOMFix.childNodes(this.startContainer).length?this._getNextNode(this.startContainer):xe.DOMFix.childNodes(this.startContainer)[this.startOffset],c=0==this.endOffset?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1],a?(e=c,e||b||(e=d)):(e=d,e||b||(e=c)),e},_getXPath:function(a){for(var b="";a&&1==a.nodeType;)b="/"+a.tagName+"["+this._getPosIdx4XPath(a)+"]"+b,a=xe.DOMFix.parentNode(a);return b},_getPosIdx4XPath:function(a){for(var b=0,c=a.previousSibling;c;c=c.previousSibling)c.tagName==a.tagName&&b++;return b},_evaluateXPath:function(a,b){a=a.substring(1,a.length-1);for(var c=a.split(/\//),d=b.body,e=2;el;l++)h[l].tagName==f&&(i[k++]=h[l]);d=i.length-1&&e){for(var f=xe.DOMFix.childNodes(e),g=null,h=c,i=d;(g=f[h])&&3==g.nodeType&&g.nodeValue.length=b&&e>=0?!0:bIncludePartlyIncluded?1==c?!1:-1==d?!1:!0:!1},isNodeInRange:function(a,b,c){var d=new xe.XpressRange(this._window);return c&&a.firstChild?(d.setStartBefore(a.firstChild),d.setEndAfter(a.lastChild)):d.selectNode(a),isRangeInRange(d,b)},pasteHTML:function(a){if(""==a)return this.deleteContents(),void 0;var b=this._document.createElement("DIV");b.innerHTML=a;for(var c=b.firstChild,d=b.lastChild,e=this.cloneRange(),f=e.placeStringBookmark();b.lastChild;)this.insertNode(b.lastChild);this.setEndNodes(c,d),e.moveToBookmark(f),e.deleteContents(),e.removeStringBookmark(f)},toString:function(){return this.toString=xe.W3CDOMRange.prototype.toString,this.toString()},toHTMLString:function(){var a=this._document.createElement("DIV");return a.appendChild(this.cloneContents()),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,c=a.lastChild?a.lastChild:a;3==b.nodeType?this.setStart(b,0):this.setStartBefore(b),3==c.nodeType?this.setEnd(c,c.nodeValue.length):this.setEndAfter(c)}},styleRange:function(b,c,d){var e=this._getStyleParentNodes(d);if(!(e.length<1)){for(var f,g,h=0;ho;o++)if(c=k[o],c&&3==c.nodeType&&""!=c.nodeValue){if(h=xe.DOMFix.parentNode(c),"SPAN"==h.tagName){var p=a(h).html();if(d=this._getVeryFirstRealChild(h),f=d==c?1:p.indexOf(d),-1!=f&&(d=this._getVeryLastRealChild(h),g=d==c?1:p.indexOf(d)),-1!=f&&-1!=g){l[m++]=h;continue}}e=this._document.createElement("SPAN"),h.insertBefore(e,c),e.appendChild(c),l[m++]=e,b&&e.setAttribute(b,"true")}return this.setStartBefore(i),this.setEndAfter(j),l},_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(var b=a.firstChild;b&&3==b.nodeType&&""==b.nodeValue;)b=b.nextSibling;return b},_getLastRealChild:function(a){for(var b=a.lastChild;b&&3==b.nodeType&&""==b.nodeValue;)b=b.previousSibling;return b},_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&&!d){if(h.test(a.tagName))return f=a,d=e,g=!0,void 0;e=a,c(a.previousSibling),d||b(xe.DOMFix.parentNode(a))}}function c(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!1,void 0;if(a.firstChild&&"TABLE"!=a.tagName)for(var b=a.lastChild;b&&!d;)c(b),b=b.previousSibling;else e=a;d||c(a.previousSibling)}}var d=null,e=a,f=a,g=!0,h=this.rxLineBreaker;return b(a),{oNode:d,oLineBreaker:f,bParentBreak:g}},_getLineEndInfo:function(a){function b(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!0,void 0;e=a,c(a.nextSibling),d||b(xe.DOMFix.parentNode(a))}}function c(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!1,void 0;if(a.firstChild&&"TABLE"!=a.tagName)for(var b=a.firstChild;b&&!d;)c(b),b=b.nextSibling;else e=a;d||c(a.nextSibling)}}var d=null,e=a,f=a,g=!0,h=this.rxLineBreaker;return b(a),{oNode:d,oLineBreaker:f,bParentBreak:g}},getLineInfo:function(){var a=this.getStartNode(),b=this.getEndNode();a||(a=this.getNodeAroundRange(!0,!0)),b||(b=this.getNodeAroundRange(!0,!0));var c=this._getLineStartInfo(a),d=c.oNode,e=this._getLineEndInfo(b),f=e.oNode,g=this._compareEndPoint(xe.DOMFix.parentNode(d),this._getPosIdx(d),this.endContainer,this.endOffset),h=this._compareEndPoint(xe.DOMFix.parentNode(f),this._getPosIdx(f)+1,this.startContainer,this.startOffset);return 0>=g&&h>=0||(a=this.getNodeAroundRange(!1,!0),b=this.getNodeAroundRange(!1,!0),c=this._getLineStartInfo(a),e=this._getLineEndInfo(b)),{oStart:c,oEnd:e}}}).extend(xe.W3CDOMRange),xe.SimpleSelection=function(b){this.init=function(a){this._window=a||window,this._document=this._window.document},this.init(b),a.browser.msie?xe.SimpleSelectionImpl_IE.apply(this):xe.SimpleSelectionImpl_FF.apply(this),this.selectRange=function(a){this.selectNone(),this.addRange(a)},this.selectionLoaded=!0,this._oSelection||(this.selectionLoaded=!1)},xe.SimpleSelectionImpl_FF=function(){this._oSelection=this._window.getSelection(),this.getRangeAt=function(a){a=a||0;try{var b=this._oSelection.getRangeAt(a)}catch(c){return new xe.W3CDOMRange(this._document)}return this._FFRange2W3CRange(b)},this.addRange=function(a){var b=this._W3CRange2FFRange(a);this._oSelection.addRange(b)},this.selectNone=function(){this._oSelection.removeAllRanges()},this._FFRange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document);return b.setStart(a.startContainer,a.startOffset),b.setEnd(a.endContainer,a.endOffset),b},this._W3CRange2FFRange=function(a){var b=this._document.createRange(); return b.setStart(a.startContainer,a.startOffset),b.setEnd(a.endContainer,a.endOffset),b}},xe.SimpleSelectionImpl_IE=function(){this._oSelection=this._document.selection,this.getRangeAt=function(a){if(a=a||0,"Control"==this._oSelection.type){var b=new xe.W3CDOMRange(this._document),c=this._oSelection.createRange().item(a);return c&&c.ownerDocument==this._document?(b.selectNode(c),b):b}var c=this._oSelection.createRangeCollection().item(a).parentElement();if(!c||c.ownerDocument!=this._document){var b=new xe.W3CDOMRange(this._document);return b}return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(a))},this.addRange=function(a){var b=this._W3CRange2IERange(a);b.select()},this.selectNone=function(){this._oSelection.empty()},this._W3CRange2IERange=function(a){var b=this._getIERangeAt(a.startContainer,a.startOffset),c=this._getIERangeAt(a.endContainer,a.endOffset);return b.setEndPoint("EndToEnd",c),b},this._getIERangeAt=function(a,b){var c=this._document.body.createTextRange(),d=this._getSelectableNodeAndOffsetForIE(a,b),e=d.oSelectableNodeForIE,f=d.iOffsetForIE;return c.moveToElementText(e),c.collapse(d.bCollapseToStart),c.moveStart("character",f),c},this._getSelectableNodeAndOffsetForIE=function(a,b){var c=this._document.body.createTextRange(),d=null,e=null,f=0;3==a.nodeType?(d=xe.DOMFix.parentNode(a),e=xe.DOMFix.childNodes(d),f=e.length):(d=a,e=xe.DOMFix.childNodes(d),f=b);for(var g=null,h=0,i=!0,j=0;f>j;j++)if(g=e[j],3==g.nodeType){if(g==a)break;h+=g.nodeValue.length}else c.moveToElementText(g),d=g,h=0,i=!1;return 3==a.nodeType&&(h+=b),{oSelectableNodeForIE:d,iOffsetForIE:h,bCollapseToStart:i}},this._IERange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document),c=null,d=null;c=a.duplicate(),c.collapse(!0),d=this._getW3CContainerAndOffset(c,!0),b.setStart(d.oContainer,d.iOffset);var e=a.duplicate();return e.collapse(!0),e.isEqual(a)?b.collapse(!0):(c=a.duplicate(),c.collapse(!1),d=this._getW3CContainerAndOffset(c),b.setEnd(d.oContainer,d.iOffset)),b},this._getW3CContainerAndOffset=function(a,b){for(var c=a,d=c.parentElement(),e=-1,f=this._document.body.createTextRange(),g=xe.DOMFix.childNodes(d),h=null,i=0,j=0;j=0)break;h=g[j]}var i=j;if(0!=i&&3==g[i-1].nodeType){var k=this._document.body.createTextRange(),l=null;h?(k.moveToElementText(h),k.collapse(!1),l=h.nextSibling):(k.moveToElementText(d),k.collapse(!0),l=d.firstChild);var m=c.duplicate();m.setEndPoint("StartToStart",k);for(var n=m.text.length;n>l.nodeValue.length&&l.nextSibling;)n-=l.nodeValue.length,l=l.nextSibling;{l.nodeValue}b&&l.nextSibling&&3==l.nextSibling.nodeType&&n==l.nodeValue.length&&(n-=l.nodeValue.length,l=l.nextSibling),d=l,e=n}else d=c.parentElement(),e=i;return{oContainer:d,iOffset:e}}},xe.DOMFix=new(a.Class({$init:function(){a.browser.msie||a.browser.opera?(this.childNodes=this._childNodes_Fix,this.parentNode=this._parentNode_Fix):(this.childNodes=this._childNodes_Native,this.parentNode=this._parentNode_Native)},_parentNode_Native:function(a){return a.parentNode},_parentNode_Fix:function(a){if(!a)return a;for(;a.previousSibling;)a=a.previousSibling;return a.parentNode},_childNodes_Native:function(a){return a.childNodes},_childNodes_Fix:function(a){var b=null,c=0;if(a){var b=[];for(a=a.firstChild;a;)b[c++]=a,a=a.nextSibling}return b}})),xe.DraggableLayer=a.Class({$init:function(b,c){this.oOptions=a.extend({bModal:"false",oHandle:b,iMinX:-999999,iMinY:-999999,iMaxX:999999,iMaxY:999999},c),this.oHandle=this.oOptions.oHandle,b.style.display="block",b.style.position="absolute",b.style.zIndex="9999",this.aBasePosition=this.getBaseOffset(b),b.style.top=this.toInt(a(b).offset().top)-this.aBasePosition.top+"px",b.style.left=this.toInt(a(b).offset().left)-this.aBasePosition.left+"px",this.$FnMouseDown=a.fnBind(this._mousedown,this,b),this.$FnMouseMove=a.fnBind(this._mousemove,this,b),this.$FnMouseUp=a.fnBind(this._mouseup,this,b),a(this.oHandle).bind("mousedown",this.$FnMouseDown)},_mousedown:function(b,c){"INPUT"!=c.target.tagName&&(this.MouseOffsetY=c.pageY-this.toInt(b.style.top)-this.aBasePosition.top,this.MouseOffsetX=c.pageX-this.toInt(b.style.left)-this.aBasePosition.left,a(b).bind("mousemove",this.$FnMouseMove),a(b).bind("mouseup",this.$FnMouseUp))},_mousemove:function(a,b){var c=b.pageY-this.MouseOffsetY-this.aBasePosition.top,d=b.pageX-this.MouseOffsetX-this.aBasePosition.left;cthis.oOptions.iMaxY&&(c=this.oOptions.iMaxY),dthis.oOptions.iMaxX&&(d=this.oOptions.iMaxX),a.style.top=c+"px",a.style.left=d+"px"},_mouseup:function(b){a(b).unbind("mousemove",this.$FnMouseMove),a(b).unbind("mouseup",this.$FnMouseUp)},toInt:function(a){var b=parseInt(a);return b||0},findNonStatic:function(b){return b?"BODY"==b.tagName?b:a(b).css("position").match(/absolute|relative/i)?b:this.findNonStatic(b.offsetParent):null},getBaseOffset:function(b){var c=this.findNonStatic(b.offsetParent),d=a(c).offset();return{top:d.top,left:d.left}}}),xe.CorePlugin=a.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,c,d,e){this.oApp.registerBrowserEvent(a,b,c,d,e)},$ON_DISABLE_COMMAND:function(a){this.oApp.disableCommand(a,!0)},$ON_ENABLE_COMMAND:function(a){this.oApp.disableCommand(a,!1)},$ON_EXEC_ON_READY_FUNCTION:function(){"function"==typeof this.funcOnReady&&this.funcOnReady()}}),xe.Utils=a.Class({name:"Utils",$init:function(){if(a.browser.msie&&6==a.browser.nVersion)try{document.execCommand("BackgroundImageCache",!1,!0)}catch(b){}},$ON_ATTACH_HOVER_EVENTS:function(b,c){c=c||"hover",b&&a(b).hover(function(){a(this).addClass(c)},function(){a(this).removeClass(c)})}}),xe.XpressRangeManager=a.Class({name:"XpressRangeManager",oWindow:null,$init:function(a){this.oWindow=a||window},$BEFORE_MSG_APP_READY:function(){this.oWindow&&"IFRAME"==this.oWindow.tagName&&(this.oWindow=this.oWindow.contentWindow),this.oApp.exec("ADD_APP_PROPERTY",["getSelection",a.fnBind(this.getSelection,this)]),this.oApp.exec("ADD_APP_PROPERTY",["getEmptySelection",a.fnBind(this.getEmptySelection,this)])},$ON_SET_EDITING_WINDOW:function(a){this.oWindow=a},getEmptySelection:function(){var a=new xe.XpressRange(this.oWindow);return a},getSelection:function(){this.oApp.exec("RESTORE_IE_SELECTION",[]);var a=this.getEmptySelection();try{a.setFromSelection()}catch(b){}return a}}),xe.Hotkey=a.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},(a.browser.msie||a.browser.safari)&&(this.keyhash.hyphen=189,this.keyhash.equal=187,this.keyhash.meta=91)},$ON_MSG_APP_READY:function(){a(this.oApp.getWYSIWYGDocument()||document).keydown(a.fnBind(this.keydown,this))},$ON_REGISTER_HOTKEY:function(b,c,d){d||(d=[]);var e=a.fnBind(this.oApp.exec,this.oApp,c,d);return(b=this.normalize(b))?(this.add(b,e),void 0):!1},add:function(a,b){"undefined"==typeof this.storage[a]?this.storage[a]=[b]:this.storage[a].push(b)},keydown:function(b){var c=[],d=this.keyhash;if(!(a.inArray(b.keyCode,[d.shift,d.ctrl,d.alt,d.meta])>=0)&&(b.shiftKey&&c.push("shift"),b.altKey&&c.push("alt"),b.ctrlKey&&c.push("ctrl"),b.metaKey&&c.push("meta"),c.length&&(1==c.length&&b.metaKey&&(c=["ctrl","meta"]),c.push(b.keyCode),c=c.join("+"),this.storage[c])))return a.each(this.storage[c],function(){this()}),!1},normalize:function(b){var c,d,e,f,g,h=(b||"").toLowerCase().split("+");return c=d=e=f=g=!1,a.each(h,function(){var a=""+this;switch(a){case"shift":c=!0;case"alt":e=!0;case"ctrl":d=!0;case"meta":f=!0;default:g=a}}),g?(h=[],c&&h.push("shift"),e&&h.push("alt"),d&&h.push("ctrl"),(f||d&&!c&&!e)&&h.push("meta"),h.push(this.keyhash[g]||g.toUpperCase().charCodeAt(0)),h.join("+")):""}}),xe.DialogLayerManager=a.Class({name:"DialogLayerManager",aMadeDraggable:null,aOpenedLayers:null,$init:function(){this.aMadeDraggable=[],this.aOpenedLayers=[]},$ON_SHOW_DIALOG_LAYER:function(b,c){b=a.$(b),c=a.$(c)||!1,b&&-1==a.inArray(b,this.aOpenedLayers)&&(this.oApp.exec("POSITION_DIALOG_LAYER",[b]),this.aOpenedLayers[this.aOpenedLayers.length]=b,-1==a.inArray(b,this.aMadeDraggable)?(new xe.DraggableLayer(b,{bModal:c,iMinY:0}),this.aMadeDraggable[this.aMadeDraggable.length]=b):b.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(b){b=a.$(b),b&&(b.style.display="none"),this.aOpenedLayers=a.grep(this.aOpenedLayers,function(a){return a!=b})},$ON_SET_DIALOG_LAYER_POSITION:function(a,b,c){a.style.top=b,a.style.left=c}}),xe.ActiveLayerManager=a.Class({name:"ActiveLayerManager",oCurrentLayer:null,$ON_TOGGLE_ACTIVE_LAYER:function(a,b,c,d,e){a==this.oCurrentLayer?this.oApp.exec("HIDE_ACTIVE_LAYER",[]):(this.oApp.exec("SHOW_ACTIVE_LAYER",[a,d,e]),b&&this.oApp.exec(b,c))},$ON_SHOW_ACTIVE_LAYER:function(b,c,d){b=a.$(b),this.sOnCloseCmd=c,this.aOnCloseParam=d;var e=this.oCurrentLayer;b!=e&&(this.oApp.exec("HIDE_ACTIVE_LAYER",[]),b.style.display="block",this.oCurrentLayer=b)},$ON_HIDE_ACTIVE_LAYER:function(){var a=this.oCurrentLayer;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=a.Class({name:"StringConverterManager",oConverters:null,$init:function(){this.oConverters={}},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["applyConverter",a.fnBind(this.applyConverter,this)]),this.oApp.exec("ADD_APP_PROPERTY",["addConverter",a.fnBind(this.addConverter,this)])},applyConverter:function(a,b){var c=this.oConverters[a];if(!c)return b;for(var d=0;df;f++)if(e.test(c[f].className)){var g=RegExp.$1;if(null!=this.htUIList[g])continue;this.htUIList[g]=a(">*:first-child",c[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",a.fnBind(this.getToolbarButtonByUIName,this)])},$ON_EVENT_TOOLBAR_MOUSEOVER:function(b){"BUTTON"==b.target.tagName&&a(b.target).addClass("hover").parent("span").addClass("hover")},$ON_EVENT_TOOLBAR_MOUSEOUT:function(b){"BUTTON"==b.target.tagName&&a(b.target).removeClass("hover").parent("span").removeClass("hover")},$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER:function(a,b,c,d,e,f){this.oApp.exec("TOGGLE_ACTIVE_LAYER",[a,"MSG_TOOLBAR_LAYER_SHOWN",[a,b,c,d],e,f])},$ON_MSG_TOOLBAR_LAYER_SHOWN:function(a,b,c,d){this.oApp.exec("POSITION_TOOLBAR_LAYER",[a,b]),c&&this.oApp.exec(c,d)},$ON_SHOW_TOOLBAR_ACTIVE_LAYER:function(a,b,c,d){this.oApp.exec("SHOW_ACTIVE_LAYER",[a,b,c]),this.oApp.exec("POSITION_TOOLBAR_LAYER",[a,d])},$ON_ENABLE_UI:function(b){var c=this.htUIList[b];if(c){a(c).removeClass("off"),c.disabled=!1;var d="";if(this.aUICmdMap[b])for(var e=0;ef&&(b.style.left=f-e-5+"px")}},getToolbarButtonByUIName:function(a){return this.htUIList[a]}}),xe.XE_EditingAreaManager=a.Class({name:"XE_EditingAreaManager",oActivePlugin:null,oIRField:null,bIsDirty:!1,$init:function(b,c,d,e,f){this.sInitialMode=b,this.oIRField=a.$(c),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(b){b=a.$(b)||document,this.elEditingAreaContainer=a("DIV.xpress_xeditor_editing_area_container",b).get(0),this.elEditingAreaSkipUI=a("A.skip",b).get(0)},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["elEditingAreaContainer",this.elEditingAreaContainer]),this.oApp.exec("ADD_APP_PROPERTY",["getIR",a.fnBind(this.getIR,this)]),this.oApp.exec("ADD_APP_PROPERTY",["setIR",this.setIR]),this.oApp.exec("ADD_APP_PROPERTY",["getEditingMode",a.fnBind(this.getEditingMode,this)])},$ON_MSG_APP_READY:function(){this.oApp.exec("CHANGE_EDITING_MODE",[this.sInitialMode,!0]),this.oApp.exec("LOAD_IR_FIELD",[!1]),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){var c=this._oPrevActivePlugin.getIR();this.oApp.exec("SET_IR",[c]),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&&"function"==typeof this.oActivePlugin.setIR&&this.oActivePlugin.focus()},$BEFORE_SET_IR:function(a,b){b=b||!1,b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_SET_IR:function(a){this.oActivePlugin&&"function"==typeof this.oActivePlugin.setIR&&this.oActivePlugin.setIR(a)},$AFTER_SET_IR:function(a,b){b=b||!1,b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_REGISTER_EDITING_AREA:function(a){this.oEditingMode[a.sMode]=a,this.attachDocumentEvents(a.oEditingArea)},$ON_MSG_EDITING_AREA_RESIZE_STARTED:function(){this.oActivePlugin.elEditingArea.style.display="none",this.iStartingHeight=parseInt(this.elEditingAreaContainer.style.height)},$ON_RESIZE_EDITING_AREA:function(a,b){var c=parseInt(a),d=parseInt(b);c"]);break;default:return}a.preventDefault(),a.stopPropagation()}},$ON_EVENT_EDITING_AREA_KEYUP:function(a){229==a.keyCode||13==a.keyCode||a.altKey||a.ctrlKey||a.keyCode>=33&&a.keyCode<=40||16==a.keyCode||this._recordUndo(a)},$ON_PASTE_HTML:function(b,c){if(this.oApp.getEditingMode()==this.sMode){var d=c||this.oApp.getSelection();if(d.pasteHTML(b),!a.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(){this._oIERange&&(this._oIERange.select(),this._oPrevIERange=this._oIERange,this._oIERange=null)},initIframe:function(){try{if(this.doc=this.iframe.contentWindow.document,null==this.doc||"about:blank"==this.doc.location.href)throw new Error("Access denied");this._enableWYSIWYG(),this.status=xe.PLUGIN_STATUS.READY}catch(b){if(!(this._nIFrameReadyCount-->0))throw"iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ";setTimeout(a.fnBind(this.initIframe,this),100)}},getIR:function(){var a,b=this.doc.body.innerHTML;return a=this.oApp.applyConverter?this.oApp.applyConverter(this.sMode+"_TO_IR",b):b},setIR:function(b){var c;c=this.oApp.applyConverter?this.oApp.applyConverter("IR_TO_"+this.sMode,b):b,this.doc.body.innerHTML=c,a.browser.mozilla&&""==this.doc.body.innerHTML&&(this.doc.body.innerHTML="
    ")},getWindow:function(){return this.iframe.contentWindow},getDocument:function(){return this.iframe.contentWindow.document},focus:function(){},_recordUndo:function(a){var b=new Date;b-this.iLastUndoRecorded"),""==h.innerHTML&&(h.innerHTML="
    "),h.nextSibling&&"BR"==h.nextSibling.tagName&&h.parentNode.removeChild(h.nextSibling),b.selectNodeContents(h),b.collapseToStart(),b.select(),this.oApp.exec("CHECK_STYLE_CHANGE",[])}else b.removeStringBookmark(c)}}}),xe.XE_WYSIWYGStyler=a.Class({name:"XE_WYSIWYGStyler",$PRECONDITION:function(){return"WYSIWYG"==this.oApp.getEditingMode()},$ON_SET_WYSIWYG_STYLE:function(b){var c=this.oApp.getSelection();if(c.collapsed){var d=this.oApp.getWYSIWYGDocument().createElement("SPAN");c.insertNode(d),d.innerHTML=unescape("%uFEFF");var e;for(var f in b)e=b[f],"string"==typeof e&&(d.style[f]=e);return c.selectNodeContents(d),c.collapseToEnd(),c._window.focus(),c._window.document.body.focus(),c.select(),a.browser.mozilla&&3==a.browser.nVersion&&(d.innerHTML=""),void 0}this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["FONT STYLE"]),c.styleRange(b),c._window.focus(),c.select(),this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["FONT STYLE"])}}),xe.XE_WYSIWYGStyleGetter=a.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$/)?Math.ceil(parseInt(a)/parseInt(b.fontSize)*10)/10:a}},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"WYSIWYG"!=this.oApp.getEditingMode()?!1:!0},$ON_MSG_APP_READY:function(){this.oDocument=this.oApp.getWYSIWYGDocument(),this.oApp.exec("ADD_APP_PROPERTY",["getCurrentStyle",a.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(b){(8==b.keyCode||b.keyCode>=33&&b.keyCode<=40||45==b.keyCode||46==b.keyCode)&&(this.hKeyUp&&clearTimeout(this.hKeyUp),this.hKeyUp=setTimeout(a.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();for(var 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={};for(var b in this.oStyleMap)a[b]="Value"==this.oStyleMap[b].type?"":0; return a},_getStyle:function(){var a,b,c=this.oApp.getSelection(),d=function(a){return a.childNodes&&0!=a.childNodes.length?!1:!0},e=c.getNodes(!1,d);a=0==e.length?this._getStyleOf(c.commonAncestorContainer):this._getStyleOf(e[0]);for(b in a)this.oStyleMap[b].converter&&(a[b]=this.oStyleMap[b].converter(a[b],a)),this.oStyle[b]!=a[b]&&this.oApp.exec("MSG_STYLE_CHANGED",[b,a[b]]);this.oStyle=a},_getStyleOf:function(b){var c=this._getBlankStyle();if(!b)return c;3==b.nodeType&&(b=b.parentNode);var d,e=a(b);for(var f in this.oStyle)if(d=this.oStyleMap[f],d.type&&"Value"==d.type){if(d.css){var g=e.css(d.css);"fontFamily"==f&&(g=g.split(/,/)[0]),c[f]=g}else if(d.command)try{c[f]=this.oDocument.queryCommandState(d.command)}catch(h){}}else if(d.command)try{c[f]=this.oDocument.queryCommandState(d.command)?1:0}catch(h){}return c}}),xe.XE_FontSizeWithSelectUI=a.Class({name:"XE_FontSizeWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFontSizeSelect=a("SELECT.xpress_xeditor_ui_fontSize_select",b).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){"fontSize"==a&&(this.elFontSizeSelect.value=b,this.elFontSizeSelect.selectedIndex<0&&(this.elFontSizeSelect.selectedIndex=0))},$ON_SET_FONTSIZE_FROM_SELECT_UI:function(){var a=this.elFontSizeSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontSize:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_FontNameWithSelectUI=a.Class({name:"XE_FontNameWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFontNameSelect=a("SELECT.xpress_xeditor_ui_fontName_select",b).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){"fontFamily"==a&&(this.elFontNameSelect.value=b.toLowerCase(),this.elFontNameSelect.selectedIndex<0&&(this.elFontNameSelect.selectedIndex=0))},$ON_SET_FONTNAME_FROM_SELECT_UI:function(){var a=this.elFontNameSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontFamily:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_LineHeight=a.Class({name:"XE_LineHeight",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(){},$ON_SET_LINEHEIGHT:function(a){this.setLineHeight(a)},getLineHeight:function(){var b,c,d,e=this._getSelectedNodes(!1);if(0==e.length)return-1;var f=e.length;0==f?d=-1:(c=this._getLineWrapper(e[0]),d=this._getWrapperLineheight(c));var g=this.oSelection.getStartNode();if(d>0)for(var h=1;f>h;h++)if(!this._isChildOf(e[h],b)&&e[h]&&(b=this._getLineWrapper(e[h]),b!=c)){if(curHeight=this._getWrapperLineheight(b),curHeight!=d){d=-1;break}c=b}b=this._getLineWrapper(e[f-1]);var i=this.oSelection.getEndNode();return selectText=a.fnBind(function(a,b){this.oSelection.setEndNodes(a,b),this.oSelection.select()},this,g,i),setTimeout(selectText,100),d},setLineHeight:function(b){function c(a,b){if(!a)try{a=thisRef.oSelection.surroundContentsWithNewNode("P")}catch(c){a=thisRef.oSelection.surroundContentsWithNewNode("DIV")}return a.style.lineHeight=b,a}function d(a){for(;a&&"BODY"!=a.tagName;)a=xe.DOMFix.parentNode(a);return a?!0:!1}thisRef=this;var e=this._getSelectedNodes(!1);if(0!=e.length){var f,g,h=e.length;this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["LINEHEIGHT"]),g=this._getLineWrapper(e[0]),g=c(g,b);for(var i=g,j=g,k=1;h>k;k++){try{if(!d(xe.DOMFix.parentNode(e[k])))continue}catch(l){continue}this._isChildOf(e[k],f)||(f=this._getLineWrapper(e[k]),f!=g&&(f=c(f,b),g=f))}j=f||i,setTimeout(a.fnBind(function(a,b){this.oSelection.setEndNodes(a,b),this.oSelection.select(),this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["LINEHEIGHT"])},this,i,j),100)}},_getSelectedNodes:function(a){a||(this.oSelection=this.oApp.getSelection()),this.oSelection.collapsed&&this.oSelection.selectNode(this.oSelection.commonAncestorContainer);var b=this.oSelection.getTextNodes();if(0==b.length){var c=this.oSelection.getStartNode();c?b[0]=c:b=[]}return b},_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&&"BODY"!=a.tagName;){if(a==b)return!0;a=xe.DOMFix.parentNode(a)}return!1},_getLineWrapper:function(a){var b=this.oApp.getEmptySelection();b.selectNode(a);var c,d,e,f,g=b.getLineInfo(),h=g.oStart,i=g.oEnd,j=null;return c=h.oNode,e=h.oLineBreaker,d=i.oNode,f=i.oLineBreaker,this.oSelection.setEndNodes(c,d),e==f&&("P"==e.tagName||"DIV"==e.tagName?j=e:this.oSelection.setEndNodes(e.firstChild,e.lastChild)),j}}),xe.XE_LineHeightWithSelectUI=a.Class({name:"XE_LineHeightWithSelectUI",_assignHTMLObjects:function(b){this.elLineHeightSelect=a("SELECT.xpress_xeditor_ui_lineHeight_select",b).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){"lineHeight"==a&&(this.elLineHeightSelect.value=b,this.elLineHeightSelect.selectedIndex<0&&(this.elLineHeightSelect.selectedIndex=0))},$ON_SET_LINEHEIGHT_FROM_SELECT_UI:function(){var a=this.elLineHeightSelect.value;a&&(this.elLineHeightSelect.selectedIndex=0,this.oApp.exec("SET_LINEHEIGHT",[a]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}).extend(xe.XE_LineHeight),xe.XE_ColorPalette=a.Class({name:"XE_ColorPalette",rxRGBColorPattern:/rgb\((\d+), ?(\d+), ?(\d+)\)/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elColorPaletteLayer=a("UL.xpress_xeditor_color_palette",b).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){function b(a){var b=parseInt(a).toString(16);return b.length<2&&(b="0"+b),b.toUpperCase()}if(this.rxRGBColorPattern.test(a)){var c=b(RegExp.$1),d=b(RegExp.$2),e=b(RegExp.$3);a="#"+c+d+e}this.oApp.exec(this.sCallbackCmd,[a])},$ON_EVENT_MOUSEUP_COLOR_PALETTE:function(a){var b=a.target;b.style.backgroundColor&&this.oApp.exec("COLOR_PALETTE_APPLY_COLOR",[b.style.backgroundColor])}}),xe.XE_FontColor=a.Class({name:"XE_FontColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_fontcolor_layer",b).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["fontColor","click","TOGGLE_FONTCOLOR_LAYER"])},$ON_TOGGLE_FONTCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_FONTCOLOR",this.elDropdownLayer]])},$ON_APPLY_FONTCOLOR:function(a){return this.rxColorPattern.test(a)?(this.oApp.exec("SET_WYSIWYG_STYLE",[{color:a}]),this.oApp.exec("HIDE_ACTIVE_LAYER"),void 0):(alert(this.oApp.$MSG("XE_FontColor.invalidColorCode")),void 0)}}),xe.XE_BGColor=a.Class({name:"XE_BGColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_bgcolor_layer",b).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["bgColor","click","TOGGLE_BGCOLOR_LAYER"]),this.oApp.registerBrowserEvent(this.elDropdownLayer,"click","EVENT_APPLY_BGCOLOR",[])},$ON_TOGGLE_BGCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_BGCOLOR",this.elDropdownLayer]])},$ON_EVENT_APPLY_BGCOLOR:function(a){var b=a.target;if("SPAN"==b.tagName&&(b=b.parentNode),"BUTTON"==b.tagName){var c,d;c=b.style.backgroundColor,d=b.style.color,this.oApp.exec("APPLY_BGCOLOR",[c,d])}},$ON_APPLY_BGCOLOR:function(a,b){if(!this.rxColorPattern.test(a))return alert(this.oApp.$MSG("XE_BGColor.invalidColorCode")),void 0;var c={backgroundColor:a};b&&(c.color=b),this.oApp.exec("SET_WYSIWYG_STYLE",[c]),this.oApp.exec("HIDE_ACTIVE_LAYER")}}),xe.XE_Quote=a.Class({name:"XE_Quote",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_blockquote_layer",b).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){var b=a.target;if("BUTTON"==b.tagName){var c=b.parentNode.className;"q8"!=c?this._wrapBlock("BLOCKQUOTE",c):this._unwrapBlock("BLOCKQUOTE"),this.oApp.exec("HIDE_ACTIVE_LAYER",[])}},_unwrapBlock:function(a){for(var b=this.oApp.getSelection(),c=b.commonAncestorContainer;c&&c.tagName!=a;)c=c.parentNode;if(c){for(;c.firstChild;)c.parentNode.insertBefore(c.firstChild,c);c.parentNode.removeChild(c)}},_wrapBlock:function(a,b){var c,d,e=this.oApp.getSelection(),f=e.getLineInfo(),g=f.oStart,h=f.oEnd,i=/BODY|TD|LI/i;c=g.bParentBreak&&!i.test(g.oLineBreaker.tagName)?g.oNode.parentNode:g.oNode,d=h.bParentBreak&&!i.test(h.oLineBreaker.tagName)?h.oNode.parentNode:h.oNode,e.setStartBefore(c),e.setEndAfter(d);var j=this._expandToTableStart(e,d);j&&(d=j,e.setEndAfter(j)),j=this._expandToTableStart(e,c),j&&(c=j,e.setStartBefore(j)),j=c;for(var k=e.commonAncestorContainer;j&&j!=k&&j.parentNode!=k;)j=j.parentNode;oFormattingNode=e._document.createElement(a),b&&(oFormattingNode.className=b),j==k?k.insertBefore(oFormattingNode,k.firstChild):k.insertBefore(oFormattingNode,j),e.setStartAfter(oFormattingNode),e.setEndAfter(d),e.surroundContents(oFormattingNode);for(var l,m=oFormattingNode.childNodes,n=m.length-1;n>=0;n--)if(3==m[n].nodeType||"BR"==m[n].tagName){var o=e._document.createElement("P");for(l=m[n].nextSibling;n>=0&&m[n]&&(3==m[n].nodeType||"BR"==m[n].tagName);)o.insertBefore(m[n--],o.firstChild);oFormattingNode.insertBefore(o,l),n++}if(oFormattingNode&&oFormattingNode.parentNode){var o=e._document.createElement("P");o.innerHTML=unescape("
    "),oFormattingNode.parentNode.insertBefore(o,oFormattingNode.nextSibling)}return this.oApp.exec("RECORD_UNDO_ACTION",["Block Quote"]),oFormattingNode},_expandToTableStart:function(a,b){for(var c=a.commonAncestorContainer,d=null,e=!1;b&&!e;){if(b==c&&(e=!0),/TBODY|TFOOT|THEAD|TR/i.test(b.tagName)){d=this._getTableRoot(b);break}b=b.parentNode}return d},_getTableRoot:function(a){for(;a&&"TABLE"!=a.tagName;)a=a.parentNode;return a}}),xe.XE_SCharacter=a.Class({name:"XE_SCharacter",$init:function(b){this.bIE=a.browser.msie,this._assignHTMLObjects(b),this.charSet=[],this.charSet[0]=unescape("FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[1]=unescape("%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[2]=unescape("3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[3]=unescape("3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[4]=unescape("0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[5]=unescape("3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" ")},_assignHTMLObjects:function(b){b=a.$(b)||document,this.elDropdownLayer=a("DIV.xpress_xeditor_sCharacter_layer",b).get(0),this.oTextField=a("INPUT",this.elDropdownLayer).get(0),this.oInsertButton=a("+ BUTTON",this.oTextField).get(0),this.aCloseButton=a("BUTTON.close",this.elDropdownLayer).get(),this.aSCharList=a(".list",this.elDropdownLayer).get();var c=a(">UL",this.elDropdownLayer).get(0);this.aLabelA=a("A",c).get()},$ON_MSG_APP_READY:function(){var b=a.fnBind(this.oApp.exec,this.oApp,"INSERT_SCHARACTERS",[this.oTextField.value]);a(this.oInsertButton).click(b),this.oApp.exec("SET_SCHARACTER_LIST",[this.charSet]);for(var c=0;cd;d++)c[d]=document.createElement("LI"),c[d].innerHTML='",this.aSCharList[a].appendChild(c[d])}},_stopBrowserEvent:function(b,c){a(b).bind(c,function(a){a.stopPropagation(),a.preventDefault()})}}),xe.XE_UndoRedo=a.Class({name:"XE_UndoRedo",actionHistory:null,oCurStateIdx:null,iMinimumSizeChange:10,sBlankContentsForFF:"
    ",$init:function(){this.aUndoHistory=[],this.oCurStateIdx={nIdx:0,nStep:0}},$PRECONDITION:function(a){if(a.match(/_DO_RECORD_UNDO_HISTORY_AT$/))return!0;try{if("WYSIWYG"!=this.oApp.getEditingMode())return!1}catch(b){return!1}return!0},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT",[this.oCurStateIdx,"","",null])},$ON_MSG_APP_READY:function(){this.bFF=a.browser.mozilla,this.oApp.exec("ADD_APP_PROPERTY",["getUndoHistory",a.fnBind(this.getUndoHistory,this)]),this.oApp.exec("ADD_APP_PROPERTY",["getUndoStateIdx",a.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(){if(this.oApp.exec("DO_RECORD_UNDO_HISTORY",["KEYPRESS",!1,!1,1]),0!=this.oCurStateIdx.nIdx){if(this.oCurStateIdx.nStep>0)this.oCurStateIdx.nStep--;else{var a=this.aUndoHistory[this.oCurStateIdx.nIdx];this.oCurStateIdx.nIdx--,a.nTotalSteps>1?this.oCurStateIdx.nStep=0:(a=this.aUndoHistory[this.oCurStateIdx.nIdx],this.oCurStateIdx.nStep=a.nTotalSteps-1)}this.oApp.exec("RESTORE_UNDO_HISTORY",[this.oCurStateIdx.nIdx,this.oCurStateIdx.nStep]),this.oApp.exec("CHECK_STYLE_CHANGE",[])}},$ON_REDO:function(){if(!(this.oCurStateIdx.nIdx>=this.aUndoHistory.length)){var a=this.aUndoHistory[this.oCurStateIdx.nIdx];this.oCurStateIdx.nIdx==this.aUndoHistory.length-1&&this.oCurStateIdx.nStep>=a.nTotalSteps-1||(this.oCurStateIdx.nStep"+b+"";this.oSelection.pasteHTML(e)}else{var f=Math.ceil(1e4*Math.random()),g=this.sATagMarker+f,h=""==b?["unlink"]:["createLink",!1,g+b];this.oApp.exec("EXECCOMMAND",h);try{this.oSelection.setFromSelection()}catch(i){}var j=this.oApp.getWYSIWYGDocument();a(j.body.getElementsByTagName("A")).filter('[href^="'+g+'"]').attr("href",function(){var b=new RegExp("^"+g.replace(/([\.\\])/g,"\\$1"),"i");return d?a(this).attr("target",d):a(this).removeAttr("target"),this.href.replace(b,"")})}this.oApp.exec("HIDE_ACTIVE_LAYER"),setTimeout(a.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){13==a.keyCode&&(this.oApp.exec("XE_APPLY_HYPERLINK"),a.preventDefault(),a.stopPropagation())}}),xe.XE_Table=a.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(b){var c=null;this.elDropdownLayer=a("DIV.xpress_xeditor_table_layer",b).get(0),this.welDropdownLayer=a(this.elDropdownLayer),c=a("INPUT",this.elDropdownLayer).get(),this.oRowInput=c[0],this.oColumnInput=c[1],this.oBorderWidthInput=c[2],this.oBorderColorInput=c[3],this.oBGColorInput=c[4],c=a("BUTTON",this.elDropdownLayer).get(),this.oButton_AddRow=c[0],this.oButton_RemoveRow=c[1],this.oButton_AddColumn=c[2],this.oButton_RemoveColumn=c[3],this.oButton_IncBorderWidth=c[4],this.oButton_DecBorderWidth=c[5],this.oButton_BorderColorPreview=c[6],this.oButton_BorderColor=c[7],this.oButton_BGColorPreview=c[8],this.oButton_BGColor=c[9],this.oButton_Insert=c[10],this.oButton_Cancel=c[11],this.oSampleTable=a("TABLE",this.elDropdownLayer).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["table","click","ST_TOGGLE_TOOLBAR_LAYER"]),this.oApp.registerBrowserEvent(this.oRowInput,"change","ST_SET_ROW_NUM",[null,0]),this.oApp.registerBrowserEvent(this.oColumnInput,"change","ST_SET_COLUMN_NUM",[null,0]),this.oApp.registerBrowserEvent(this.oBorderWidthInput,"change","ST_SET_BORDER_WIDTH",[null,0]),this.oApp.registerBrowserEvent(this.oButton_AddRow,"click","ST_ADD_ROW"),this.oApp.registerBrowserEvent(this.oButton_RemoveRow,"click","ST_REMOVE_ROW"),this.oApp.registerBrowserEvent(this.oButton_AddColumn,"click","ST_ADD_COLUMN"),this.oApp.registerBrowserEvent(this.oButton_RemoveColumn,"click","ST_REMOVE_COLUMN"),this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth,"click","ST_INC_BORDER_WIDTH"),this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth,"click","ST_DEC_BORDER_WIDTH"),this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview,"click","ST_TOGGLE_BORDER_COLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BGColorPreview,"click","ST_TOGGLE_BGCOLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BorderColor,"click","ST_TOGGLE_BORDER_COLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BGColor,"click","ST_TOGGLE_BGCOLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_Insert,"click","ST_INSERT_TABLE"),this.oApp.registerBrowserEvent(this.oButton_Cancel,"click","ST_CLOSE"),this.oApp.exec("ST_SET_BORDER_COLOR",["#CCCCCC"]),this.oApp.exec("ST_SET_BGCOLOR",["#FFFFFF"])},$ON_ST_TOGGLE_TOOLBAR_LAYER:function(){this.oApp.exec("RECORD_UNDO_ACTION_FORCED",["KEYPRESS"]),this._showNewTable(),this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_ST_ADD_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,1])},$ON_ST_REMOVE_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,-1])},$ON_ST_ADD_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,1])},$ON_ST_REMOVE_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,-1])},$ON_ST_SET_ROW_NUM:function(a,b){a=a||parseInt(this.oRowInput.value),b=b||0,a+=b,athis.iMaxRows&&(a=this.iMaxRows),this.oRowInput.value=a,this._showNewTable()},$ON_ST_SET_COLUMN_NUM:function(a,b){a=a||parseInt(this.oColumnInput.value),b=b||0,a+=b,athis.iMaxColumns&&(a=this.iMaxColumns),this.oColumnInput.value=a,this._showNewTable()},$ON_ST_INSERT_TABLE:function(){var a=this._getTableString();this.oApp.exec("PASTE_HTML",[a]),this.oApp.exec("ST_CLOSE",[])},$ON_ST_CLOSE:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",[])},$ON_ST_SET_BORDER_WIDTH:function(a,b){a=a||parseInt(this.oBorderWidthInput.value),b=b||0,a+=b,athis.iMaxBorderWidth&&(a=this.iMaxBorderWidth),this.oBorderWidthInput.value=a,this._showNewTable()},$ON_ST_INC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,1])},$ON_ST_DEC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,-1])},$ON_ST_TOGGLE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.hasClass("p1")?this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",[]):this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER",[])},$ON_ST_SHOW_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.addClass("p1"),this.welDropdownLayer.removeClass("p2"),this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BORDER_COLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1"),this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_TOGGLE_BGCOLOR_LAYER:function(){this.welDropdownLayer.hasClass("p2")?this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",[]):this.oApp.exec("ST_SHOW_BGCOLOR_LAYER",[])},$ON_ST_SHOW_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1"),this.welDropdownLayer.addClass("p2"),this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BGCOLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p2"),this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_SET_BORDER_COLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BORDER_COLOR",[a]),this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",[])},$ON_ST_SET_BORDER_COLOR:function(a){this.oBorderColorInput.value=a,this.oButton_BorderColorPreview.style.backgroundColor=a,this._showNewTable()},$ON_ST_SET_BGCOLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BGCOLOR",[a]),this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",[])},$ON_ST_SET_BGCOLOR:function(a){this.oBGColorInput.value=a,this.oButton_BGColorPreview.style.backgroundColor=a,this._showNewTable()},_showNewTable:function(){var a=document.createElement("DIV");a.innerHTML=this._getTableString();var b=a.firstChild;this.oSampleTable.parentNode.insertBefore(b,this.oSampleTable),this.oSampleTable.parentNode.removeChild(this.oSampleTable),this.oSampleTable=b},_getTableString:function(){var b=this.oBorderColorInput.value,c=this.oBGColorInput.value,d=this.oBorderWidthInput.value,e="";e=a.browser.msie?"    ":a.browser.firefox?"":"";for(var f='
     


     

    ',g='',h=this.oColumnInput.value,i=0;h>i;i++)g+=e;g+="\n";var j=this.oRowInput.value;f+="";for(var i=0;j>i;i++)f+=g;return f+="",f+="
    "}}),xe.XE_EditingModeToggler=a.Class({name:"XE_EditingModeToggler",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){b=a.$(b)||document,this.elModeToggleButton=a("BUTTON.xpress_xeditor_mode_toggle_button",b).get(0),this.welModeToggleButton=a(this.elModeToggleButton)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elModeToggleButton,"click","EVENT_TOGGLE_EDITING_MODE",[])},$ON_EVENT_TOGGLE_EDITING_MODE:function(){"WYSIWYG"==this.oApp.getEditingMode()?this.oApp.exec("CHANGE_EDITING_MODE",["HTMLSrc"]):this.oApp.exec("CHANGE_EDITING_MODE",["WYSIWYG"])},$ON_CHANGE_EDITING_MODE:function(a){"HTMLSrc"==a?(this.welModeToggleButton.addClass("active").parent("span").addClass("active"),this.oApp.exec("DISABLE_ALL_UI",[])):(this.welModeToggleButton.removeClass("active").parent("span").removeClass("active"),this.oApp.exec("ENABLE_ALL_UI",[])) diff --git a/modules/editor/tpl/js/editor_common.min.js b/modules/editor/tpl/js/editor_common.min.js index 4dc3522c6..7e9c2777a 100644 --- a/modules/editor/tpl/js/editor_common.min.js +++ b/modules/editor/tpl/js/editor_common.min.js @@ -1,2 +1 @@ -/*! Copyright (C) NAVER */ function editorGetContent(a){var b=editorRelKeys[a].func(a),c=new RegExp(request_uri.replace(/\//g,"\\/")+"(files|common|modules|layouts|widgets)","ig");return b.replace(c,"$1")}function editorFocus(a){try{var b=editorGetIFrame(a);jQuery.isFunction(b.setFocus)?b.setFocus():b.contentWindow.focus()}catch(c){}}function editorEnableAutoSave(a,b,c){var d=a.title.value,e=editorRelKeys[b].content.value;editorAutoSaveObj={fo_obj:a,editor_sequence:b,title:d,content:e,locked:!1},clearTimeout(editorEnableAutoSave.timer),editorEnableAutoSave.timer=setTimeout(function(){_editorAutoSave(!1,c)},5e4)}function _editorAutoSave(a,b){var c=editorAutoSaveObj.fo_obj,d=editorAutoSaveObj.editor_sequence;if(a||(clearTimeout(editorEnableAutoSave.timer),editorEnableAutoSave.timer=setTimeout(function(){_editorAutoSave(a,b)},5e4)),1!=editorAutoSaveObj.locked&&c&&"undefined"!=typeof c.title&&d){var e=c.title.value,f="";try{f=editorGetContent(d)}catch(g){}if(e!=editorAutoSaveObj.title||f!=editorAutoSaveObj.content||a){var h,i=new Date;h={title:e,content:f,mid:current_mid,document_srl:editorRelKeys[d].primary.value},editorAutoSaveObj.title=e,editorAutoSaveObj.content=f,jQuery("#editor_autosaved_message_"+d).text(i.getHours()+":"+i.getMinutes()+" "+auto_saved_msg).show(300),editorAutoSaveObj.locked=!0,show_waiting_message=!1,exec_xml("editor","procEditorSaveDoc",h,function(){var a=jQuery.extend({},h,{auto_saved_msg:auto_saved_msg});editorAutoSaveObj.locked=!1,jQuery.isFunction(b)&&b(a)}),show_waiting_message=!0}}}function editorRemoveSavedDoc(){var a=new Array;a.mid=current_mid,exec_xml("editor","procEditorRemoveSavedDoc",a)}function editorGetIFrame(a){return void 0!=editorRelKeys&&void 0!=editorRelKeys[a]&&void 0!=editorRelKeys[a].editor?editorRelKeys[a].editor.getFrame(a):document.getElementById("editor_iframe_"+a)}function editorGetTextarea(a){return document.getElementById("editor_textarea_"+a)}function eOptionOver(a){a.style.marginTop="-21px",a.style.zIndex="99"}function eOptionOut(a){a.style.marginTop="0",a.style.zIndex="1"}function eOptionClick(a){a.style.marginTop="-42px",a.style.zIndex="99"}function editorEventCheck(a){editorPrevNode=null;var b=a.target.id;if(b){var c=b.split("_");if("component"==c[0]){var d=c[1],e=b.replace(/^component_[0-9]+_/,"");if(d&&e&&"html"!=editorMode[d])switch(e){case"Bold":case"Italic":case"Underline":case"StrikeThrough":case"undo":case"redo":case"JustifyLeft":case"JustifyCenter":case"JustifyRight":case"JustifyFull":case"Indent":case"Outdent":case"InsertOrderedList":case"InsertUnorderedList":case"SaveAs":case"Print":case"Copy":case"Cut":case"Paste":case"RemoveFormat":case"Subscript":case"Superscript":editorDo(e,"",d);break;default:return openComponent(e,d),!1}}}}function openComponent(a,b,c){if(editorPrevSrl=b,"html"!=editorMode[b]){var d=request_uri+"?module=editor&act=dispEditorPopup&editor_sequence="+b+"&component="+a;"undefined"!=typeof c&&c&&(d+="&manual_url="+escape(c)),popopen(d,"editorComponent")}}function editorSearchComponent(a){var b=new xEvent(a);editorPrevNode=null;var c=b.target;if(c.getAttribute("widget")){for(var d=c;d&&"BODY"!=d.nodeName;)d=xParent(d);if(!d||"BODY"!=d.nodeName||!d.getAttribute("editor_sequence"))return editorPrevNode=null,void 0;var e=d.getAttribute("editor_sequence"),f=c.getAttribute("widget");if(editorPrevNode=c,"html"==editorMode[e])return;return popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+f+"&module_srl="+e,"GenerateCodeInPage"),void 0}if(!c.getAttribute("editor_component"))for(;c&&!c.getAttribute("editor_component");)c=c.parentElement?c.parentElement:xParent(c);c||(c=b.target);var g=c.getAttribute("editor_component");if(g?editorPrevNode=c:"IMG"!=c.nodeName||c.getAttribute("widget")||(g="image_link",editorPrevNode=c),!g)return editorPrevNode=null,void 0;for(var d=c;d&&"BODY"!=d.nodeName;)d=xParent(d);if(!d||"BODY"!=d.nodeName||!d.getAttribute("editor_sequence"))return editorPrevNode=null,void 0;var e=d.getAttribute("editor_sequence");openComponent(g,e)}function editorReplaceHTML(a,b){var c=/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/g;b=b.replace(c,'src="'+request_uri+'$3/$4.$5"');var d=/href=("|\'){1}(\.\/)?\?([^"\']+)("|\'){1}/g;b=b.replace(d,'href="'+request_uri+'?$3"');a.editor_sequence||a.contentWindow.document.body.getAttribute("editor_sequence");try{a.contentWindow.focus()}catch(e){}if(jQuery.isFunction(a.replaceHTML))a.replaceHTML(b);else if(xIE4Up){var f=a.contentWindow.document.selection.createRange();f.pasteHTML?f.pasteHTML(b):editorPrevNode&&(editorPrevNode.outerHTML=b)}else try{if("HTML"==a.contentWindow.getSelection().focusNode.tagName){var f=a.contentDocument.createRange();f.setStart(a.contentDocument.body,0),f.setEnd(a.contentDocument.body,0),f.insertNode(f.createContextualFragment(b))}else{var f=a.contentWindow.getSelection().getRangeAt(0);f.deleteContents(),f.insertNode(f.createContextualFragment(b))}}catch(e){xInnerHtml(a.contentWindow.document.body,b+xInnerHtml(a.contentWindow.document.body))}}function editorGetSelectedHtml(a){var b=editorGetIFrame(a);if(jQuery.isFunction(b.getSelectedHTML))return b.getSelectedHTML();if(xIE4Up){var c=b.contentWindow.document.selection.createRange(),d=c.htmlText;return d}var c=b.contentWindow.getSelection().getRangeAt(0),e=xCreateElement("div");e.appendChild(c.cloneContents());var d=xInnerHtml(e);return d}var editorMode=new Array,editorAutoSaveObj={fo_obj:null,editor_sequence:0,title:"",content:"",locked:!1},editorRelKeys=new Array,editorDragObj={isDrag:!1,y:0,obj:null,id:"",det:0,source_height:0};editorEnableAutoSave.timer=null;var editorPrevSrl=null;jQuery(document).click(editorEventCheck);var editorPrevNode=null;!function(a){}(jQuery); \ No newline at end of file diff --git a/modules/importer/tpl/js/importer_admin.min.js b/modules/importer/tpl/js/importer_admin.min.js index 6a69c605d..cc1a11722 100644 --- a/modules/importer/tpl/js/importer_admin.min.js +++ b/modules/importer/tpl/js/importer_admin.min.js @@ -1,2 +1 @@ -/*! Copyright (C) NAVER */ function doSync(){return exec_xml("importer","procImporterAdminSync",[],function(a){alert(a.message),location.href=location.href}),!1}function doPreProcessing(a,b){function c(a){var c,d,e,g,i,j,k;if(h=!0,-1==a.status)return alert(a.message);for(c=get_by_id("fo_process"),d=c.elements,e=0,g=f.length;g>e;e++)i=f[e],d[i]?d[i].value=a[i]:0;if(k=get_by_id(b))for(j=["target_module","guestbook_target_module","user_id","unit_count"],e=0,g=j.length;g>e;e++)i=j[e],k.elements[i]&&(c.elements[i].value=k.elements[i].value);jQuery("#preProgressMsg").hide(),jQuery("#progressMsg").show(),doImport(b)}var d,e,f,g,h=!1,i=jQuery;return d=a.elements.xml_file.value,e=a.elements.type.value,d?(g=i("#process"),i("body").children(".x_modal-backdrop").length||i("body").append('
    '),i('a[href="#process"].modalAnchor').trigger("open.mw"),exec_xml("importer","procImporterAdminPreProcessing",{type:e,xml_file:d},c,f=["error","message","type","total","cur","key","status"]),!1):!1}function doImport(a){function b(b){function c(){alert(b.message),jQuery('a[href="#process"].modalAnchor').unbind("before-close.mw").trigger("close.mw").find("#progressBar").width(1).end().find("#progressPercent").html("0%").end();try{f.reset(),get_by_id(a).reset()}catch(c){}jQuery("span.btn > input[type=submit]").attr("disabled","disabled")}var d,i,j,k;for(d=0,i=e.length;i>d;d++)j=e[d],g[j]?g[j].value=b[j]:0;b.total=parseInt(b.total,10)||0,b.cur=parseInt(b.cur,10)||0,percent=parseInt(b.cur/b.total*100),jQuery("#totalCount").text(b.total),jQuery("#completeCount").text(b.cur),jQuery("#progressBar").width(percent+"%"),jQuery("#progressPercent").html(percent+"%"),b.total>b.cur?doImport(a):(k=get_by_id(a),null!=k&&k.isSync.checked?exec_xml("importer","procImporterAdminSync",h,function(a){!a||a.error&&"0"!=a.error||c()},e=["error","message"]):c())}var c,d,e,f=get_by_id("fo_process"),g=f.elements,h={};for(c=0,d=g.length;d>c;c++)h[g[c].name]=g[c].value;return show_waiting_message=!1,exec_xml("importer","procImporterAdminImport",h,b,e=["error","message","type","total","cur","key"]),show_waiting_message=!0,!1}function displayProgress(a,b){var c,d;c=Math.max(a?Math.round(b/a*100):100,1),d=jQuery("#status"),d.find("div.progress1").length||d.html('
    '),d.find("div.progress1").html(c+" ").css("width",c+"%").end().find("div.progress2").text(b+"/"+a)}jQuery(function(a){a(".checkxml").find("input:text").change(function(){a(this).closest(".checkxml").find(".x_help-inline").hide()}).end().find("button").click(function(){function b(a){var b,e;return e=g.find(">.xml"),b=g.find(">.ttxml"),$message.text(a.result_message),a.error||"true"!=a.exists?($message.attr("class","x_help-inline").fadeIn(300),b=b.filter(":visible"),b.eq(-1).slideUp(100,function(){b=b.slice(0,-1).eq(-1).slideUp(100,arguments.callee)}),g.find(":submit").attr("disabled","disabled"),c()):($message.attr("class","x_help-inline").fadeIn(300),g.find(":submit").removeAttr("disabled"),h=g.find(".syncmember:hidden"),f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),"XML"==a.type?e.not(":visible").add(h).slideDown(300):"TTXML"==a.type&&(b.not(":visible").add(h).slideDown(300),g.find("input[name=type]").val("ttxml")),void 0)}function c(){return f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),g.find(".syncmember:visible").slideUp(100),!1}var d,e,f,g,h;d=a(this).prop("disabled",!0),g=d.closest("form"),e=d.closest(".checkxml"),f=e.find("input").prop("disabled",!0).addClass("loading"),$message=e.find(".x_help-inline").hide(),show_waiting_message=!1,a.exec_json("importer.procImporterAdminCheckXmlFile",{filename:a.trim(f.val())},b)}).end().find(".x_help-inline").hide().end().closest("form").find(">.ttxml").hide().end().end().closest("form").find(":submit").attr("disabled","disabled"),a(".syncmember").hide()}); \ No newline at end of file diff --git a/modules/widget/tpl/css/widget.min.css b/modules/widget/tpl/css/widget.min.css new file mode 100644 index 000000000..5f839d4b8 --- /dev/null +++ b/modules/widget/tpl/css/widget.min.css @@ -0,0 +1 @@ +@charset "utf-8";.widget_title{margin:10px 5px 5px 0;padding:3px;border:1px solid #ddd}.widget_mid_list{margin:0 0 5px 10px}.widget_description{margin:5px 0 0;padding:5px 0 0;border-top:1px dotted #eee;color:#aaa}#colorset_area{margin-top:.5em}#colorset_area .header{float:left;margin-right:.5em;padding-top:.2em}#colorset_area .footer{float:left}#zonePageContent{overflow:hidden;margin:0!important;padding:0!important;width:100%}.pageAddContent{width:700px}.widgetOutput{float:left;z-index:998;position:relative;overflow:hidden;width:100%;min-height:24px;cursor:move}.widgetOutput .widgetBorder,.widgetOutput .widgetBoxBorder{z-index:999;box-sizing:border-box;height:100%;min-height:24px;border:1px dashed #ccc}.widgetOutput .widgetResize{z-index:1000;position:absolute;bottom:1px;right:1px;width:12px;height:12px;border:0;cursor:pointer;background:transparent url(../images/btn_resize.gif) no-repeat left bottom}.widgetOutput .widgetResizeLeft{height:12px;bottom:1px;position:absolute;border:0;width:12px;z-index:1000;left:1px;cursor:pointer;background:transparent url(../images/btn_resize_left.gif) no-repeat left bottom}.widgetOutput .widgetBoxResize{z-index:1000;position:absolute;right:1px;bottom:1px;width:12px;height:12px;border:0;cursor:pointer;background:transparent url(../images/btn_resize.gif) no-repeat left bottom}.widgetOutput .widgetBoxResizeLeft{z-index:1000;position:absolute;left:1px;bottom:0;width:12px;height:12px;border:0;cursor:pointer;background:transparent url(../images/btn_resize_left.gif) no-repeat left bottom}.widgetButtons{float:left;z-index:1000;visibility:hidden;position:absolute;top:0;overflow:hidden;padding:0 10px;line-height:24px;box-shadow:0 0 3px #333 inset;*zoom:1}.widgetButtons#widgetButton{left:0;background-color:#C7DBE9}.widgetButtons#widgetBoxButton{right:0;background-color:#D2E9C7}.widgetButtons>button{z-index:99;padding:14px 0 0;overflow:hidden;width:14px;height:14px;border:0;cursor:pointer;background:transparent url(../../../admin/tpl/img/glyphicons-halflings.png) no-repeat}.widgetButtons .widgetSetup{background-position:-432px 0}.widgetButtons .widgetBoxSize,.widgetButtons .widgetSize{background-position:-96px -120px}.widgetButtons .widgetStyle{background-position:-456px -144px}.widgetButtons .widgetBoxCopy,.widgetButtons .widgetCopy{background-position:0 -96px}.widgetButtons .widgetBoxRemove,.widgetButtons .widgetRemove{background-position:-456px 0}.help{padding:5px 0;border-top:1px solid #ccc;background-color:#EFEFEF}ul.midCommand{float:left;margin:0 0 0 10px;padding:0;*zoom:1}ul.midCommand li{display:block;margin-bottom:5px;list-style:none}a.widgetStyle{display:inline-block;position:relative;margin:0 10px 10px 0;overflow:hidden;width:96px;height:96px;border:1px solid #fff;text-decoration:none;*zoom:1}a.widgetStyle:hover{border:1px dashed #ccc}a.widgetStyle:hover span{display:none}a.widgetStyle.selected{border:1px dashed #999}a.widgetStyle img{margin:1px;width:96px;height:96px}a.widgetStyle span{display:block;position:absolute;left:0;bottom:0;width:96px;padding:4px 3px 3px;text-align:center;font-family:tahoma;color:#fff;filter:alpha(opacity=80);opacity:.8;background-color:#888}#zonePageContent .widgetContainer{min-height:20px} \ No newline at end of file diff --git a/modules/widget/tpl/js/generate_code.min.js b/modules/widget/tpl/js/generate_code.min.js new file mode 100644 index 000000000..1e09bee4e --- /dev/null +++ b/modules/widget/tpl/js/generate_code.min.js @@ -0,0 +1 @@ +function doDisplaySkinColorset(a){function b(b){for(var c=jQuery("select[name=colorset]").get(0),d=c.options.length,e=a,f=0;d>f;f++)c.remove(0);if(b.colorset_list){for(var g=b.colorset_list.split("\n"),h=0,f=0;f0||!i||0===h.indexOf("sizcache")||jQuery.inArray(h,g)>-1)){jQuery('').val(i).appendTo("#fo_widget").get(0)}}var j=[];jQuery("input,select,textarea","#fo_widget").each(function(){j.push(this)});for(var k=0;k0?n=l[0].type:m=0;var h=l.name;switch(n){case"hidden":case"text":case"textarea":var o=selected_node.getAttribute(h);if(!o)continue;var p=unescape(o);l.value=p?p:o,jQuery("#"+h).val(l.value);break;case"radio":case"checkbox":if(selected_node.getAttribute(h)){var o=selected_node.getAttribute(h).split(",");if(e[h].length){for(var q=0;q ",0===d)$(this).siblings("input").val(b[d].id);else{var e=$(this).siblings("input").val();$(this).siblings("input").val(e+","+b[d].id)}else if(b[d])if(c+=' ",0===d)$(this).siblings("input").val(b[d]);else{var e=$(this).siblings("input").val();$(this).siblings("input").val(e+","+b[d])}}else c=' ",$(this).siblings("input").val(b);$(this).before(c),$(".filebox_del").bind("click",function(){for(var a=$(this).prev("img").attr("src"),b=$(this).siblings("input").val().split(","),c="",d=0;d').find('>form').submit(function(){doApplyWidgetSize(this);return false});xAddEventListener(document.getElementById('zonePageContent'),"click",doCheckWidget);xAddEventListener(document.getElementById('zonePageContent'),"mousedown",doCheckWidgetDrag);xAddEventListener(document.getElementById('zonePageContent'),'mouseover',widgetSetup)} -function removeAllWidget(){if(!confirm(confirm_delete_msg))return;restoreWidgetButtons();jQuery(zonePageObj).html('')} -function getWidgetContent(obj){var html="";if(typeof (obj)=='undefined'||!obj)obj=zonePageObj;var widget=null;jQuery('div.widgetOutput',obj).each(function(){if(jQuery(this).parent().get(0)!=obj)return;widget=jQuery(this).attr('widget');switch(widget){case'widgetBox':html+=getWidgetBoxCode(this,widget);break;case'widgetContent':html+=getContentWidgetCode(this,widget);break;default:html+=getWidgetCode(this,widget);break}});return html} -function getContentWidgetCode(childObj,widget){var cobj=childObj.firstChild,widgetContent=jQuery('div.widgetContent',childObj),body='',attrs='',code='',name,document_srl=0,toIgnore='contenteditable,id,style,src,widget,body,class,widget_width,widget_width_type,xdpx,xdpy,height,document_srl,widget_padding_left,widget_padding_right,widget_padding_top,widget_padding_bottom,hascontent';if(widgetContent.size()>0){document_srl=jQuery(childObj).attr('document_srl');if(document_srl>0){body=''}else body=widgetContent.html();var reIgnore=new RegExp('^('+toIgnore.replace(/,/g,'|')+')$','i'),value;for(var i=0;i'}else return'';return code} -function getWidgetBoxCode(childObj,widget){var attrs="";for(var i=0;i0){o=jQuery('.widget_inner',childObj);o=o.get(0)}else o=jQuery('.nullWidget',childObj).get(0);var body=getWidgetContent(o);return'
    '+body+'
    '} -function getWidgetCode(childObj,widget){var attrs="",code="";for(var i=0;i'} -function doAddContent(mid){var url=request_uri.setQuery('module','widget').setQuery('act','dispWidgetAdminAddContent').setQuery('module_srl',zoneModuleSrl).setQuery('mid',mid);popopen(url,"addContent")} -function doSyncPageContent(){if(opener&&opener.selectedWidget){var fo_obj=get_by_id("content_fo"),sel_obj=opener.selectedWidget;fo_obj.style.value=getStyle(opener.selectedWidget);fo_obj.widget_padding_left.value=getPadding(sel_obj,'left');fo_obj.widget_padding_right.value=getPadding(sel_obj,'right');fo_obj.widget_padding_bottom.value=getPadding(sel_obj,'bottom');fo_obj.widget_padding_top.value=getPadding(sel_obj,'top');var obj=sel_obj.firstChild;while(obj&&obj.className!="widgetContent")obj=obj.nextSibling;if(obj&&obj.className=="widgetContent")if(!fo_obj.document_srl||fo_obj.document_srl.value==0)try{var content=Base64.decode(xInnerHtml(obj));content=editorReplacePath(content);get_by_id("content_fo").content.value=content;xe.Editors["1"].exec("SET_IR",[content])}catch(e){}};if(typeof (editorStart)!='undefined')editorStart(1,"module_srl","content",false,400)} -function addContentWidget(fo_obj){var editor_sequence=fo_obj.getAttribute('editor_sequence'),mid=fo_obj.mid.value,module_srl=fo_obj.module_srl.value,document_srl=fo_obj.document_srl.value,content=editorGetContent(editor_sequence),params={editor_sequence:editor_sequence,content:content,module_srl:module_srl,document_srl:document_srl};if(/^\s*

    .*<\/p>\s*$/i.test(params.content)){var lowerContent=params.content.toLowerCase(),idx=lowerContent.indexOf('

    '),last_idx=lowerContent.lastIndexOf('

    ');if(idx>0&&last_idx>0&&idx==last_idx)params.content=content=params.content.replace(/^\s*

    |<\/p>\s*$/ig,'')};exec_xml('widget','procWidgetInsertDocument',params,function(ret_obj,response_tags){if(!ret_obj||ret_obj.error!='0')return;var document_srl=ret_obj.document_srl,contentWidget=opener.jQuery('div.widgetOutput[widget=widgetContent][document_srl='+document_srl+']'),attr=[];if(contentWidget.size()>0)attr=contentWidget.get(0).attributes;var tpl='

    '+content+'
    ',$tpl=jQuery(tpl);for(var i=0,l=attr.length;i').append($tpl).html();opener.doAddWidgetCode(tpl);window.close()},'document_srl'.split(','));return false} -function doAddWidgetBox(){var tpl='
    ';zonePageObj.innerHTML+=tpl} -function doAddWidget(fo){var sel=fo.widget_list,idx=sel.selectedIndex,val=sel.options[idx].value,module_srl=fo.module_srl.value,url=request_uri.setQuery('module','widget').setQuery('act','dispWidgetGenerateCodeInPage').setQuery('selected_widget',val).setQuery('module_srl',module_srl);popopen(url,'GenerateWidgetCode')};var selectedWidget=null,writedText=null,checkDocumentWrite=false;window.document.write=window.document.writeln=function(str){if(checkDocumentWrite){writedText=str;return};if(str.match(/^<\//))return;if(!window.opera)str=str.replace(/&(?![#a-z0-9]+;)/g,"&");str=str.replace(/(<[a-z]+)/g,"$1 xmlns='http://www.w3.org/1999/xhtml'");var div=jQuery('
    ').html(str)[0],pos;pos=document.getElementsByTagName("*");pos=pos[pos.length-1];var nodes=div.childNodes;while(nodes.length)pos.parentNode.appendChild(nodes[0])} -function doAddWidgetCode(widget_code){restoreWidgetButtons();var tmp=widget_code;while(tmp.indexOf(""),cssfile=tmp.substr(10,eos-10);if(cssfile.indexOf('.js')>-1){tmp=tmp.substr(eos);continue};if(!cssfile)break;tmp=tmp.substr(eos);var cssfile=request_uri+cssfile;if(typeof (document.createStyleSheet)=='undefined'){var css='',dummy=xCreateElement("DIV");xInnerHtml(dummy,css);document.body.appendChild(dummy)}else document.createStyleSheet(cssfile,0)};checkDocumentWrite=true;var tmp=widget_code.toLowerCase();while(tmp.indexOf("-1){var pos=tmp.indexOf("")+9,script=widget_code.substr(pos,length);script=script.replace(/^]*)>/i,'').replace(/<\/script>$/i,'');writedText=null;try{eval(script)}catch(e){};widget_code=widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length);tmp=widget_code.toLowerCase()};var dummy=xCreateElement('div');xInnerHtml(dummy,widget_code);var obj=dummy.childNodes[0];if(selectedWidget&&selectedWidget.getAttribute("widget")){var o=jQuery('div.widget_inner',selectedWidget),n=jQuery('div.widget_inner',obj);if(n.size()==0)n=jQuery('div.nullWidget',obj);if(o.size()==0)o=jQuery('div.nullWidget',selectedWidget);n.html(o.html());selectedWidget.parentNode.insertBefore(obj,selectedWidget);selectedWidget.parentNode.removeChild(selectedWidget)}else get_by_id('zonePageContent').appendChild(obj);checkDocumentWrite=false;selectedWidget=null} -function doCheckWidget(e){var evt=new xEvent(e);if(!evt.target)return;var obj=evt.target;selectedWidget=null;var pObj=obj.parentNode;while(pObj){if(pObj.id=="pageSizeLayer")return;pObj=pObj.parentNode};doHideWidgetSizeSetup();if(obj.className=='widgetSetup'){var p_obj=obj.parentNode.parentNode,widget=p_obj.getAttribute("widget");if(!widget)return;selectedWidget=p_obj;if(widget=='widgetContent'){popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl"),"addContent")}else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');return}else if(obj.className=='widgetStyle'){var p_obj=obj.parentNode.parentNode,widget=p_obj.getAttribute("widget"),widgetstyle=p_obj.getAttribute("widgetstyle");if(!widget)return;selectedWidget=p_obj;popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');return}else if(obj.className=='widgetCopy'&&obj.parentNode.parentNode.className=='widgetOutput'){p_obj=obj.parentNode.parentNode;restoreWidgetButtons();if(p_obj.getAttribute('widget')=='widgetContent'&&p_obj.getAttribute('document_srl')){var response_tags=new Array('error','message','document_srl'),params=new Array();params.document_srl=p_obj.getAttribute('document_srl');exec_xml('widget','procWidgetCopyDocument',params,completeCopyWidgetContent,response_tags,params,p_obj);return}else{var dummy=xCreateElement("DIV");xInnerHtml(dummy,xInnerHtml(p_obj));dummy.widget_sequence='';dummy.className="widgetOutput";for(var i=0;i0)return;doHideWidgetSizeSetup();if(obj.className=='widgetSetup'||obj.className=='widgetStyle'||obj.className=='widgetCopy'||obj.className=='widgetBoxCopy'||obj.className=='widgetSize'||obj.className=='widgetBoxSize'||obj.className=='widgetRemove'||obj.className=='widgetBoxRemove')return;p_obj=obj;while(p_obj){if(p_obj.className=='widgetOutput'||p_obj.className=='widgetResize'||p_obj.className=='widgetResizeLeft'||p_obj.className=='widgetBoxResize'||p_obj.className=='widgetBoxResizeLeft'){widgetDragEnable(p_obj,widgetDragStart,widgetDrag,widgetDragEnd);widgetMouseDown(e);return};p_obj=p_obj.parentNode}} -function _getInt(val){if(!val||val=="null")return 0;if(parseInt(val,10)==NaN)return 0;return parseInt(val,10)};var selectedSizeWidget=null -function doShowWidgetSizeSetup(px,py,obj){var layer=jQuery('#pageSizeLayer'),form=layer.find('>form:first'),obj=jQuery(obj);if(!form.length)return;selectedSizeWidget=obj[0];var opts={widget_align:obj.css('float'),width:obj[0].style.width,height:obj[0].style.height,padding_left:_getInt(obj.attr('widget_padding_left')),padding_right:_getInt(obj.attr('widget_padding_right')),padding_top:_getInt(obj.attr('widget_padding_top')),padding_bottom:_getInt(obj.attr('widget_padding_bottom')),margin_left:_getInt(obj[0].style.marginLeft),margin_right:_getInt(obj[0].style.marginRight),margin_top:_getInt(obj[0].style.marginTop),margin_bottom:_getInt(obj[0].style.marginBottom),border_top_color:transRGB2Hex(obj[0].style.borderTopColor),border_top_thick:obj[0].style.borderTopWidth.replace(/px$/i,''),border_top_type:obj[0].style.borderTopStyle,border_bottom_color:transRGB2Hex(obj[0].style.borderBottomColor),border_bottom_thick:obj[0].style.borderBottomWidth.replace(/px$/i,''),border_bottom_type:obj[0].style.borderBottomStyle,border_right_color:transRGB2Hex(obj[0].style.borderRightColor),border_right_thick:obj[0].style.borderRightWidth.replace(/px$/i,''),border_right_type:obj[0].style.borderRightStyle,border_left_color:transRGB2Hex(obj[0].style.borderLeftColor),border_left_thick:obj[0].style.borderLeftWidth.replace(/px$/i,''),border_left_type:obj[0].style.borderLeftStyle,background_color:transRGB2Hex(obj[0].style.backgroundColor),background_image_url:obj[0].style.backgroundImage.replace(/^url\(/i,'').replace(/\)$/i,''),background_x:0,background_y:0,background_repeat:obj[0].style.backgroundRepeat},pos=obj[0].style.backgroundPosition;if(pos){pos=pos.split(' ');if(pos.length==2){opts.background_x=pos[0];opts.background_y=pos[1]}};layer.show();jQuery(function($){var $psLayer=$('#pageSizeLayer'),$backdrop=$('.x_modal-backdrop'),ww=$(window).width(),wh=$(window).height(),pw=$psLayer.width(),ph=$psLayer.height();if(ww>pw&&wh>ph){$backdrop.show();$psLayer.css({position:'fixed',top:wh/2-ph/2+'px',left:ww/2-pw/2+'px',width:'700px'})}else{$backdrop.hide();$psLayer.css({position:'static',top:'auto',left:'auto',width:'auto'})}});jQuery.each(opts,function(key,val){var el=form[0].elements[key];if(el){el.value=val;if(el.className.match(/\bcolor-indicator\b/))el.style.background=el.value='#'+el.value};if(el.tagName.toLowerCase()=="select")if(el.selectedIndex==-1)el.selectedIndex=0});try{form[0].elements[0].focus()}catch(e){}} -function doHideWidgetSizeSetup(){jQuery('#pageSizeLayer, .x_modal-backdrop, .jPicker.Container').hide()};jQuery(function($){$(document).keydown(function(e){var $jpicker=$('.jPicker.Container:visible');if(e.which==27&&!$jpicker.length){doHideWidgetSizeSetup();return false}else if(e.which==27&&$jpicker.length){$jpicker.hide();return false}else return true})}) -function _getSize(value){if(!value)return 0;var type="px";if(value.lastIndexOf("%")>=0)type="%";var num=parseInt(value,10);if(num<1)return 0;if(type=="%"&&num>100)num=100;return""+num+type} -function _getBorderStyle(fld_color,fld_thick,fld_type){var color=fld_color.value;color=color.replace(/^#/,'');if(!color){color='#FFFFFF'}else color='#'+color;var width=fld_thick.value;if(!width){width='0px'}else width=parseInt(width,10)+'px';var style=fld_type.options[fld_type.selectedIndex].value;if(!style)style='solid';var str=color+' '+width+' '+style;return str} -function _getBGColorStyle(fld_color){var color=fld_color.replace(/^#/,'');if(!color){color='#FFFFFF'}else color='#'+color;return color} -function doApplyWidgetSize(fo_obj){if(selectedSizeWidget){if(fo_obj.widget_align.selectedIndex==1){setFloat(selectedSizeWidget,'right')}else setFloat(selectedSizeWidget,'left');var width=_getSize(fo_obj.width.value);if(width)selectedSizeWidget.style.width=width;var height=_getSize(fo_obj.height.value);if(height&&height!="100%"){selectedSizeWidget.style.height=height}else{selectedSizeWidget.style.height='';var widgetBorder=xGetElementsByClassName('widgetBorder',selectedSizeWidget);for(var i=0;i0)return;if(jQuery(obj).is('.buttonBox')||jQuery(obj).parents('.buttonBox').size()>0)return;var o=jQuery(obj).parents('.widgetOutput');if(o.size()==0){restoreWidgetButtons();return};obj=o.get(0);var widget=o.attr('widget');if(!widget)return;if(widget=='widgetBox'){restoreWidgetButtons();showWidgetButton('widgetBoxButton',obj)}else{restoreWidgetButtons();showWidgetButton('widgetButton',obj);var p_obj=obj.parentNode;if(p_obj)while(p_obj){if(p_obj.nodeName=='DIV'&&p_obj.getAttribute('widget')=='widgetBox'){showWidgetButton('widgetBoxButton',p_obj);break};p_obj=p_obj.parentNode}}};var widgetDragManager={obj:null,isDrag:false},widgetTmpObject=new Array(),widgetDisappear=0 -function widgetCreateTmpObject(obj){var id=obj.getAttribute('id');tmpObj=xCreateElement('DIV');tmpObj.id=id+'_tmp';tmpObj.className=obj.className;tmpObj.style.overflow='hidden';tmpObj.style.margin='0px';tmpObj.style.padding='0px';tmpObj.style.width=obj.style.width;tmpObj.style.display='none';tmpObj.style.position='absolute';tmpObj.style.opacity=1;tmpObj.style.filter='alpha(opacity=100)';xLeft(tmpObj,xPageX(obj));xTop(tmpObj,xPageY(obj));document.body.appendChild(tmpObj);widgetTmpObject[obj.id]=tmpObj;return tmpObj};var idStep=0 -function widgetGetTmpObject(obj){if(!obj.id)obj.id='widget_'+ idStep++;var tmpObj=widgetTmpObject[obj.id];if(!tmpObj)tmpObj=widgetCreateTmpObject(obj);return tmpObj} -function widgetDragEnable(obj,funcDragStart,funcDrag,funcDragEnd){obj.draggable=true;obj.dragStart=funcDragStart;obj.drag=funcDrag;obj.dragEnd=funcDragEnd;if(!widgetDragManager.isDrag){widgetDragManager.isDrag=true;xAddEventListener(document,'mousemove',widgetDragMouseMove,false)}} -function widgetDragStart(tobj,px,py){if(tobj.className=='widgetResize'||tobj.className=='widgetResizeLeft'||tobj.className=='widgetBoxResize'||tobj.className=='widgetBoxResizeLeft')return;var obj=widgetGetTmpObject(tobj);xInnerHtml(obj,xInnerHtml(tobj));xLeft(obj,xPageX(tobj));xTop(obj,xPageY(tobj));xWidth(obj,xWidth(tobj));xHeight(obj,xHeight(tobj));xDisplay(obj,'block')} -function widgetDrag(tobj,dx,dy){var minWidth=40,minHeight=10,sx=xPageX(tobj.parentNode),sy=xPageY(tobj.parentNode),nx=tobj.xDPX,ny=tobj.xDPY,zoneWidth=xWidth(zonePageObj),zoneLeft=xPageX(zonePageObj),zoneRight=zoneLeft+zoneWidth,pWidth=xWidth(tobj.parentNode),cssFloat=getFloat(tobj.parentNode);if(!cssFloat)cssFloat='left';if(tobj.className=='widgetResize'||tobj.className=='widgetBoxResize'){if(nxzoneRight)nx=zoneRight;if(cssFloat=='right')nx=sx+pWidth;var new_width=nx-sx;if(new_width=l&&tobj.xDPX<=ll&&tobj.xDPY>=t&&tobj.xDPY<=tt&&tobj.parentNode==target_obj.parentNode){var next1=target_obj.nextSibling;if(!next1){next1=xCreateElement("DIV");target_obj.parentNode.appendChild(next1)};var next2=tobj.nextSibling;if(!next2){next2=xCreateElement("DIV");tobj.parentNode.appendChild(next2)};if(next1)next1.parentNode.insertBefore(tobj,next1);if(next2)next2.parentNode.insertBefore(target_obj,next2);widgetList=null;return}};widgetList=null;var p_tobj=jQuery(tobj).parents('div.nullWidget').get(0),l=xPageX(p_tobj),t=xPageY(p_tobj),ll=parseInt(l,10)+parseInt(xWidth(p_tobj),10),tt=parseInt(t,10)+parseInt(xHeight(p_tobj),10);if((tobj.xDPXll)||(tobj.xDPYtt)){zonePageObj.insertBefore(tobj,jQuery(tobj).parents('div.widgetOutput[widget=widgetBox]').get(0));return}}else{if(tobj.getAttribute("widget")!="widgetBox"){var boxList=xGetElementsByClassName("nullWidget",zonePageObj);for(var i=0;i=l&&tobj.xDPX<=ll&&tobj.xDPY>=t&&tobj.xDPY<=tt)if(target_obj.className=="nullWidget"){var wb_ws=jQuery('div.widget_inner',jQuery(target_obj));if(wb_ws.size()==0){target_obj.appendChild(tobj)}else wb_ws.get(0).appendChild(tobj);widgetManualEnd();boxList=null;return}};boxList=null};var widgetList=xGetElementsByClassName("widgetOutput",zonePageObj);for(var i=0;i=l&&tobj.xDPX<=ll&&tobj.xDPY>=t&&tobj.xDPY<=tt&&tobj.parentNode==target_obj.parentNode){var next1=target_obj.nextSibling;if(!next1)next1=target_obj.parentNode.lastChild;if(!next1){next1=xCreateElement("DIV");target_obj.parentNode.appendChild(next1)};var next2=tobj.nextSibling;if(!next2){next2=xCreateElement("DIV");tobj.parentNode.appendChild(next2)};if(next1)next1.parentNode.insertBefore(tobj,next1);if(next2)next2.parentNode.insertBefore(target_obj,next2);widgetList=null;return}};widgetList=null}}} -function widgetDragEnd(tobj,px,py){var obj=widgetGetTmpObject(tobj);widgetDisapear=widgetDisapearObject(obj,tobj);widgetDragDisable(tobj.getAttribute('id'))} -function widgetDisapearObject(obj,tobj){xInnerHtml(tobj,xInnerHtml(obj));xInnerHtml(obj,'');xDisplay(obj,'none');obj.parentNode.removeChild(obj);widgetTmpObject[tobj.id]=null;return} -function widgetMouseDown(e){var evt=new xEvent(e),obj=evt.target;while(obj&&!obj.draggable)obj=xParent(obj,true);if(obj){xPreventDefault(e);obj.xDPX=evt.pageX;obj.xDPY=evt.pageY;widgetDragManager.obj=obj;xAddEventListener(document,'mouseup',widgetMouseUp,false);if(obj.dragStart)obj.dragStart(obj,evt.pageX,evt.pageY)}} -function widgetMouseUp(e){if(widgetDragManager.obj){xPreventDefault(e);xRemoveEventListener(document,'mouseup',widgetMouseUp,false);if(widgetDragManager.obj.dragEnd){var evt=new xEvent(e);widgetDragManager.obj.dragEnd(widgetDragManager.obj,evt.pageX,evt.pageY)};widgetDragManager.obj=null;widgetDragManager.isDrag=false}} -function widgetDragMouseMove(e){var evt=new xEvent(e);if(widgetDragManager.obj){xPreventDefault(e);var obj=widgetDragManager.obj,dx=evt.pageX-obj.xDPX,dy=evt.pageY-obj.xDPY;obj.xDPX=evt.pageX;obj.xDPY=evt.pageY;if(obj.drag){obj.drag(obj,dx,dy)}else xMoveTo(obj,xLeft(obj)+dx,xTop(obj)+dy)}} -function widgetDragDisable(id){if(!widgetDragManager)return;var obj=get_by_id(id);obj.draggable=false;obj.dragStart=null;obj.drag=null;obj.dragEnd=null;xRemoveEventListener(obj,'mousedown',widgetMouseDown,false);return} -function widgetManualEnd(){var tobj=widgetDragManager.obj;if(!tobj)return;xRemoveEventListener(document,'mouseup',widgetMouseUp,false);xAddEventListener(document,'mousemove',widgetDragMouseMove,false);var obj=widgetGetTmpObject(tobj);widgetDisapear=widgetDisapearObject(obj,tobj);widgetDragDisable(tobj.getAttribute('id'));widgetDragManager.obj=null;widgetDragManager.isDrag=false} \ No newline at end of file +function getStyle(a){var b=a.getAttribute("style");return b||(b=a.style),"object"==typeof b&&(b=b.cssText),b=b.replace(/\burl\s*\(\s*"(.*?)"\s*\)/i,"url('$1')")}function getFloat(a){return jQuery(a).css("float")}function setFloat(a,b){jQuery(a).css("float",b)}function getPadding(a,b){var c=a.getAttribute("widget_padding_"+b);return c&&null!==c||(c=0),c}function doStartPageModify(a,b){zonePageObj=get_by_id(a),zoneModuleSrl=b,jQuery("#tmpPageSizeLayer").appendTo("body").hide().attr("id","pageSizeLayer").css({position:"fixed"}).before('
    ').find(">form").submit(function(){return doApplyWidgetSize(this),!1}),xAddEventListener(document.getElementById("zonePageContent"),"click",doCheckWidget),xAddEventListener(document.getElementById("zonePageContent"),"mousedown",doCheckWidgetDrag),xAddEventListener(document.getElementById("zonePageContent"),"mouseover",widgetSetup)}function removeAllWidget(){confirm(confirm_delete_msg)&&(restoreWidgetButtons(),jQuery(zonePageObj).html(""))}function getWidgetContent(a){var b="";"undefined"!=typeof a&&a||(a=zonePageObj);var c=null;return jQuery("div.widgetOutput",a).each(function(){if(jQuery(this).parent().get(0)==a)switch(c=jQuery(this).attr("widget")){case"widgetBox":b+=getWidgetBoxCode(this,c);break;case"widgetContent":b+=getContentWidgetCode(this,c);break;default:b+=getWidgetCode(this,c)}}),b}function getContentWidgetCode(a){var b,c=(a.firstChild,jQuery("div.widgetContent",a)),d="",e="",f=0,g="contenteditable,id,style,src,widget,body,class,widget_width,widget_width_type,xdpx,xdpy,height,document_srl,widget_padding_left,widget_padding_right,widget_padding_top,widget_padding_bottom,hascontent";if(c.size()>0){f=jQuery(a).attr("document_srl"),d=f>0?"":c.html();for(var h,i=new RegExp("^("+g.replace(/,/g,"|")+")$","i"),j=0;j"}return""}function getWidgetBoxCode(a){for(var b="",c=0;c0?(f=jQuery(".widget_inner",a),f=f.get(0)):f=jQuery(".nullWidget",a).get(0);var g=getWidgetContent(f);return'
    "+g+"
    "}function getWidgetCode(a,b){for(var c="",d=0;d"}function doAddContent(a){var b=request_uri.setQuery("module","widget").setQuery("act","dispWidgetAdminAddContent").setQuery("module_srl",zoneModuleSrl).setQuery("mid",a);popopen(b,"addContent")}function doSyncPageContent(){if(opener&&opener.selectedWidget){var a=get_by_id("content_fo"),b=opener.selectedWidget;a.style.value=getStyle(opener.selectedWidget),a.widget_padding_left.value=getPadding(b,"left"),a.widget_padding_right.value=getPadding(b,"right"),a.widget_padding_bottom.value=getPadding(b,"bottom"),a.widget_padding_top.value=getPadding(b,"top");for(var c=b.firstChild;c&&"widgetContent"!=c.className;)c=c.nextSibling;if(c&&"widgetContent"==c.className&&(!a.document_srl||"0"==a.document_srl.value))try{var d=Base64.decode(xInnerHtml(c));d=editorReplacePath(d),get_by_id("content_fo").content.value=d,xe.Editors["1"].exec("SET_IR",[d])}catch(e){}}"undefined"!=typeof editorStart&&editorStart(1,"module_srl","content",!1,400)}function addContentWidget(a){var b=a.getAttribute("editor_sequence"),c=(a.mid.value,a.module_srl.value),d=a.document_srl.value,e=editorGetContent(b),f={editor_sequence:b,content:e,module_srl:c,document_srl:d};if(/^\s*

    .*<\/p>\s*$/i.test(f.content)){var g=f.content.toLowerCase(),h=g.indexOf("

    "),i=g.lastIndexOf("

    ");h>0&&i>0&&h==i&&(f.content=e=f.content.replace(/^\s*

    |<\/p>\s*$/gi,""))}return exec_xml("widget","procWidgetInsertDocument",f,function(b){if(b&&"0"==b.error){var c=b.document_srl,d=opener.jQuery("div.widgetOutput[widget=widgetContent][document_srl="+c+"]"),f=[];d.size()>0&&(f=d.get(0).attributes);for(var g='

    '+e+'
    ',h=jQuery(g),i=0,j=f.length;j>i;i++)h.attr(f[i].name)||h.attr(f[i].name,f[i].value);g=jQuery("
    ").append(h).html(),opener.doAddWidgetCode(g),window.close()}},"document_srl".split(",")),!1}function doAddWidgetBox(){var a='
    ';zonePageObj.innerHTML+=a}function doAddWidget(a){var b=a.widget_list,c=b.selectedIndex,d=b.options[c].value,e=a.module_srl.value,f=request_uri.setQuery("module","widget").setQuery("act","dispWidgetGenerateCodeInPage").setQuery("selected_widget",d).setQuery("module_srl",e);popopen(f,"GenerateWidgetCode")}function doAddWidgetCode(widget_code){restoreWidgetButtons();for(var tmp=widget_code;tmp.indexOf(""),cssfile=tmp.substr(10,eos-10);if(cssfile.indexOf(".js")>-1)tmp=tmp.substr(eos);else{if(!cssfile)break;if(tmp=tmp.substr(eos),cssfile=request_uri+cssfile,"undefined"==typeof document.createStyleSheet){var css='',dummy=xCreateElement("DIV");xInnerHtml(dummy,css),document.body.appendChild(dummy)}else document.createStyleSheet(cssfile,0)}}for(checkDocumentWrite=!0,tmp=widget_code.toLowerCase();tmp.indexOf("-1;){var pos=tmp.indexOf("")+9,script=widget_code.substr(pos,length);script=script.replace(/^]*)>/i,"").replace(/<\/script>$/i,""),writedText=null;try{eval(script)}catch(e){}widget_code=widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length),tmp=widget_code.toLowerCase()}var dummy=xCreateElement("div");xInnerHtml(dummy,widget_code);var obj=dummy.childNodes[0];if(selectedWidget&&selectedWidget.getAttribute("widget")){var o=jQuery("div.widget_inner",selectedWidget),n=jQuery("div.widget_inner",obj);0===n.size()&&(n=jQuery("div.nullWidget",obj)),0===o.size()&&(o=jQuery("div.nullWidget",selectedWidget)),n.html(o.html()),selectedWidget.parentNode.insertBefore(obj,selectedWidget),selectedWidget.parentNode.removeChild(selectedWidget)}else get_by_id("zonePageContent").appendChild(obj);checkDocumentWrite=!1,selectedWidget=null}function doCheckWidget(a){var b=new xEvent(a);if(b.target){var c=b.target;selectedWidget=null;for(var d=c.parentNode;d;){if("pageSizeLayer"==d.id)return;d=d.parentNode}if(doHideWidgetSizeSetup(),"widgetSetup"==c.className){var e=c.parentNode.parentNode,f=e.getAttribute("widget");if(!f)return;return selectedWidget=e,"widgetContent"==f?popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+e.getAttribute("document_srl"),"addContent"):popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+f+"&widgetstyle="+g,"GenerateCodeInPage"),void 0}if("widgetStyle"==c.className){var e=c.parentNode.parentNode,f=e.getAttribute("widget"),g=e.getAttribute("widgetstyle");if(!f)return;return selectedWidget=e,popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+f+"&widgetstyle="+g,"GenerateCodeInPage"),void 0}if("widgetCopy"==c.className&&"widgetOutput"==c.parentNode.parentNode.className){var e=c.parentNode.parentNode;if(restoreWidgetButtons(),"widgetContent"==e.getAttribute("widget")&&e.getAttribute("document_srl")){var h=new Array("error","message","document_srl"),i=[];return i.document_srl=e.getAttribute("document_srl"),exec_xml("widget","procWidgetCopyDocument",i,completeCopyWidgetContent,h,i,e),void 0}var j=xCreateElement("DIV");xInnerHtml(j,xInnerHtml(e)),j.widget_sequence="",j.className="widgetOutput";for(var k=0;k0)&&(doHideWidgetSizeSetup(),"widgetSetup"!=c.className&&"widgetStyle"!=c.className&&"widgetCopy"!=c.className&&"widgetBoxCopy"!=c.className&&"widgetSize"!=c.className&&"widgetBoxSize"!=c.className&&"widgetRemove"!=c.className&&"widgetBoxRemove"!=c.className))for(p_obj=c;p_obj;){if("widgetOutput"==p_obj.className||"widgetResize"==p_obj.className||"widgetResizeLeft"==p_obj.className||"widgetBoxResize"==p_obj.className||"widgetBoxResizeLeft"==p_obj.className)return widgetDragEnable(p_obj,widgetDragStart,widgetDrag,widgetDragEnd),widgetMouseDown(a),void 0;p_obj=p_obj.parentNode}}}function _getInt(a){return a&&"null"!=a?isNaN(parseInt(a,10))?0:parseInt(a,10):0}function doShowWidgetSizeSetup(a,b,c){var d=jQuery("#pageSizeLayer"),e=d.find(">form:first"),c=jQuery(c);if(e.length){selectedSizeWidget=c[0];var f={widget_align:c.css("float"),width:c[0].style.width,height:c[0].style.height,padding_left:_getInt(c.attr("widget_padding_left")),padding_right:_getInt(c.attr("widget_padding_right")),padding_top:_getInt(c.attr("widget_padding_top")),padding_bottom:_getInt(c.attr("widget_padding_bottom")),margin_left:_getInt(c[0].style.marginLeft),margin_right:_getInt(c[0].style.marginRight),margin_top:_getInt(c[0].style.marginTop),margin_bottom:_getInt(c[0].style.marginBottom),border_top_color:transRGB2Hex(c[0].style.borderTopColor),border_top_thick:c[0].style.borderTopWidth.replace(/px$/i,""),border_top_type:c[0].style.borderTopStyle,border_bottom_color:transRGB2Hex(c[0].style.borderBottomColor),border_bottom_thick:c[0].style.borderBottomWidth.replace(/px$/i,""),border_bottom_type:c[0].style.borderBottomStyle,border_right_color:transRGB2Hex(c[0].style.borderRightColor),border_right_thick:c[0].style.borderRightWidth.replace(/px$/i,""),border_right_type:c[0].style.borderRightStyle,border_left_color:transRGB2Hex(c[0].style.borderLeftColor),border_left_thick:c[0].style.borderLeftWidth.replace(/px$/i,""),border_left_type:c[0].style.borderLeftStyle,background_color:transRGB2Hex(c[0].style.backgroundColor),background_image_url:c[0].style.backgroundImage.replace(/^url\(/i,"").replace(/\)$/i,""),background_x:0,background_y:0,background_repeat:c[0].style.backgroundRepeat},g=c[0].style.backgroundPosition;g&&(g=g.split(" "),2==g.length&&(f.background_x=g[0],f.background_y=g[1])),d.show(),jQuery(function(a){var b=a("#pageSizeLayer"),c=a(".x_modal-backdrop"),d=a(window).width(),e=a(window).height(),f=b.width(),g=b.height();d>f&&e>g?(c.show(),b.css({position:"fixed",top:e/2-g/2+"px",left:d/2-f/2+"px",width:"700px"})):(c.hide(),b.css({position:"static",top:"auto",left:"auto",width:"auto"}))}),jQuery.each(f,function(a,b){var c=e[0].elements[a];c&&(c.value=b,c.className.match(/\bcolor-indicator\b/)&&(c.style.background=c.value="#"+c.value)),"select"==c.tagName.toLowerCase()&&-1==c.selectedIndex&&(c.selectedIndex=0)});try{e[0].elements[0].focus()}catch(h){}}}function doHideWidgetSizeSetup(){jQuery("#pageSizeLayer, .x_modal-backdrop, .jPicker.Container").hide()}function _getSize(a){if(!a)return 0;var b="px";a.lastIndexOf("%")>=0&&(b="%");var c=parseInt(a,10);return 1>c?0:("%"==b&&c>100&&(c=100),""+c+b)}function _getBorderStyle(a,b,c){var d=a.value;d=d.replace(/^#/,""),d=d?"#"+d:"#FFFFFF";var e=b.value;e=e?parseInt(e,10)+"px":"0px";var f=c.options[c.selectedIndex].value;f||(f="solid");var g=d+" "+e+" "+f;return g}function _getBGColorStyle(a){var b=a.replace(/^#/,"");return b=b?"#"+b:"#FFFFFF"}function doApplyWidgetSize(a){if(selectedSizeWidget){1==a.widget_align.selectedIndex?setFloat(selectedSizeWidget,"right"):setFloat(selectedSizeWidget,"left");var b=_getSize(a.width.value);b&&(selectedSizeWidget.style.width=b);var c=_getSize(a.height.value);if(c&&"100%"!=c)selectedSizeWidget.style.height=c;else{selectedSizeWidget.style.height="";for(var d=xGetElementsByClassName("widgetBorder",selectedSizeWidget),e=0;e0||jQuery(c).is(".buttonBox")||jQuery(c).parents(".buttonBox").size()>0)){var d=jQuery(c).parents(".widgetOutput");if(0===d.size())return restoreWidgetButtons(),void 0;c=d.get(0);var e=d.attr("widget");if(e)if("widgetBox"==e)restoreWidgetButtons(),showWidgetButton("widgetBoxButton",c);else{restoreWidgetButtons(),showWidgetButton("widgetButton",c);var f=c.parentNode;if(f)for(;f;){if("DIV"==f.nodeName&&"widgetBox"==f.getAttribute("widget")){showWidgetButton("widgetBoxButton",f);break}f=f.parentNode}}}}function widgetCreateTmpObject(a){var b=a.getAttribute("id");return tmpObj=xCreateElement("DIV"),tmpObj.id=b+"_tmp",tmpObj.className=a.className,tmpObj.style.overflow="hidden",tmpObj.style.margin="0px",tmpObj.style.padding="0px",tmpObj.style.width=a.style.width,tmpObj.style.display="none",tmpObj.style.position="absolute",tmpObj.style.opacity=1,tmpObj.style.filter="alpha(opacity=100)",xLeft(tmpObj,xPageX(a)),xTop(tmpObj,xPageY(a)),document.body.appendChild(tmpObj),widgetTmpObject[a.id]=tmpObj,tmpObj}function widgetGetTmpObject(a){a.id||(a.id="widget_"+idStep++);var b=widgetTmpObject[a.id];return b||(b=widgetCreateTmpObject(a)),b}function widgetDragEnable(a,b,c,d){a.draggable=!0,a.dragStart=b,a.drag=c,a.dragEnd=d,widgetDragManager.isDrag||(widgetDragManager.isDrag=!0,xAddEventListener(document,"mousemove",widgetDragMouseMove,!1))}function widgetDragStart(a){if("widgetResize"!=a.className&&"widgetResizeLeft"!=a.className&&"widgetBoxResize"!=a.className&&"widgetBoxResizeLeft"!=a.className){var b=widgetGetTmpObject(a);xInnerHtml(b,xInnerHtml(a)),xLeft(b,xPageX(a)),xTop(b,xPageY(a)),xWidth(b,xWidth(a)),xHeight(b,xHeight(a)),xDisplay(b,"block")}}function widgetDrag(a,b,c){var d=40,e=10,f=xPageX(a.parentNode),g=xPageY(a.parentNode),h=a.xDPX,i=a.xDPY,j=xWidth(zonePageObj),k=xPageX(zonePageObj),l=k+j,m=xWidth(a.parentNode),n=getFloat(a.parentNode);if(n||(n="left"),"widgetResize"==a.className||"widgetBoxResize"==a.className){f+d>h&&(h=f+d),h>l&&(h=l),"right"==n&&(h=f+m);var o=h-f;d>o&&(o=d);var p=i-g;e>p&&(p=e),f+o>l&&(o=l-f),xWidth(a.parentNode,o),xHeight(a.parentNode,p)}else if("widgetResizeLeft"==a.className||"widgetBoxResizeLeft"==a.className){k>h&&(h=k),"left"==n&&(h=f);var o=m+(f-h);d>o&&(o=d);var p=i-g;e>p&&(p=e),xWidth(a.parentNode,o),xHeight(a.parentNode,p)}else{var q=widgetGetTmpObject(a);if(xLeft(q,parseInt(xPageX(q),10)+parseInt(b,10)),xTop(q,parseInt(xPageY(q),10)+parseInt(c,10)),a.parentNode!=zonePageObj){for(var r=xGetElementsByClassName("widgetOutput",a.parentNode),s=0;s=u&&a.xDPX<=w&&a.xDPY>=v&&a.xDPY<=x&&a.parentNode==t.parentNode){var y=t.nextSibling;y||(y=xCreateElement("DIV"),t.parentNode.appendChild(y));var z=a.nextSibling;return z||(z=xCreateElement("DIV"),a.parentNode.appendChild(z)),y&&y.parentNode.insertBefore(a,y),z&&z.parentNode.insertBefore(t,z),r=null,void 0}}r=null;var A=jQuery(a).parents("div.nullWidget").get(0),u=xPageX(A),v=xPageY(A),w=parseInt(u,10)+parseInt(xWidth(A),10),x=parseInt(v,10)+parseInt(xHeight(A),10);if(a.xDPXw||a.xDPYx)return zonePageObj.insertBefore(a,jQuery(a).parents("div.widgetOutput[widget=widgetBox]").get(0)),void 0}else{if("widgetBox"!=a.getAttribute("widget")){for(var B=xGetElementsByClassName("nullWidget",zonePageObj),s=0;s=u&&a.xDPX<=w&&a.xDPY>=v&&a.xDPY<=x&&"nullWidget"==t.className){var C=jQuery("div.widget_inner",jQuery(t));return 0===C.size()?t.appendChild(a):C.get(0).appendChild(a),widgetManualEnd(),B=null,void 0}}B=null}for(var r=xGetElementsByClassName("widgetOutput",zonePageObj),s=0;s=u&&a.xDPX<=w&&a.xDPY>=v&&a.xDPY<=x&&a.parentNode==t.parentNode){var y=t.nextSibling;y||(y=t.parentNode.lastChild),y||(y=xCreateElement("DIV"),t.parentNode.appendChild(y));var z=a.nextSibling;return z||(z=xCreateElement("DIV"),a.parentNode.appendChild(z)),y&&y.parentNode.insertBefore(a,y),z&&z.parentNode.insertBefore(t,z),r=null,void 0}}}r=null}}}function widgetDragEnd(a){var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id"))}function widgetDisapearObject(a,b){xInnerHtml(b,xInnerHtml(a)),xInnerHtml(a,""),xDisplay(a,"none"),a.parentNode.removeChild(a),widgetTmpObject[b.id]=null}function widgetMouseDown(a){for(var b=new xEvent(a),c=b.target;c&&!c.draggable;)c=xParent(c,!0);c&&(xPreventDefault(a),c.xDPX=b.pageX,c.xDPY=b.pageY,widgetDragManager.obj=c,xAddEventListener(document,"mouseup",widgetMouseUp,!1),c.dragStart&&c.dragStart(c,b.pageX,b.pageY))}function widgetMouseUp(a){if(widgetDragManager.obj){if(xPreventDefault(a),xRemoveEventListener(document,"mouseup",widgetMouseUp,!1),widgetDragManager.obj.dragEnd){var b=new xEvent(a);widgetDragManager.obj.dragEnd(widgetDragManager.obj,b.pageX,b.pageY)}widgetDragManager.obj=null,widgetDragManager.isDrag=!1}}function widgetDragMouseMove(a){var b=new xEvent(a);if(widgetDragManager.obj){xPreventDefault(a);var c=widgetDragManager.obj,d=b.pageX-c.xDPX,e=b.pageY-c.xDPY;c.xDPX=b.pageX,c.xDPY=b.pageY,c.drag?c.drag(c,d,e):xMoveTo(c,xLeft(c)+d,xTop(c)+e)}}function widgetDragDisable(a){if(widgetDragManager){var b=get_by_id(a);b.draggable=!1,b.dragStart=null,b.drag=null,b.dragEnd=null,xRemoveEventListener(b,"mousedown",widgetMouseDown,!1)}}function widgetManualEnd(){var a=widgetDragManager.obj;if(a){xRemoveEventListener(document,"mouseup",widgetMouseUp,!1),xAddEventListener(document,"mousemove",widgetDragMouseMove,!1);var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id")),widgetDragManager.obj=null,widgetDragManager.isDrag=!1}}var zonePageObj=null,zoneModuleSrl=0,selectedWidget=null,writedText=null,checkDocumentWrite=!1;window.document.write=window.document.writeln=function(a){if(checkDocumentWrite)return writedText=a,void 0;if(!a.match(/^<\//)){window.opera||(a=a.replace(/&(?![#a-z0-9]+;)/g,"&")),a=a.replace(/(<[a-z]+)/g,"$1 xmlns='http://www.w3.org/1999/xhtml'");var b,c=jQuery("
    ").html(a)[0];b=document.getElementsByTagName("*"),b=b[b.length-1];for(var d=c.childNodes;d.length;)b.parentNode.appendChild(d[0])}};var selectedSizeWidget=null;jQuery(function(a){a(document).keydown(function(b){var c=a(".jPicker.Container:visible");return 27!=b.which||c.length?27==b.which&&c.length?(c.hide(),!1):!0:(doHideWidgetSizeSetup(),!1)})});var hideElements=[],widgetDragManager={obj:null,isDrag:!1},widgetTmpObject=[],widgetDisappear=0,idStep=0; \ No newline at end of file diff --git a/modules/widget/tpl/js/widget_admin.min.js b/modules/widget/tpl/js/widget_admin.min.js new file mode 100644 index 000000000..35a0da0f1 --- /dev/null +++ b/modules/widget/tpl/js/widget_admin.min.js @@ -0,0 +1 @@ +function completeGenerateCode(a){var b=a.widget_code;b=b.replace(/&/g,"&"),b=b.replace(/\'/g,"'");var c=get_by_id("widget_code");c.value=b}function completeGenerateCodeInPage(a){var b=a.widget_code;return opener&&b?(opener.doAddWidgetCode(b),window.close(),void 0):(window.close(),void 0)}function doDisplaySkinColorset(a,b){var c=a.options[a.selectedIndex].value;if(!c)return get_by_id("colorset_area").style.display="none",setFixedPopupSize(),void 0;var d=[];d.selected_widget=get_by_id("fo_widget").selected_widget.value,d.skin=c,d.colorset=b;var e=new Array("error","message","colorset_list");exec_xml("widget","procWidgetGetColorsetList",d,completeGetSkinColorset,e,d)}function completeGetSkinColorset(a,b,c){for(var d=jQuery("#fo_widget")[0].widget_colorset,e=d.options.length,f=c.colorset,g=0;e>g;g++)d.remove(0);if(a.colorset_list){for(var h=a.colorset_list.split("\n"),i=0,g=0;g0)&&h&&"style"!=g){jQuery('').val(h).appendTo("#fo_widget").get(0)}}var i=[];jQuery("input,select,textarea","#fo_widget").each(function(){i.push(this)});for(var j=0;j0?m=k[0].type:l=0;var g=k.name;switch(m){case"hidden":case"text":case"textarea":var n=selected_node.getAttribute(g);if(!n)continue;var o=unescape(n);k.value=o?o:n;break;case"checkbox":if(selected_node.getAttribute(g)){var n=selected_node.getAttribute(g).split(",");if(e[g].length){for(var p=0;p100&&(c.widget_width.value=100)}}function insertSelectedModule(a,b,c,d){var e=get_by_id("_"+a),f=get_by_id(a);f.value=b,e.value=d+" ("+c+")"}function insertSelectedModules(a,b,c,d){for(var e=jQuery("#_"+a)[0],f=0;f8&&(e.size=e.options.length),syncMid(a)}function midMoveUp(a){var b=get_by_id("_"+a);if(!(b.selectedIndex<0)){var c=b.selectedIndex;if(!(1>c)){var d=b.options[c],e=b.options[c-1],f=d.value,g=d.text;d.value=e.value,d.text=e.text,e.value=f,e.text=g,b.selectedIndex=c-1,syncMid(a)}}}function midMoveDown(a){var b=get_by_id("_"+a);if(!(b.selectedIndex<0)){var c=b.selectedIndex;if(c!=b.options.length-1){var d=b.options[c],e=b.options[c+1],f=d.value,g=d.text;d.value=e.value,d.text=e.text,e.value=f,e.text=g,b.selectedIndex=c+1,syncMid(a)}}}function midRemove(a){var b=get_by_id("_"+a);if(!(b.selectedIndex<0)){var c=b.selectedIndex;b.remove(c),c-=1,0>c&&(c=0),b.options.length&&(b.selectedIndex=c),syncMid(a)}}function syncMid(a){for(var b=jQuery("#_"+a)[0],c=[],d=0;dd)){for(i=0;i-1)return;b.remove(d),d-=1,0>d&&(d=0),b.options.length&&(b.selectedIndex=d),MultiOrderSet(a)}}function MultiOrderUp(a){var b=jQuery("[name='selected_"+a+"']").get(0);if(!(b.selectedIndex<0)){var c=b.selectedIndex;if(!(1>c)){var d=b.options[c],e=b.options[c-1],f=d.value,g=d.text;d.value=e.value,d.text=e.text,e.value=f,e.text=g,b.selectedIndex=c-1,MultiOrderSet(a)}}}function MultiOrderDown(a){var b=jQuery("[name='selected_"+a+"']").get(0);if(!(b.selectedIndex<0)){var c=b.selectedIndex;if(c!=b.options.length-1){var d=b.options[c],e=b.options[c+1],f=d.value,g=d.text;d.value=e.value,d.text=e.text,e.value=f,e.text=g,b.selectedIndex=c+1,MultiOrderSet(a)}}}function initMultiOrder(a){var b=jQuery("[name='selected_"+a+"']").get(0),c=jQuery("[name='init_"+a+"']").val(),d=jQuery("[name='"+a+"']").val();if(d){var e=d.split(",");for(i=0;i0){var f=new Option(e[i],e[i]);b.options.add(f)}}else{var g=c.split(",");for(i=0;i0){var f=new Option(g[i],g[i]);b.options.add(f)}}MultiOrderSet(a)}var selected_node=null,windowLoadEventLoader=[];jQuery(window).load(excuteWindowLoadEvent); \ No newline at end of file From 3fa484d3d19a1e18561836539bec8ae0298d730c Mon Sep 17 00:00:00 2001 From: dorami Date: Sat, 23 Nov 2013 21:51:14 +0900 Subject: [PATCH 114/473] =?UTF-8?q?#58=20=EC=83=88=EB=A1=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=90=9C=20=EC=8A=A4=ED=8C=B8=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EB=B2=88=EC=97=AD=20=EC=B6=94=EA=B0=80(path=20from=20dorami)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/spamfilter/lang/lang.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/spamfilter/lang/lang.xml b/modules/spamfilter/lang/lang.xml index d09e7adb3..8303079b3 100644 --- a/modules/spamfilter/lang/lang.xml +++ b/modules/spamfilter/lang/lang.xml @@ -206,6 +206,15 @@ l'article qui comporte le mot ne sera pas affichagé.]]> + + + + + + + + + From ba6b8c5784f127494261e568530fefd94caeb87d Mon Sep 17 00:00:00 2001 From: ngleader Date: Sat, 23 Nov 2013 21:59:42 +0900 Subject: [PATCH 115/473] =?UTF-8?q?#57=20htmlspecialchars()=EC=9D=98=20dou?= =?UTF-8?q?ble=5Fencode=3Dfalse=20=EC=A0=81=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/tpl/file_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 7f29496dc..5c145a457 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -70,7 +70,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
    {htmlspecialchars($val->source_filename)}{htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)} {FileHandler::filesize($val->file_size)} {$val->download_count} From 11a013ba409ff3a7418e850f07b20262ad2421d2 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 23 Nov 2013 22:46:45 +0900 Subject: [PATCH 116/473] =?UTF-8?q?#43=20IP=EB=AA=A9=EB=A1=9D=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EB=B3=B4=EC=99=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.controller.php | 1 + modules/install/install.controller.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 8fb817201..bb37cc98c 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -490,6 +490,7 @@ class adminAdminController extends admin $db_info->sitelock_title = $vars->sitelock_title; $db_info->sitelock_message = $vars->sitelock_message; $db_info->sitelock_whitelist = $vars->sitelock_whitelist; + if(!$db_info->sitelock_whitelist) $db_info->sitelock_whitelist = '127.0.0.1'; FileHandler::writeFile(Context::getConfigFile(), $oInstallController->_getDBConfigFileContents($db_info)); diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 7656c04a9..28ab83531 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -552,9 +552,9 @@ class installController extends install } else if($key == 'sitelock_whitelist') { - $tmpValue = preg_split("/[\r\n|\r|\n]+/", $val); - $tmpValue = array_unique($tmpValue); - $tmpValue = sprintf('$db_info->%s = array(\'%s\');' . PHP_EOL, $key, implode('\', \'', $tmpValue)); + if(!is_array($val)) $val = preg_split("/[\r\n|\r|\n]+/", $val); + $val = array_unique($val); + $tmpValue = sprintf('$db_info->%s = array(\'%s\');' . PHP_EOL, $key, implode('\', \'', $val)); } else { From 7623df3247393abbec860079105f0ce872683217 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 23 Nov 2013 22:47:15 +0900 Subject: [PATCH 117/473] =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/install/install.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 28ab83531..aaa1cea16 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -182,7 +182,7 @@ class installController extends install foreach($scripts as $script) { $script_path = FileHandler::getRealPath('./modules/install/script/'); - $output = include($script_path . $script)); + $output = include($script_path . $script); } } @@ -528,7 +528,7 @@ class installController extends install if($k == 'db_table_prefix' && !empty($v) && substr($v,-1)!='_') $v .= '_'; $buff[] = "'$k' => '$v',"; } - $buff[] = '),'; + $buff[] = ($with_array) ? '),' : ')'; } if($with_array) $buff[] = ')'; From 1aa4c8e9a721ef059dabf8b2e217bf64f3766eb1 Mon Sep 17 00:00:00 2001 From: bnu Date: Sun, 24 Nov 2013 00:27:16 +0900 Subject: [PATCH 118/473] =?UTF-8?q?#3=20jQueqy,=20jQuery=20UI=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20*=20jQuery=20:=20v1.10.2(lt=20IE?= =?UTF-8?q?=209)=20&=20v2.0.3=20*=20jQuery=20UI=20:=20v1.10.3=20*=20jQuery?= =?UTF-8?q?=20Migrate=20:=20v1.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/display/HTMLDisplayHandler.php | 4 + common/js/jquery-1.x.js | 9789 ++++++++++++ common/js/jquery-1.x.min.js | 6 + common/js/jquery-migrate.js | 521 + common/js/jquery-migrate.min.js | 2 + common/js/jquery.js | 12463 ++++++++-------- common/js/jquery.min.js | 10 +- .../js/plugins/ui/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../ui/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes .../ui/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes .../ui/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes .../ui/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes .../ui/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes common/js/plugins/ui/jquery-ui.css | 565 - common/js/plugins/ui/jquery-ui.min.css | 4 + common/js/plugins/ui/jquery-ui.min.js | 137 +- .../js/plugins/ui/jquery.ui.datepicker-ko.js | 19 +- common/js/plugins/ui/plugin.load | 2 +- 18 files changed, 16300 insertions(+), 7222 deletions(-) create mode 100644 common/js/jquery-1.x.js create mode 100644 common/js/jquery-1.x.min.js create mode 100644 common/js/jquery-migrate.js create mode 100644 common/js/jquery-migrate.min.js create mode 100644 common/js/plugins/ui/images/animated-overlay.gif delete mode 100644 common/js/plugins/ui/jquery-ui.css create mode 100644 common/js/plugins/ui/jquery-ui.min.css diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index 56500c552..235df92cb 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -396,6 +396,8 @@ class HTMLDisplayHandler if(__DEBUG__) { $oContext->loadFile(array('./common/js/jquery.js', 'head', '', -100000), true); + $oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -100000), true); + $oContext->loadFile(array('./common/js/jquery-migrate.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/x.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/common.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true); @@ -406,6 +408,8 @@ class HTMLDisplayHandler else { $oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -100000), true); + $oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -100000), true); + $oContext->loadFile(array('./common/js/jquery-migrate.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/css/xe.min.css', '', '', -1000000), true); diff --git a/common/js/jquery-1.x.js b/common/js/jquery-1.x.js new file mode 100644 index 000000000..c5c648255 --- /dev/null +++ b/common/js/jquery-1.x.js @@ -0,0 +1,9789 @@ +/*! + * jQuery JavaScript Library v1.10.2 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2013-07-03T13:48Z + */ +(function( window, undefined ) { + +// Can't do this because several apps including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// Support: Firefox 18+ +//"use strict"; +var + // The deferred used on DOM ready + readyList, + + // A central reference to the root jQuery(document) + rootjQuery, + + // Support: IE<10 + // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined` + core_strundefined = typeof undefined, + + // Use the correct document accordingly with window argument (sandbox) + location = window.location, + document = window.document, + docElem = document.documentElement, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // [[Class]] -> type pairs + class2type = {}, + + // List of deleted data cache ids, so we can reuse them + core_deletedIds = [], + + core_version = "1.10.2", + + // Save a reference to some core methods + core_concat = core_deletedIds.concat, + core_push = core_deletedIds.push, + core_slice = core_deletedIds.slice, + core_indexOf = core_deletedIds.indexOf, + core_toString = class2type.toString, + core_hasOwn = class2type.hasOwnProperty, + core_trim = core_version.trim, + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Used for matching numbers + core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, + + // Used for splitting on whitespace + core_rnotwhite = /\S+/g, + + // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE) + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, + + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }, + + // The ready event handler + completed = function( event ) { + + // readyState === "complete" is good enough for us to call the dom ready in oldIE + if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { + detach(); + jQuery.ready(); + } + }, + // Clean-up method for dom ready events + detach = function() { + if ( document.addEventListener ) { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + + } else { + document.detachEvent( "onreadystatechange", completed ); + window.detachEvent( "onload", completed ); + } + }; + +jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: core_version, + + constructor: jQuery, + init: function( selector, context, rootjQuery ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + + // scripts is true for back-compat + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[2] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return core_slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == null ? + + // Return a 'clean' array + this.toArray() : + + // Return just the object + ( num < 0 ? this[ this.length + num ] : this[ num ] ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + ready: function( fn ) { + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; + }, + + slice: function() { + return this.pushStack( core_slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: core_push, + sort: [].sort, + splice: [].splice +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.extend = jQuery.fn.extend = function() { + var src, copyIsArray, copy, name, options, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( length === i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery + expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), + + noConflict: function( deep ) { + if ( window.$ === jQuery ) { + window.$ = _$; + } + + if ( deep && window.jQuery === jQuery ) { + window.jQuery = _jQuery; + } + + return jQuery; + }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger("ready").off("ready"); + } + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray || function( obj ) { + return jQuery.type(obj) === "array"; + }, + + isWindow: function( obj ) { + /* jshint eqeqeq: false */ + return obj != null && obj == obj.window; + }, + + isNumeric: function( obj ) { + return !isNaN( parseFloat(obj) ) && isFinite( obj ); + }, + + type: function( obj ) { + if ( obj == null ) { + return String( obj ); + } + return typeof obj === "object" || typeof obj === "function" ? + class2type[ core_toString.call(obj) ] || "object" : + typeof obj; + }, + + isPlainObject: function( obj ) { + var key; + + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + try { + // Not own constructor property must be Object + if ( obj.constructor && + !core_hasOwn.call(obj, "constructor") && + !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 + return false; + } + + // Support: IE<9 + // Handle iteration over inherited properties before own properties. + if ( jQuery.support.ownLast ) { + for ( key in obj ) { + return core_hasOwn.call( obj, key ); + } + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + for ( key in obj ) {} + + return key === undefined || core_hasOwn.call( obj, key ); + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw new Error( msg ); + }, + + // data: string of html + // context (optional): If specified, the fragment will be created in this context, defaults to document + // keepScripts (optional): If true, will include scripts passed in the html string + parseHTML: function( data, context, keepScripts ) { + if ( !data || typeof data !== "string" ) { + return null; + } + if ( typeof context === "boolean" ) { + keepScripts = context; + context = false; + } + context = context || document; + + var parsed = rsingleTag.exec( data ), + scripts = !keepScripts && []; + + // Single tag + if ( parsed ) { + return [ context.createElement( parsed[1] ) ]; + } + + parsed = jQuery.buildFragment( [ data ], context, scripts ); + if ( scripts ) { + jQuery( scripts ).remove(); + } + return jQuery.merge( [], parsed.childNodes ); + }, + + parseJSON: function( data ) { + // Attempt to parse using the native JSON parser first + if ( window.JSON && window.JSON.parse ) { + return window.JSON.parse( data ); + } + + if ( data === null ) { + return data; + } + + if ( typeof data === "string" ) { + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + if ( data ) { + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test( data.replace( rvalidescape, "@" ) + .replace( rvalidtokens, "]" ) + .replace( rvalidbraces, "")) ) { + + return ( new Function( "return " + data ) )(); + } + } + } + + jQuery.error( "Invalid JSON: " + data ); + }, + + // Cross-browser xml parsing + parseXML: function( data ) { + var xml, tmp; + if ( !data || typeof data !== "string" ) { + return null; + } + try { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { + xml = undefined; + } + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { + jQuery.error( "Invalid XML: " + data ); + } + return xml; + }, + + noop: function() {}, + + // Evaluates a script in a global context + // Workarounds based on findings by Jim Driscoll + // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + globalEval: function( data ) { + if ( data && jQuery.trim( data ) ) { + // We use execScript on Internet Explorer + // We use an anonymous function so that context is window + // rather than jQuery in Firefox + ( window.execScript || function( data ) { + window[ "eval" ].call( window, data ); + } )( data ); + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + // args is for internal usage only + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); + + if ( args ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } + } + + return obj; + }, + + // Use native String.trim function wherever possible + trim: core_trim && !core_trim.call("\uFEFF\xA0") ? + function( text ) { + return text == null ? + "" : + core_trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + core_push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + var len; + + if ( arr ) { + if ( core_indexOf ) { + return core_indexOf.call( arr, elem, i ); + } + + len = arr.length; + i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; + + for ( ; i < len; i++ ) { + // Skip accessing in sparse arrays + if ( i in arr && arr[ i ] === elem ) { + return i; + } + } + } + + return -1; + }, + + merge: function( first, second ) { + var l = second.length, + i = first.length, + j = 0; + + if ( typeof l === "number" ) { + for ( ; j < l; j++ ) { + first[ i++ ] = second[ j ]; + } + } else { + while ( second[j] !== undefined ) { + first[ i++ ] = second[ j++ ]; + } + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, inv ) { + var retVal, + ret = [], + i = 0, + length = elems.length; + inv = !!inv; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + retVal = !!callback( elems[ i ], i ); + if ( inv !== retVal ) { + ret.push( elems[ i ] ); + } + } + + return ret; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, + i = 0, + length = elems.length, + isArray = isArraylike( elems ), + ret = []; + + // Go through the array, translating each of the items to their + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + } + + // Flatten any nested arrays + return core_concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var args, proxy, tmp; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = core_slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + // Multifunctional method to get and set values of a collection + // The value/s can optionally be executed if it's a function + access: function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + length = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < length; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + length ? fn( elems[0], key ) : emptyGet; + }, + + now: function() { + return ( new Date() ).getTime(); + }, + + // A method for quickly swapping in/out CSS properties to get correct calculations. + // Note: this method belongs to the css module but it's needed here for the support module. + // If support gets modularized, this method should be moved back to the css module. + swap: function( elem, options, callback, args ) { + var ret, name, + old = {}; + + // Remember the old values, and insert the new ones + for ( name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + ret = callback.apply( elem, args || [] ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; + } + + return ret; + } +}); + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // we once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); + + // Standards-based browsers support DOMContentLoaded + } else if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); + + // If IE event model is used + } else { + // Ensure firing before onload, maybe late but safe also for iframes + document.attachEvent( "onreadystatechange", completed ); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", completed ); + + // If IE and not a frame + // continually check to see if the document is ready + var top = false; + + try { + top = window.frameElement == null && document.documentElement; + } catch(e) {} + + if ( top && top.doScroll ) { + (function doScrollCheck() { + if ( !jQuery.isReady ) { + + try { + // Use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + top.doScroll("left"); + } catch(e) { + return setTimeout( doScrollCheck, 50 ); + } + + // detach all dom ready events + detach(); + + // and execute any waiting functions + jQuery.ready(); + } + })(); + } + } + } + return readyList.promise( obj ); +}; + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +function isArraylike( obj ) { + var length = obj.length, + type = jQuery.type( obj ); + + if ( jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || type !== "function" && + ( length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj ); +} + +// All jQuery objects should point back to these +rootjQuery = jQuery(document); +/*! + * Sizzle CSS Selector Engine v1.10.2 + * http://sizzlejs.com/ + * + * Copyright 2013 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2013-07-03 + */ +(function( window, undefined ) { + +var i, + support, + cachedruns, + Expr, + getText, + isXML, + compile, + outermostContext, + sortInput, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + -(new Date()), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + hasDuplicate = false, + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + return 0; + }, + + // General-purpose constants + strundefined = typeof undefined, + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf if we can't use a native one + indexOf = arr.indexOf || function( elem ) { + var i = 0, + len = this.length; + for ( ; i < len; i++ ) { + if ( this[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + + "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", + + // Prefer arguments quoted, + // then not containing pseudos/brackets, + // then attribute selectors/non-parenthetical expressions, + // then anything else + // These preferences are here to reduce the number of selectors + // needing tokenize in the PSEUDO preFilter + pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rsibling = new RegExp( whitespace + "*[+~]" ), + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + // BMP codepoint + high < 0 ? + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { + return []; + } + + if ( documentIsHTML && !seed ) { + + // Shortcuts + if ( (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType === 9 && selector; + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && context.parentNode || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key += " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Detect xml + * @param {Element|Object} elem An element or a document + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var doc = node ? node.ownerDocument || node : preferredDoc, + parent = doc.defaultView; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + + // Support tests + documentIsHTML = !isXML( doc ); + + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent.attachEvent && parent !== parent.top ) { + parent.attachEvent( "onbeforeunload", function() { + setDocument(); + }); + } + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Check if getElementsByClassName can be trusted + support.getElementsByClassName = assert(function( div ) { + div.innerHTML = "
    "; + + // Support: Safari<4 + // Catch class over-caching + div.firstChild.className = "i"; + // Support: Opera<10 + // Catch gEBCN failure to find non-leading classes + return div.getElementsByClassName("i").length === 2; + }); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== strundefined && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== strundefined ) { + return context.getElementsByTagName( tag ); + } + } : + function( tag, context ) { + var elem, + tmp = [], + i = 0, + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + div.innerHTML = ""; + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + }); + + assert(function( div ) { + + // Support: Opera 10-12/IE8 + // ^= $= *= and empty values + // Should not select anything + // Support: Windows 8 Native Apps + // The type attribute is restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "t", "" ); + + if ( div.querySelectorAll("[t^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = docElem.compareDocumentPosition ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b ); + + if ( compare ) { + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } + + // Not directly comparable, sort on existence of method + return a.compareDocumentPosition ? -1 : 1; + } : + function( a, b ) { + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + + // Parentless nodes are either documents or disconnected + } else if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch(e) {} + } + + return Sizzle( expr, document, null, [elem] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val === undefined ? + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null : + val; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + for ( ; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (see #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[5] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] && match[4] !== undefined ) { + match[2] = match[4]; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf.call( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), + // not comment, processing instructions, or others + // Thanks to Diego Perini for the nodeName shortcut + // Greater than "@" means alpha characters (specifically not starting with "#" or "?") + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // use getAttribute instead to test this case + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +function tokenize( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( tokens = [] ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +} + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var data, cache, outerCache, + dirkey = dirruns + " " + doneName; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) { + if ( (data = cache[1]) === true || data === cachedruns ) { + return data === true; + } + } else { + cache = outerCache[ dir ] = [ dirkey ]; + cache[1] = matcher( elem, context, xml ) || cachedruns; + if ( cache[1] === true ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf.call( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + // A counter to specify which element is currently being matched + var matcherCachedRuns = 0, + bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, expandContext ) { + var elem, j, matcher, + setMatched = [], + matchedCount = 0, + i = "0", + unmatched = seed && [], + outermost = expandContext != null, + contextBackup = outermostContext, + // We must always have either seed elements or context + elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1); + + if ( outermost ) { + outermostContext = context !== document && context; + cachedruns = matcherCachedRuns; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + for ( ; (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + cachedruns = ++matcherCachedRuns; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !group ) { + group = tokenize( selector ); + } + i = group.length; + while ( i-- ) { + cached = matcherFromTokens( group[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + } + return cached; +}; + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function select( selector, context, results, seed ) { + var i, tokens, token, type, find, + match = tokenize( selector ); + + if ( !seed ) { + // Try to minimize operations if there is only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + } + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && context.parentNode || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + } + + // Compile and execute a filtering function + // Provide `match` to avoid retokenization if we modified the selector above + compile( selector, match )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) + ); + return results; +} + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome<14 +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + elem[ name ] === true ? name.toLowerCase() : null; + } + }); +} + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + +})( window ); +// String to Object options format cache +var optionsCache = {}; + +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // Flag to know if list is currently firing + firing, + // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // First callback to fire (used internally by add and fireWith) + firingStart, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); + } + } else if ( memory ) { + list = []; + } else { + self.disable(); + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var action = tuple[ 0 ], + fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = core_slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value; + if( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } + } + + // if we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +}); +jQuery.support = (function( support ) { + + var all, a, input, select, fragment, opt, eventName, isSupported, i, + div = document.createElement("div"); + + // Setup + div.setAttribute( "className", "t" ); + div.innerHTML = "
    a"; + + // Finish early in limited (non-browser) environments + all = div.getElementsByTagName("*") || []; + a = div.getElementsByTagName("a")[ 0 ]; + if ( !a || !a.style || !all.length ) { + return support; + } + + // First batch of tests + select = document.createElement("select"); + opt = select.appendChild( document.createElement("option") ); + input = div.getElementsByTagName("input")[ 0 ]; + + a.style.cssText = "top:1px;float:left;opacity:.5"; + + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + support.getSetAttribute = div.className !== "t"; + + // IE strips leading whitespace when .innerHTML is used + support.leadingWhitespace = div.firstChild.nodeType === 3; + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + support.tbody = !div.getElementsByTagName("tbody").length; + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + support.htmlSerialize = !!div.getElementsByTagName("link").length; + + // Get the style information from getAttribute + // (IE uses .cssText instead) + support.style = /top/.test( a.getAttribute("style") ); + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + support.hrefNormalized = a.getAttribute("href") === "/a"; + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + support.opacity = /^0.5/.test( a.style.opacity ); + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + support.cssFloat = !!a.style.cssFloat; + + // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere) + support.checkOn = !!input.value; + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + support.optSelected = opt.selected; + + // Tests for enctype support on a form (#6743) + support.enctype = !!document.createElement("form").enctype; + + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>"; + + // Will be defined later + support.inlineBlockNeedsLayout = false; + support.shrinkWrapBlocks = false; + support.pixelPosition = false; + support.deleteExpando = true; + support.noCloneEvent = true; + support.reliableMarginRight = true; + support.boxSizingReliable = true; + + // Make sure checked status is properly cloned + input.checked = true; + support.noCloneChecked = input.cloneNode( true ).checked; + + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as disabled) + select.disabled = true; + support.optDisabled = !opt.disabled; + + // Support: IE<9 + try { + delete div.test; + } catch( e ) { + support.deleteExpando = false; + } + + // Check if we can trust getAttribute("value") + input = document.createElement("input"); + input.setAttribute( "value", "" ); + support.input = input.getAttribute( "value" ) === ""; + + // Check if an input maintains its value after becoming a radio + input.value = "t"; + input.setAttribute( "type", "radio" ); + support.radioValue = input.value === "t"; + + // #11217 - WebKit loses check when the name is after the checked attribute + input.setAttribute( "checked", "t" ); + input.setAttribute( "name", "t" ); + + fragment = document.createDocumentFragment(); + fragment.appendChild( input ); + + // Check if a disconnected checkbox will retain its checked + // value of true after appended to the DOM (IE6/7) + support.appendChecked = input.checked; + + // WebKit doesn't clone checked state correctly in fragments + support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<9 + // Opera does not clone events (and typeof div.attachEvent === undefined). + // IE9-10 clones events bound via attachEvent, but they don't trigger with .click() + if ( div.attachEvent ) { + div.attachEvent( "onclick", function() { + support.noCloneEvent = false; + }); + + div.cloneNode( true ).click(); + } + + // Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event) + // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) + for ( i in { submit: true, change: true, focusin: true }) { + div.setAttribute( eventName = "on" + i, "t" ); + + support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false; + } + + div.style.backgroundClip = "content-box"; + div.cloneNode( true ).style.backgroundClip = ""; + support.clearCloneStyle = div.style.backgroundClip === "content-box"; + + // Support: IE<9 + // Iteration over object's inherited properties before its own. + for ( i in jQuery( support ) ) { + break; + } + support.ownLast = i !== "0"; + + // Run tests that need a body at doc ready + jQuery(function() { + var container, marginDiv, tds, + divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;", + body = document.getElementsByTagName("body")[0]; + + if ( !body ) { + // Return for frameset docs that don't have a body + return; + } + + container = document.createElement("div"); + container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px"; + + body.appendChild( container ).appendChild( div ); + + // Support: IE8 + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + div.innerHTML = "
    t
    "; + tds = div.getElementsByTagName("td"); + tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none"; + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + + // Support: IE8 + // Check if empty table cells still have offsetWidth/Height + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + + // Check box-sizing and margin behavior. + div.innerHTML = ""; + div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;"; + + // Workaround failing boxSizing test due to offsetWidth returning wrong value + // with some non-1 values of body zoom, ticket #13543 + jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() { + support.boxSizing = div.offsetWidth === 4; + }); + + // Use window.getComputedStyle because jsdom on node.js will break without it. + if ( window.getComputedStyle ) { + support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%"; + support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px"; + + // Check if div with explicit width and no margin-right incorrectly + // gets computed margin-right based on width of container. (#3333) + // Fails in WebKit before Feb 2011 nightlies + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + marginDiv = div.appendChild( document.createElement("div") ); + marginDiv.style.cssText = div.style.cssText = divReset; + marginDiv.style.marginRight = marginDiv.style.width = "0"; + div.style.width = "1px"; + + support.reliableMarginRight = + !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight ); + } + + if ( typeof div.style.zoom !== core_strundefined ) { + // Support: IE<8 + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + div.innerHTML = ""; + div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1"; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); + + // Support: IE6 + // Check if elements with layout shrink-wrap their children + div.style.display = "block"; + div.innerHTML = "
    "; + div.firstChild.style.width = "5px"; + support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); + + if ( support.inlineBlockNeedsLayout ) { + // Prevent IE 6 from affecting layout for positioned elements #11048 + // Prevent IE from shrinking the body in IE 7 mode #12869 + // Support: IE<8 + body.style.zoom = 1; + } + } + + body.removeChild( container ); + + // Null elements to avoid leaks in IE + container = div = tds = marginDiv = null; + }); + + // Null elements to avoid leaks in IE + all = select = fragment = opt = a = input = null; + + return support; +})({}); + +var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, + rmultiDash = /([A-Z])/g; + +function internalData( elem, name, data, pvt /* Internal Use Only */ ){ + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var ret, thisCache, + internalKey = jQuery.expando, + + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, + + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, + + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; + + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { + return; + } + + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++; + } else { + id = internalKey; + } + } + + if ( !cache[ id ] ) { + // Avoid exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify + cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" || typeof name === "function" ) { + if ( pvt ) { + cache[ id ] = jQuery.extend( cache[ id ], name ); + } else { + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); + } + } + + thisCache = cache[ id ]; + + // jQuery data() is stored in a separate object inside the object's internal data + // cache in order to avoid key collisions between internal data and user-defined + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; + } + + thisCache = thisCache.data; + } + + if ( data !== undefined ) { + thisCache[ jQuery.camelCase( name ) ] = data; + } + + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( typeof name === "string" ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; +} + +function internalRemoveData( elem, name, pvt ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var thisCache, i, + isNode = elem.nodeType, + + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + id = isNode ? elem[ jQuery.expando ] : jQuery.expando; + + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + + thisCache = pvt ? cache[ id ] : cache[ id ].data; + + if ( thisCache ) { + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split(" "); + } + } + } else { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = name.concat( jQuery.map( name, jQuery.camelCase ) ); + } + + i = name.length; + while ( i-- ) { + delete thisCache[ name[i] ]; + } + + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) { + return; + } + } + } + + // See jQuery.data for more information + if ( !pvt ) { + delete cache[ id ].data; + + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !isEmptyDataObject( cache[ id ] ) ) { + return; + } + } + + // Destroy the cache + if ( isNode ) { + jQuery.cleanData( [ elem ], true ); + + // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) + /* jshint eqeqeq: false */ + } else if ( jQuery.support.deleteExpando || cache != cache.window ) { + /* jshint eqeqeq: true */ + delete cache[ id ]; + + // When all else fails, null + } else { + cache[ id ] = null; + } +} + +jQuery.extend({ + cache: {}, + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "applet": true, + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" + }, + + hasData: function( elem ) { + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + return !!elem && !isEmptyDataObject( elem ); + }, + + data: function( elem, name, data ) { + return internalData( elem, name, data ); + }, + + removeData: function( elem, name ) { + return internalRemoveData( elem, name ); + }, + + // For internal use only. + _data: function( elem, name, data ) { + return internalData( elem, name, data, true ); + }, + + _removeData: function( elem, name ) { + return internalRemoveData( elem, name, true ); + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + // Do not set data on non-element because it will not be cleared (#8335). + if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) { + return false; + } + + var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ]; + + // nodes accept data unless otherwise specified; rejection can be conditional + return !noData || noData !== true && elem.getAttribute("classid") === noData; + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var attrs, name, + data = null, + i = 0, + elem = this[0]; + + // Special expections of .data basically thwart jQuery.access, + // so implement the relevant behavior ourselves + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = jQuery.data( elem ); + + if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { + attrs = elem.attributes; + for ( ; i < attrs.length; i++ ) { + name = attrs[i].name; + + if ( name.indexOf("data-") === 0 ) { + name = jQuery.camelCase( name.slice(5) ); + + dataAttr( elem, name, data[ name ] ); + } + } + jQuery._data( elem, "parsedAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); + } + + return arguments.length > 1 ? + + // Sets one value + this.each(function() { + jQuery.data( this, key, value ); + }) : + + // Gets one value + // Try to fetch any internally stored data first + elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null; + }, + + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); + +function dataAttr( elem, key, data ) { + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); + + } else { + data = undefined; + } + } + + return data; +} + +// checks a cache object for emptiness +function isEmptyDataObject( obj ) { + var name; + for ( name in obj ) { + + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } + if ( name !== "toJSON" ) { + return false; + } + } + + return true; +} +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = jQuery._data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray(data) ) { + queue = jQuery._data( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // not intended for public consumption - generates a queueHooks object, or returns the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return jQuery._data( elem, key ) || jQuery._data( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + jQuery._removeData( elem, type + "queue" ); + jQuery._removeData( elem, key ); + }) + }); + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); + } + + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + // ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; + + return this.queue( type, function( next, hooks ) { + var timeout = setTimeout( next, time ); + hooks.stop = function() { + clearTimeout( timeout ); + }; + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while( i-- ) { + tmp = jQuery._data( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +}); +var nodeHook, boolHook, + rclass = /[\t\r\n\f]/g, + rreturn = /\r/g, + rfocusable = /^(?:input|select|textarea|button|object)$/i, + rclickable = /^(?:a|area)$/i, + ruseDefault = /^(?:checked|selected)$/i, + getSetAttribute = jQuery.support.getSetAttribute, + getSetInput = jQuery.support.input; + +jQuery.fn.extend({ + attr: function( name, value ) { + return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); + }, + + removeAttr: function( name ) { + return this.each(function() { + jQuery.removeAttr( this, name ); + }); + }, + + prop: function( name, value ) { + return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); + }, + + removeProp: function( name ) { + name = jQuery.propFix[ name ] || name; + return this.each(function() { + // try/catch handles cases where IE balks (such as removing a property on window) + try { + this[ name ] = undefined; + delete this[ name ]; + } catch( e ) {} + }); + }, + + addClass: function( value ) { + var classes, elem, cur, clazz, j, + i = 0, + len = this.length, + proceed = typeof value === "string" && value; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).addClass( value.call( this, j, this.className ) ); + }); + } + + if ( proceed ) { + // The disjunction here is for better compressibility (see removeClass) + classes = ( value || "" ).match( core_rnotwhite ) || []; + + for ( ; i < len; i++ ) { + elem = this[ i ]; + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + " " + ); + + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + if ( cur.indexOf( " " + clazz + " " ) < 0 ) { + cur += clazz + " "; + } + } + elem.className = jQuery.trim( cur ); + + } + } + } + + return this; + }, + + removeClass: function( value ) { + var classes, elem, cur, clazz, j, + i = 0, + len = this.length, + proceed = arguments.length === 0 || typeof value === "string" && value; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).removeClass( value.call( this, j, this.className ) ); + }); + } + if ( proceed ) { + classes = ( value || "" ).match( core_rnotwhite ) || []; + + for ( ; i < len; i++ ) { + elem = this[ i ]; + // This expression is here for better compressibility (see addClass) + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + "" + ); + + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + // Remove *all* instances + while ( cur.indexOf( " " + clazz + " " ) >= 0 ) { + cur = cur.replace( " " + clazz + " ", " " ); + } + } + elem.className = value ? jQuery.trim( cur ) : ""; + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value; + + if ( typeof stateVal === "boolean" && type === "string" ) { + return stateVal ? this.addClass( value ) : this.removeClass( value ); + } + + if ( jQuery.isFunction( value ) ) { + return this.each(function( i ) { + jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); + }); + } + + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, + i = 0, + self = jQuery( this ), + classNames = value.match( core_rnotwhite ) || []; + + while ( (className = classNames[ i++ ]) ) { + // check each className given, space separated list + if ( self.hasClass( className ) ) { + self.removeClass( className ); + } else { + self.addClass( className ); + } + } + + // Toggle whole class name + } else if ( type === core_strundefined || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery._data( this, "__className__", this.className ); + } + + // If the element has a class name or if we're passed "false", + // then remove the whole classname (if there was one, the above saved it). + // Otherwise bring back whatever was previously saved (if anything), + // falling back to the empty string if nothing was stored. + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + } + }); + }, + + hasClass: function( selector ) { + var className = " " + selector + " ", + i = 0, + l = this.length; + for ( ; i < l; i++ ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) { + return true; + } + } + + return false; + }, + + val: function( value ) { + var ret, hooks, isFunction, + elem = this[0]; + + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; + + if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { + return ret; + } + + ret = elem.value; + + return typeof ret === "string" ? + // handle most common string cases + ret.replace(rreturn, "") : + // handle cases where value is null/undef or number + ret == null ? "" : ret; + } + + return; + } + + isFunction = jQuery.isFunction( value ); + + return this.each(function( i ) { + var val; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( isFunction ) { + val = value.call( this, i, jQuery( this ).val() ); + } else { + val = value; + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { + val += ""; + } else if ( jQuery.isArray( val ) ) { + val = jQuery.map(val, function ( value ) { + return value == null ? "" : value + ""; + }); + } + + hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; + + // If set returns undefined, fall back to normal setting + if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; + } + }); + } +}); + +jQuery.extend({ + valHooks: { + option: { + get: function( elem ) { + // Use proper attribute retrieval(#6932, #12072) + var val = jQuery.find.attr( elem, "value" ); + return val != null ? + val : + elem.text; + } + }, + select: { + get: function( elem ) { + var value, option, + options = elem.options, + index = elem.selectedIndex, + one = elem.type === "select-one" || index < 0, + values = one ? null : [], + max = one ? index + 1 : options.length, + i = index < 0 ? + max : + one ? index : 0; + + // Loop through all the selected options + for ( ; i < max; i++ ) { + option = options[ i ]; + + // oldIE doesn't update selected after form reset (#2551) + if ( ( option.selected || i === index ) && + // Don't return options that are disabled or in a disabled optgroup + ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && + ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { + + // Get the specific value for the option + value = jQuery( option ).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + }, + + set: function( elem, value ) { + var optionSet, option, + options = elem.options, + values = jQuery.makeArray( value ), + i = options.length; + + while ( i-- ) { + option = options[ i ]; + if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) { + optionSet = true; + } + } + + // force browsers to behave consistently when non-matching value is set + if ( !optionSet ) { + elem.selectedIndex = -1; + } + return values; + } + } + }, + + attr: function( elem, name, value ) { + var hooks, ret, + nType = elem.nodeType; + + // don't get/set attributes on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === core_strundefined ) { + return jQuery.prop( elem, name, value ); + } + + // All attributes are lowercase + // Grab necessary hook if one is defined + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + name = name.toLowerCase(); + hooks = jQuery.attrHooks[ name ] || + ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook ); + } + + if ( value !== undefined ) { + + if ( value === null ) { + jQuery.removeAttr( elem, name ); + + } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; + + } else { + elem.setAttribute( name, value + "" ); + return value; + } + + } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { + return ret; + + } else { + ret = jQuery.find.attr( elem, name ); + + // Non-existent attributes return null, we normalize to undefined + return ret == null ? + undefined : + ret; + } + }, + + removeAttr: function( elem, value ) { + var name, propName, + i = 0, + attrNames = value && value.match( core_rnotwhite ); + + if ( attrNames && elem.nodeType === 1 ) { + while ( (name = attrNames[i++]) ) { + propName = jQuery.propFix[ name ] || name; + + // Boolean attributes get special treatment (#10870) + if ( jQuery.expr.match.bool.test( name ) ) { + // Set corresponding property to false + if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + elem[ propName ] = false; + // Support: IE<9 + // Also clear defaultChecked/defaultSelected (if appropriate) + } else { + elem[ jQuery.camelCase( "default-" + name ) ] = + elem[ propName ] = false; + } + + // See #9699 for explanation of this approach (setting first, then removal) + } else { + jQuery.attr( elem, name, "" ); + } + + elem.removeAttribute( getSetAttribute ? name : propName ); + } + } + }, + + attrHooks: { + type: { + set: function( elem, value ) { + if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + // Setting the type on a radio button after the value resets the value in IE6-9 + // Reset value to default in case type is set after value during creation + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; + } + } + } + }, + + propFix: { + "for": "htmlFor", + "class": "className" + }, + + prop: function( elem, name, value ) { + var ret, hooks, notxml, + nType = elem.nodeType; + + // don't get/set properties on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + + if ( notxml ) { + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } + + if ( value !== undefined ) { + return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? + ret : + ( elem[ name ] = value ); + + } else { + return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? + ret : + elem[ name ]; + } + }, + + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // Use proper attribute retrieval(#12072) + var tabindex = jQuery.find.attr( elem, "tabindex" ); + + return tabindex ? + parseInt( tabindex, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + -1; + } + } + } +}); + +// Hooks for boolean attributes +boolHook = { + set: function( elem, value, name ) { + if ( value === false ) { + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + // IE<8 needs the *property* name + elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name ); + + // Use defaultChecked and defaultSelected for oldIE + } else { + elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true; + } + + return name; + } +}; +jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) { + var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr; + + jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ? + function( elem, name, isXML ) { + var fn = jQuery.expr.attrHandle[ name ], + ret = isXML ? + undefined : + /* jshint eqeqeq: false */ + (jQuery.expr.attrHandle[ name ] = undefined) != + getter( elem, name, isXML ) ? + + name.toLowerCase() : + null; + jQuery.expr.attrHandle[ name ] = fn; + return ret; + } : + function( elem, name, isXML ) { + return isXML ? + undefined : + elem[ jQuery.camelCase( "default-" + name ) ] ? + name.toLowerCase() : + null; + }; +}); + +// fix oldIE attroperties +if ( !getSetInput || !getSetAttribute ) { + jQuery.attrHooks.value = { + set: function( elem, value, name ) { + if ( jQuery.nodeName( elem, "input" ) ) { + // Does not return so that setAttribute is also used + elem.defaultValue = value; + } else { + // Use nodeHook if defined (#1954); otherwise setAttribute is fine + return nodeHook && nodeHook.set( elem, value, name ); + } + } + }; +} + +// IE6/7 do not support getting/setting some attributes with get/setAttribute +if ( !getSetAttribute ) { + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = { + set: function( elem, value, name ) { + // Set the existing or create a new attribute node + var ret = elem.getAttributeNode( name ); + if ( !ret ) { + elem.setAttributeNode( + (ret = elem.ownerDocument.createAttribute( name )) + ); + } + + ret.value = value += ""; + + // Break association with cloned elements by also using setAttribute (#9646) + return name === "value" || value === elem.getAttribute( name ) ? + value : + undefined; + } + }; + jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords = + // Some attributes are constructed with empty-string values when not defined + function( elem, name, isXML ) { + var ret; + return isXML ? + undefined : + (ret = elem.getAttributeNode( name )) && ret.value !== "" ? + ret.value : + null; + }; + jQuery.valHooks.button = { + get: function( elem, name ) { + var ret = elem.getAttributeNode( name ); + return ret && ret.specified ? + ret.value : + undefined; + }, + set: nodeHook.set + }; + + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + set: function( elem, value, name ) { + nodeHook.set( elem, value === "" ? false : value, name ); + } + }; + + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) + // This is for removals + jQuery.each([ "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = { + set: function( elem, value ) { + if ( value === "" ) { + elem.setAttribute( name, "auto" ); + return value; + } + } + }; + }); +} + + +// Some attributes require a special call on IE +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !jQuery.support.hrefNormalized ) { + // href/src property should get the full normalized URL (#10299/#12915) + jQuery.each([ "href", "src" ], function( i, name ) { + jQuery.propHooks[ name ] = { + get: function( elem ) { + return elem.getAttribute( name, 4 ); + } + }; + }); +} + +if ( !jQuery.support.style ) { + jQuery.attrHooks.style = { + get: function( elem ) { + // Return undefined in the case of empty string + // Note: IE uppercases css property names, but if we were to .toLowerCase() + // .cssText, that would destroy case senstitivity in URL's, like in "background" + return elem.style.cssText || undefined; + }, + set: function( elem, value ) { + return ( elem.style.cssText = value + "" ); + } + }; +} + +// Safari mis-reports the default selected property of an option +// Accessing the parent's selectedIndex property fixes it +if ( !jQuery.support.optSelected ) { + jQuery.propHooks.selected = { + get: function( elem ) { + var parent = elem.parentNode; + + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + return null; + } + }; +} + +jQuery.each([ + "tabIndex", + "readOnly", + "maxLength", + "cellSpacing", + "cellPadding", + "rowSpan", + "colSpan", + "useMap", + "frameBorder", + "contentEditable" +], function() { + jQuery.propFix[ this.toLowerCase() ] = this; +}); + +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} + +// Radios and checkboxes getter/setter +jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + set: function( elem, value ) { + if ( jQuery.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); + } + } + }; + if ( !jQuery.support.checkOn ) { + jQuery.valHooks[ this ].get = function( elem ) { + // Support: Webkit + // "" is returned instead of "on" if a value isn't specified + return elem.getAttribute("value") === null ? "on" : elem.value; + }; + } +}); +var rformElems = /^(?:input|select|textarea)$/i, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + var tmp, events, t, handleObjIn, + special, eventHandle, handleObj, + handlers, type, namespaces, origType, + elemData = jQuery._data( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ? + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : + undefined; + }; + // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + eventHandle.elem = elem; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener/attachEvent if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + var j, handleObj, tmp, + origCount, t, events, + special, handlers, type, + namespaces, origType, + elemData = jQuery.hasData( elem ) && jQuery._data( elem ); + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery._removeData( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + var handle, ontype, cur, + bubbleType, special, tmp, i, + eventPath = [ elem || document ], + type = core_hasOwn.call( event, "type" ) ? event.type : event, + namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf(".") >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) { + event.preventDefault(); + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + try { + elem[ type ](); + } catch ( e ) { + // IE<9 dies on focus/blur to hidden element (#1486,#12518) + // only reproducible on winXP IE8 native, not IE9 in IE8 mode + } + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, ret, handleObj, matched, j, + handlerQueue = [], + args = core_slice.call( arguments ), + handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var sel, handleObj, matches, i, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + /* jshint eqeqeq: false */ + for ( ; cur != this; cur = cur.parentNode || this ) { + /* jshint eqeqeq: true */ + + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: IE<9 + // Fix target property (#1925) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; + } + + // Support: Chrome 23+, Safari? + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // Support: IE<9 + // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) + event.metaKey = !!event.metaKey; + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var body, eventDoc, doc, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + try { + this.focus(); + return false; + } catch ( e ) { + // Support: IE<9 + // If we error on focus to hidden element (#1486, #12518), + // let .trigger() run the handlers + } + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Even when returnValue equals to undefined Firefox will still show alert + if ( event.result !== undefined ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + var name = "on" + type; + + if ( elem.detachEvent ) { + + // #8545, #7054, preventing memory leaks for custom events in IE6-8 + // detachEvent needed property on element, by name of that event, to properly expose it to GC + if ( typeof elem[ name ] === core_strundefined ) { + elem[ name ] = null; + } + + elem.detachEvent( name, handle ); + } + }; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + if ( !e ) { + return; + } + + // If preventDefault exists, run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + + // Support: IE + // Otherwise set the returnValue property of the original event to false + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + if ( !e ) { + return; + } + // If stopPropagation exists, run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + + // Support: IE + // Set the cancelBubble property of the original event to true + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// IE submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !jQuery._data( form, "submitBubbles" ) ) { + jQuery.event.add( form, "submit._submit", function( event ) { + event._submit_bubble = true; + }); + jQuery._data( form, "submitBubbles", true ); + } + }); + // return undefined since we don't need an event listener + }, + + postDispatch: function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( event._submit_bubble ) { + delete event._submit_bubble; + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + } + }, + + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} + +// IE change delegation and checkbox/radio fix +if ( !jQuery.support.changeBubbles ) { + + jQuery.event.special.change = { + + setup: function() { + + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; + } + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; + } + // Allow triggered, simulated change events (#11500) + jQuery.event.simulate( "change", this, event, true ); + }); + } + return false; + } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; + + if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + jQuery._data( elem, "changeBubbles", true ); + } + }); + }, + + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); + + return !rformElems.test( this.nodeName ); + } + }; +} + +// Create "bubbling" focus and blur events +if ( !jQuery.support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler while someone wants focusin/focusout + var attaches = 0, + handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + if ( attaches++ === 0 ) { + document.addEventListener( orig, handler, true ); + } + }, + teardown: function() { + if ( --attaches === 0 ) { + document.removeEventListener( orig, handler, true ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var type, origFn; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +}); +var isSimple = /^.[^:#\[\.,]*$/, + rparentsprev = /^(?:parents|prev(?:Until|All))/, + rneedsContext = jQuery.expr.match.needsContext, + // methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend({ + find: function( selector ) { + var i, + ret = [], + self = this, + len = self.length; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + + has: function( target ) { + var i, + targets = jQuery( target, this ), + len = targets.length; + + return this.filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + not: function( selector ) { + return this.pushStack( winnow(this, selector || [], true) ); + }, + + filter: function( selector ) { + return this.pushStack( winnow(this, selector || [], false) ); + }, + + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + ret = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + cur = ret.push( cur ); + break; + } + } + } + + return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; + } + + // index in selector + if ( typeof elem === "string" ) { + return jQuery.inArray( this[0], jQuery( elem ) ); + } + + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[0] : elem, this ); + }, + + add: function( selector, context ) { + var set = typeof selector === "string" ? + jQuery( selector, context ) : + jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( jQuery.unique(all) ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); + } +}); + +function sibling( cur, dir ) { + do { + cur = cur[ dir ]; + } while ( cur && cur.nodeType !== 1 ); + + return cur; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var ret = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + ret = jQuery.filter( selector, ret ); + } + + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + ret = jQuery.unique( ret ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + ret = ret.reverse(); + } + } + + return this.pushStack( ret ); + }; +}); + +jQuery.extend({ + filter: function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); + }, + + dir: function( elem, dir, until ) { + var matched = [], + cur = elem[ dir ]; + + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); + } + cur = cur[dir]; + } + return matched; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + r.push( n ); + } + } + + return r; + } +}); + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + }); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( isSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; + }); +} +function createSafeFragment( document ) { + var list = nodeNames.split( "|" ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( list.length ) { + safeFrag.createElement( + list.pop() + ); + } + } + return safeFrag; +} + +var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", + rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, + rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), + rleadingWhitespace = /^\s+/, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, + rtagName = /<([\w:]+)/, + rtbody = /
    ", "
    " ], + tr: [ 2, "", "
    " ], + col: [ 2, "", "
    " ], + td: [ 3, "", "
    " ], + + // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, + // unless wrapped in a div with non-breaking characters in front of it. + _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
    ", "
    " ] + }, + safeFragment = createSafeFragment( document ), + fragmentDiv = safeFragment.appendChild( document.createElement("div") ); + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +jQuery.fn.extend({ + text: function( value ) { + return jQuery.access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); + }, null, value, arguments.length ); + }, + + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + // keepData is for internal use only--do not document + remove: function( selector, keepData ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + } + + // Remove any remaining nodes + while ( elem.firstChild ) { + elem.removeChild( elem.firstChild ); + } + + // If this is a select, ensure that it displays empty (#12336) + // Support: IE<9 + if ( elem.options && jQuery.nodeName( elem, "select" ) ) { + elem.options.length = 0; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function () { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return jQuery.access( this, function( value ) { + var elem = this[0] || {}, + i = 0, + l = this.length; + + if ( value === undefined ) { + return elem.nodeType === 1 ? + elem.innerHTML.replace( rinlinejQuery, "" ) : + undefined; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + ( jQuery.support.htmlSerialize || !rnoshimcache.test( value ) ) && + ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && + !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) { + + value = value.replace( rxhtmlTag, "<$1>" ); + + try { + for (; i < l; i++ ) { + // Remove element nodes and prevent memory leaks + elem = this[i] || {}; + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch(e) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var + // Snapshot the DOM in case .domManip sweeps something relevant into its fragment + args = jQuery.map( this, function( elem ) { + return [ elem.nextSibling, elem.parentNode ]; + }), + i = 0; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + var next = args[ i++ ], + parent = args[ i++ ]; + + if ( parent ) { + // Don't use the snapshot next if it has moved (#13810) + if ( next && next.parentNode !== parent ) { + next = this.nextSibling; + } + jQuery( this ).remove(); + parent.insertBefore( elem, next ); + } + // Allow new content to include elements from the context set + }, true ); + + // Force removal if there was no new content (e.g., from empty arguments) + return i ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback, allowIntersection ) { + + // Flatten any nested arrays + args = core_concat.apply( [], args ); + + var first, node, hasScripts, + scripts, doc, fragment, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[0], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[0] = value.call( this, index, self.html() ); + } + self.domManip( args, callback, allowIntersection ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[i], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Hope ajax is available... + jQuery._evalUrl( node.src ); + } else { + jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); + } + } + } + } + + // Fix #11809: Avoid leaking memory + fragment = first = null; + } + } + + return this; + } +}); + +// Support: IE<8 +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + if ( match ) { + elem.type = match[1]; + } else { + elem.removeAttribute("type"); + } + return elem; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var elem, + i = 0; + for ( ; (elem = elems[i]) != null; i++ ) { + jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) ); + } +} + +function cloneCopyEvent( src, dest ) { + + if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { + return; + } + + var type, i, l, + oldData = jQuery._data( src ), + curData = jQuery._data( dest, oldData ), + events = oldData.events; + + if ( events ) { + delete curData.handle; + curData.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + + // make the cloned public data object a copy from the original + if ( curData.data ) { + curData.data = jQuery.extend( {}, curData.data ); + } +} + +function fixCloneNodeIssues( src, dest ) { + var nodeName, e, data; + + // We do not need to do anything for non-Elements + if ( dest.nodeType !== 1 ) { + return; + } + + nodeName = dest.nodeName.toLowerCase(); + + // IE6-8 copies events bound via attachEvent when using cloneNode. + if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) { + data = jQuery._data( dest ); + + for ( e in data.events ) { + jQuery.removeEvent( dest, e, data.handle ); + } + + // Event data gets referenced instead of copied if the expando gets copied too + dest.removeAttribute( jQuery.expando ); + } + + // IE blanks contents when cloning scripts, and tries to evaluate newly-set text + if ( nodeName === "script" && dest.text !== src.text ) { + disableScript( dest ).text = src.text; + restoreScript( dest ); + + // IE6-10 improperly clones children of object elements using classid. + // IE10 throws NoModificationAllowedError if parent is null, #12132. + } else if ( nodeName === "object" ) { + if ( dest.parentNode ) { + dest.outerHTML = src.outerHTML; + } + + // This path appears unavoidable for IE9. When cloning an object + // element in IE9, the outerHTML strategy above is not sufficient. + // If the src has innerHTML and the destination does not, + // copy the src.innerHTML into the dest.innerHTML. #10324 + if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) { + dest.innerHTML = src.innerHTML; + } + + } else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) { + // IE6-8 fails to persist the checked state of a cloned checkbox + // or radio button. Worse, IE6-7 fail to give the cloned element + // a checked appearance if the defaultChecked value isn't also set + + dest.defaultChecked = dest.checked = src.checked; + + // IE6-7 get confused and end up setting the value of a cloned + // checkbox/radio button to an empty string instead of "on" + if ( dest.value !== src.value ) { + dest.value = src.value; + } + + // IE6-8 fails to return the selected option to the default selected + // state when cloning options + } else if ( nodeName === "option" ) { + dest.defaultSelected = dest.selected = src.defaultSelected; + + // IE6-8 fails to set the defaultValue to the correct value when + // cloning other types of input fields + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + i = 0, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone(true); + jQuery( insert[i] )[ original ]( elems ); + + // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() + core_push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + +function getAll( context, tag ) { + var elems, elem, + i = 0, + found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) : + undefined; + + if ( !found ) { + for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) { + if ( !tag || jQuery.nodeName( elem, tag ) ) { + found.push( elem ); + } else { + jQuery.merge( found, getAll( elem, tag ) ); + } + } + } + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], found ) : + found; +} + +// Used in buildFragment, fixes the defaultChecked property +function fixDefaultChecked( elem ) { + if ( manipulation_rcheckableType.test( elem.type ) ) { + elem.defaultChecked = elem.checked; + } +} + +jQuery.extend({ + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var destElements, node, clone, i, srcElements, + inPage = jQuery.contains( elem.ownerDocument, elem ); + + if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { + clone = elem.cloneNode( true ); + + // IE<=8 does not properly clone detached, unknown element nodes + } else { + fragmentDiv.innerHTML = elem.outerHTML; + fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); + } + + if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) && + (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + // Fix all IE cloning issues + for ( i = 0; (node = srcElements[i]) != null; ++i ) { + // Ensure that the destination node is not null; Fixes #9587 + if ( destElements[i] ) { + fixCloneNodeIssues( node, destElements[i] ); + } + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0; (node = srcElements[i]) != null; i++ ) { + cloneCopyEvent( node, destElements[i] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + destElements = srcElements = node = null; + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var j, elem, contains, + tmp, tag, tbody, wrap, + l = elems.length, + + // Ensure a safe fragment + safe = createSafeFragment( context ), + + nodes = [], + i = 0; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || safe.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + + tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2]; + + // Descend through wrappers to the right content + j = wrap[0]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Manually add leading whitespace removed by IE + if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) { + nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) ); + } + + // Remove IE's autoinserted
    , *may* have spurious + elem = tag === "table" && !rtbody.test( elem ) ? + tmp.firstChild : + + // String was a bare or + wrap[1] === "
    " && !rtbody.test( elem ) ? + tmp : + 0; + + j = elem && elem.childNodes.length; + while ( j-- ) { + if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) { + elem.removeChild( tbody ); + } + } + } + + jQuery.merge( nodes, tmp.childNodes ); + + // Fix #12392 for WebKit and IE > 9 + tmp.textContent = ""; + + // Fix #12392 for oldIE + while ( tmp.firstChild ) { + tmp.removeChild( tmp.firstChild ); + } + + // Remember the top-level container for proper cleanup + tmp = safe.lastChild; + } + } + } + + // Fix #11356: Clear elements from fragment + if ( tmp ) { + safe.removeChild( tmp ); + } + + // Reset defaultChecked for any radios and checkboxes + // about to be appended to the DOM in IE 6/7 (#8060) + if ( !jQuery.support.appendChecked ) { + jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); + } + + i = 0; + while ( (elem = nodes[ i++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( safe.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + tmp = null; + + return safe; + }, + + cleanData: function( elems, /* internal */ acceptData ) { + var elem, type, id, data, + i = 0, + internalKey = jQuery.expando, + cache = jQuery.cache, + deleteExpando = jQuery.support.deleteExpando, + special = jQuery.event.special; + + for ( ; (elem = elems[i]) != null; i++ ) { + + if ( acceptData || jQuery.acceptData( elem ) ) { + + id = elem[ internalKey ]; + data = id && cache[ id ]; + + if ( data ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // Remove cache only if it was not already removed by jQuery.event.remove + if ( cache[ id ] ) { + + delete cache[ id ]; + + // IE does not allow us to delete expando properties from nodes, + // nor does it have a removeAttribute function on Document nodes; + // we must handle all of these cases + if ( deleteExpando ) { + delete elem[ internalKey ]; + + } else if ( typeof elem.removeAttribute !== core_strundefined ) { + elem.removeAttribute( internalKey ); + + } else { + elem[ internalKey ] = null; + } + + core_deletedIds.push( id ); + } + } + } + } + }, + + _evalUrl: function( url ) { + return jQuery.ajax({ + url: url, + type: "GET", + dataType: "script", + async: false, + global: false, + "throws": true + }); + } +}); +jQuery.fn.extend({ + wrapAll: function( html ) { + if ( jQuery.isFunction( html ) ) { + return this.each(function(i) { + jQuery(this).wrapAll( html.call(this, i) ); + }); + } + + if ( this[0] ) { + // The elements to wrap the target around + var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true); + + if ( this[0].parentNode ) { + wrap.insertBefore( this[0] ); + } + + wrap.map(function() { + var elem = this; + + while ( elem.firstChild && elem.firstChild.nodeType === 1 ) { + elem = elem.firstChild; + } + + return elem; + }).append( this ); + } + + return this; + }, + + wrapInner: function( html ) { + if ( jQuery.isFunction( html ) ) { + return this.each(function(i) { + jQuery(this).wrapInner( html.call(this, i) ); + }); + } + + return this.each(function() { + var self = jQuery( this ), + contents = self.contents(); + + if ( contents.length ) { + contents.wrapAll( html ); + + } else { + self.append( html ); + } + }); + }, + + wrap: function( html ) { + var isFunction = jQuery.isFunction( html ); + + return this.each(function(i) { + jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html ); + }); + }, + + unwrap: function() { + return this.parent().each(function() { + if ( !jQuery.nodeName( this, "body" ) ) { + jQuery( this ).replaceWith( this.childNodes ); + } + }).end(); + } +}); +var iframe, getStyles, curCSS, + ralpha = /alpha\([^)]*\)/i, + ropacity = /opacity\s*=\s*([^)]*)/, + rposition = /^(top|right|bottom|left)$/, + // swappable if display is none or starts with table except "table", "table-cell", or "table-caption" + // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display + rdisplayswap = /^(none|table(?!-c[ea]).+)/, + rmargin = /^margin/, + rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ), + rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ), + rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ), + elemdisplay = { BODY: "block" }, + + cssShow = { position: "absolute", visibility: "hidden", display: "block" }, + cssNormalTransform = { + letterSpacing: 0, + fontWeight: 400 + }, + + cssExpand = [ "Top", "Right", "Bottom", "Left" ], + cssPrefixes = [ "Webkit", "O", "Moz", "ms" ]; + +// return a css property mapped to a potentially vendor prefixed property +function vendorPropName( style, name ) { + + // shortcut for names that are not vendor prefixed + if ( name in style ) { + return name; + } + + // check for vendor prefixed names + var capName = name.charAt(0).toUpperCase() + name.slice(1), + origName = name, + i = cssPrefixes.length; + + while ( i-- ) { + name = cssPrefixes[ i ] + capName; + if ( name in style ) { + return name; + } + } + + return origName; +} + +function isHidden( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); +} + +function showHide( elements, show ) { + var display, elem, hidden, + values = [], + index = 0, + length = elements.length; + + for ( ; index < length; index++ ) { + elem = elements[ index ]; + if ( !elem.style ) { + continue; + } + + values[ index ] = jQuery._data( elem, "olddisplay" ); + display = elem.style.display; + if ( show ) { + // Reset the inline display of this element to learn if it is + // being hidden by cascaded rules or not + if ( !values[ index ] && display === "none" ) { + elem.style.display = ""; + } + + // Set elements which have been overridden with display: none + // in a stylesheet to whatever the default browser style is + // for such an element + if ( elem.style.display === "" && isHidden( elem ) ) { + values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) ); + } + } else { + + if ( !values[ index ] ) { + hidden = isHidden( elem ); + + if ( display && display !== "none" || !hidden ) { + jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) ); + } + } + } + } + + // Set the display of most of the elements in a second loop + // to avoid the constant reflow + for ( index = 0; index < length; index++ ) { + elem = elements[ index ]; + if ( !elem.style ) { + continue; + } + if ( !show || elem.style.display === "none" || elem.style.display === "" ) { + elem.style.display = show ? values[ index ] || "" : "none"; + } + } + + return elements; +} + +jQuery.fn.extend({ + css: function( name, value ) { + return jQuery.access( this, function( elem, name, value ) { + var len, styles, + map = {}, + i = 0; + + if ( jQuery.isArray( name ) ) { + styles = getStyles( elem ); + len = name.length; + + for ( ; i < len; i++ ) { + map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); + } + + return map; + } + + return value !== undefined ? + jQuery.style( elem, name, value ) : + jQuery.css( elem, name ); + }, name, value, arguments.length > 1 ); + }, + show: function() { + return showHide( this, true ); + }, + hide: function() { + return showHide( this ); + }, + toggle: function( state ) { + if ( typeof state === "boolean" ) { + return state ? this.show() : this.hide(); + } + + return this.each(function() { + if ( isHidden( this ) ) { + jQuery( this ).show(); + } else { + jQuery( this ).hide(); + } + }); + } +}); + +jQuery.extend({ + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem, computed ) { + if ( computed ) { + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity" ); + return ret === "" ? "1" : ret; + } + } + } + }, + + // Don't automatically add "px" to these possibly-unitless properties + cssNumber: { + "columnCount": true, + "fillOpacity": true, + "fontWeight": true, + "lineHeight": true, + "opacity": true, + "order": true, + "orphans": true, + "widows": true, + "zIndex": true, + "zoom": true + }, + + // Add in properties whose names you wish to fix before + // setting or getting the value + cssProps: { + // normalize float css property + "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" + }, + + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { + return; + } + + // Make sure that we're working with the right name + var ret, type, hooks, + origName = jQuery.camelCase( name ), + style = elem.style; + + name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) ); + + // gets hook for the prefixed version + // followed by the unprefixed version + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // Check if we're setting a value + if ( value !== undefined ) { + type = typeof value; + + // convert relative number strings (+= or -=) to relative numbers. #7345 + if ( type === "string" && (ret = rrelNum.exec( value )) ) { + value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) ); + // Fixes bug #9237 + type = "number"; + } + + // Make sure that NaN and null values aren't set. See: #7116 + if ( value == null || type === "number" && isNaN( value ) ) { + return; + } + + // If a number was passed in, add 'px' to the (except for certain CSS properties) + if ( type === "number" && !jQuery.cssNumber[ origName ] ) { + value += "px"; + } + + // Fixes #8908, it can be done more correctly by specifing setters in cssHooks, + // but it would mean to define eight (for every problematic property) identical functions + if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) { + style[ name ] = "inherit"; + } + + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) { + + // Wrapped to prevent IE from throwing errors when 'invalid' values are provided + // Fixes bug #5509 + try { + style[ name ] = value; + } catch(e) {} + } + + } else { + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { + return ret; + } + + // Otherwise just get the value from the style object + return style[ name ]; + } + }, + + css: function( elem, name, extra, styles ) { + var num, val, hooks, + origName = jQuery.camelCase( name ); + + // Make sure that we're working with the right name + name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) ); + + // gets hook for the prefixed version + // followed by the unprefixed version + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // If a hook was provided get the computed value from there + if ( hooks && "get" in hooks ) { + val = hooks.get( elem, true, extra ); + } + + // Otherwise, if a way to get the computed value exists, use that + if ( val === undefined ) { + val = curCSS( elem, name, styles ); + } + + //convert "normal" to computed value + if ( val === "normal" && name in cssNormalTransform ) { + val = cssNormalTransform[ name ]; + } + + // Return, converting to number if forced or a qualifier was provided and val looks numeric + if ( extra === "" || extra ) { + num = parseFloat( val ); + return extra === true || jQuery.isNumeric( num ) ? num || 0 : val; + } + return val; + } +}); + +// NOTE: we've included the "window" in window.getComputedStyle +// because jsdom on node.js will break without it. +if ( window.getComputedStyle ) { + getStyles = function( elem ) { + return window.getComputedStyle( elem, null ); + }; + + curCSS = function( elem, name, _computed ) { + var width, minWidth, maxWidth, + computed = _computed || getStyles( elem ), + + // getPropertyValue is only needed for .css('filter') in IE9, see #12537 + ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined, + style = elem.style; + + if ( computed ) { + + if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { + ret = jQuery.style( elem, name ); + } + + // A tribute to the "awesome hack by Dean Edwards" + // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right + // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels + // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { + + // Remember the original values + width = style.width; + minWidth = style.minWidth; + maxWidth = style.maxWidth; + + // Put in the new values to get a computed value out + style.minWidth = style.maxWidth = style.width = ret; + ret = computed.width; + + // Revert the changed values + style.width = width; + style.minWidth = minWidth; + style.maxWidth = maxWidth; + } + } + + return ret; + }; +} else if ( document.documentElement.currentStyle ) { + getStyles = function( elem ) { + return elem.currentStyle; + }; + + curCSS = function( elem, name, _computed ) { + var left, rs, rsLeft, + computed = _computed || getStyles( elem ), + ret = computed ? computed[ name ] : undefined, + style = elem.style; + + // Avoid setting ret to empty string here + // so we don't default to auto + if ( ret == null && style && style[ name ] ) { + ret = style[ name ]; + } + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + // but not position css attributes, as those are proportional to the parent element instead + // and we can't measure the parent instead because it might trigger a "stacking dolls" problem + if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) { + + // Remember the original values + left = style.left; + rs = elem.runtimeStyle; + rsLeft = rs && rs.left; + + // Put in the new values to get a computed value out + if ( rsLeft ) { + rs.left = elem.currentStyle.left; + } + style.left = name === "fontSize" ? "1em" : ret; + ret = style.pixelLeft + "px"; + + // Revert the changed values + style.left = left; + if ( rsLeft ) { + rs.left = rsLeft; + } + } + + return ret === "" ? "auto" : ret; + }; +} + +function setPositiveNumber( elem, value, subtract ) { + var matches = rnumsplit.exec( value ); + return matches ? + // Guard against undefined "subtract", e.g., when used as in cssHooks + Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) : + value; +} + +function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) { + var i = extra === ( isBorderBox ? "border" : "content" ) ? + // If we already have the right measurement, avoid augmentation + 4 : + // Otherwise initialize for horizontal or vertical properties + name === "width" ? 1 : 0, + + val = 0; + + for ( ; i < 4; i += 2 ) { + // both box models exclude margin, so add it if we want it + if ( extra === "margin" ) { + val += jQuery.css( elem, extra + cssExpand[ i ], true, styles ); + } + + if ( isBorderBox ) { + // border-box includes padding, so remove it if we want content + if ( extra === "content" ) { + val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + } + + // at this point, extra isn't border nor margin, so remove border + if ( extra !== "margin" ) { + val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + } else { + // at this point, extra isn't content, so add padding + val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + + // at this point, extra isn't content nor padding, so add border + if ( extra !== "padding" ) { + val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + } + } + + return val; +} + +function getWidthOrHeight( elem, name, extra ) { + + // Start with offset property, which is equivalent to the border-box value + var valueIsBorderBox = true, + val = name === "width" ? elem.offsetWidth : elem.offsetHeight, + styles = getStyles( elem ), + isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; + + // some non-html elements return undefined for offsetWidth, so check for null/undefined + // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285 + // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668 + if ( val <= 0 || val == null ) { + // Fall back to computed then uncomputed css if necessary + val = curCSS( elem, name, styles ); + if ( val < 0 || val == null ) { + val = elem.style[ name ]; + } + + // Computed unit is not pixels. Stop here and return. + if ( rnumnonpx.test(val) ) { + return val; + } + + // we need the check for style in case a browser which returns unreliable values + // for getComputedStyle silently falls back to the reliable elem.style + valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] ); + + // Normalize "", auto, and prepare for extra + val = parseFloat( val ) || 0; + } + + // use the active box-sizing model to add/subtract irrelevant styles + return ( val + + augmentWidthOrHeight( + elem, + name, + extra || ( isBorderBox ? "border" : "content" ), + valueIsBorderBox, + styles + ) + ) + "px"; +} + +// Try to determine the default display value of an element +function css_defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + // Use the already-created iframe if possible + iframe = ( iframe || + jQuery("':""),a._keyEvent=!1,K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='
    ',m="";if(f||!i)m+=''+g[b]+"";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='"}k||(l+=m+(f||!i||!j?" ":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+=''+c+"";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='",l+=a.yearshtml,a.yearshtml=null}}return l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?" ":"")+m),l+="
    ",l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&bd?d:e,e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");return b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);return typeof a!="string"||a!="isDisabled"&&a!="getDate"&&a!="widget"?a=="option"&&arguments.length==2&&typeof arguments[1]=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b)):this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)}):$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b))},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="@VERSION",window["DP_jQuery_"+dpuuid]=$})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.ui.progressbar.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -(function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=a("
    ").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:function(a){return a===b?this._value():(this._setOption("value",a),this)},_setOption:function(b,c){b==="value"&&(this.options.value=c,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;return typeof a!="number"&&(a=0),Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var a=this.value(),b=this._percentage();this.oldValue!==a&&(this.oldValue=a,this._trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(b.toFixed(0)+"%"),this.element.attr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.19"})})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.effects.core.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -jQuery.effects||function(a,b){function c(b){var c;return b&&b.constructor==Array&&b.length==3?b:(c=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(b))?[parseInt(c[1],10),parseInt(c[2],10),parseInt(c[3],10)]:(c=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))?[parseFloat(c[1])*2.55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))?[parseInt(c[1],16),parseInt(c[2],16),parseInt(c[3],16)]:(c=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b))?[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)]:(c=/rgba\(0, 0, 0, 0\)/.exec(b))?e.transparent:e[a.trim(b).toLowerCase()]}function d(b,d){var e;do{e=a.curCSS(b,d);if(e!=""&&e!="transparent"||a.nodeName(b,"body"))break;d="backgroundColor"}while(b=b.parentNode);return c(e)}function h(){var a=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,b={},c,d;if(a&&a.length&&a[0]&&a[a[0]]){var e=a.length;while(e--)c=a[e],typeof a[c]=="string"&&(d=c.replace(/\-(\w)/g,function(a,b){return b.toUpperCase()}),b[d]=a[c])}else for(c in a)typeof a[c]=="string"&&(b[c]=a[c]);return b}function i(b){var c,d;for(c in b)d=b[c],(d==null||a.isFunction(d)||c in g||/scrollbar/.test(c)||!/color/i.test(c)&&isNaN(parseFloat(d)))&&delete b[c];return b}function j(a,b){var c={_:0},d;for(d in b)a[d]!=b[d]&&(c[d]=b[d]);return c}function k(b,c,d,e){typeof b=="object"&&(e=c,d=null,c=b,b=c.effect),a.isFunction(c)&&(e=c,d=null,c={});if(typeof c=="number"||a.fx.speeds[c])e=d,d=c,c={};return a.isFunction(d)&&(e=d,d=null),c=c||{},d=d||c.duration,d=a.fx.off?0:typeof d=="number"?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,e=e||c.complete,[b,c,d,e]}function l(b){return!b||typeof b=="number"||a.fx.speeds[b]?!0:typeof b=="string"&&!a.effects[b]?!0:!1}a.effects={},a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","borderColor","color","outlineColor"],function(b,e){a.fx.step[e]=function(a){a.colorInit||(a.start=d(a.elem,e),a.end=c(a.end),a.colorInit=!0),a.elem.style[e]="rgb("+Math.max(Math.min(parseInt(a.pos*(a.end[0]-a.start[0])+a.start[0],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[1]-a.start[1])+a.start[1],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[2]-a.start[2])+a.start[2],10),255),0)+")"}});var e={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},f=["add","remove","toggle"],g={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(b,c,d,e){return a.isFunction(d)&&(e=d,d=null),this.queue(function(){var g=a(this),k=g.attr("style")||" ",l=i(h.call(this)),m,n=g.attr("class")||"";a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),m=i(h.call(this)),g.attr("class",n),g.animate(j(l,m),{queue:!1,duration:c,easing:d,complete:function(){a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),typeof g.attr("style")=="object"?(g.attr("style").cssText="",g.attr("style").cssText=k):g.attr("style",k),e&&e.apply(this,arguments),a.dequeue(this)}})})},a.fn.extend({_addClass:a.fn.addClass,addClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{add:b},c,d,e]):this._addClass(b)},_removeClass:a.fn.removeClass,removeClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{remove:b},c,d,e]):this._removeClass(b)},_toggleClass:a.fn.toggleClass,toggleClass:function(c,d,e,f,g){return typeof d=="boolean"||d===b?e?a.effects.animateClass.apply(this,[d?{add:c}:{remove:c},e,f,g]):this._toggleClass(c,d):a.effects.animateClass.apply(this,[{toggle:c},d,e,f])},switchClass:function(b,c,d,e,f){return a.effects.animateClass.apply(this,[{add:c,remove:b},d,e,f])}}),a.extend(a.effects,{version:"1.8.19",save:function(a,b){for(var c=0;c").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e=document.activeElement;return b.wrap(d),(b[0]===e||a.contains(b[0],e))&&a(e).focus(),d=b.parent(),b.css("position")=="static"?(d.css({position:"relative"}),b.css({position:"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=b.css(d),isNaN(parseInt(c[d],10))&&(c[d]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),d.css(c).show()},removeWrapper:function(b){var c,d=document.activeElement;return b.parent().is(".ui-effects-wrapper")?(c=b.parent().replaceWith(b),(b[0]===d||a.contains(b[0],d))&&a(d).focus(),c):b},setTransition:function(b,c,d,e){return e=e||{},a.each(c,function(a,c){var f=b.cssUnit(c);f[0]>0&&(e[c]=f[0]*d+f[1])}),e}}),a.fn.extend({effect:function(b,c,d,e){var f=k.apply(this,arguments),g={options:f[1],duration:f[2],callback:f[3]},h=g.options.mode,i=a.effects[b];return a.fx.off||!i?h?this[h](g.duration,g.callback):this.each(function(){g.callback&&g.callback.call(this)}):i.call(this,g)},_show:a.fn.show,show:function(a){if(l(a))return this._show.apply(this,arguments);var b=k.apply(this,arguments);return b[1].mode="show",this.effect.apply(this,b)},_hide:a.fn.hide,hide:function(a){if(l(a))return this._hide.apply(this,arguments);var b=k.apply(this,arguments);return b[1].mode="hide",this.effect.apply(this,b)},__toggle:a.fn.toggle,toggle:function(b){if(l(b)||typeof b=="boolean"||a.isFunction(b))return this.__toggle.apply(this,arguments);var c=k.apply(this,arguments);return c[1].mode="toggle",this.effect.apply(this,c)},cssUnit:function(b){var c=this.css(b),d=[];return a.each(["em","px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=[parseFloat(c),b])}),d}}),a.easing.jswing=a.easing.swing,a.extend(a.easing,{def:"easeOutQuad",swing:function(b,c,d,e,f){return a.easing[a.easing.def](b,c,d,e,f)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b+c:d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b+c:-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b*b+c:d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return b==0?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return b==0?c:b==e?c+d:(b/=e/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){return(b/=e/2)<1?-d/2*(Math.sqrt(1-b*b)-1)+c:d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h").css({position:"absolute",visibility:"visible",left:-j*(g/d),top:-i*(h/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/d,height:h/c,left:f.left+j*(g/d)+(b.options.mode=="show"?(j-Math.floor(d/2))*(g/d):0),top:f.top+i*(h/c)+(b.options.mode=="show"?(i-Math.floor(c/2))*(h/c):0),opacity:b.options.mode=="show"?0:1}).animate({left:f.left+j*(g/d)+(b.options.mode=="show"?0:(j-Math.floor(d/2))*(g/d)),top:f.top+i*(h/c)+(b.options.mode=="show"?0:(i-Math.floor(c/2))*(h/c)),opacity:b.options.mode=="show"?1:0},b.duration||500);setTimeout(function(){b.options.mode=="show"?e.css({visibility:"visible"}):e.css({visibility:"visible"}).hide(),b.callback&&b.callback.apply(e[0]),e.dequeue(),a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.effects.fade.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -(function(a,b){a.effects.fade=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"hide");c.animate({opacity:d},{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.effects.fold.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -(function(a,b){a.effects.fold=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.size||15,g=!!b.options.horizFirst,h=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(c,d),c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),j=e=="show"!=g,k=j?["width","height"]:["height","width"],l=j?[i.width(),i.height()]:[i.height(),i.width()],m=/([0-9]+)%/.exec(f);m&&(f=parseInt(m[1],10)/100*l[e=="hide"?0:1]),e=="show"&&i.css(g?{height:0,width:f}:{height:f,width:0});var n={},p={};n[k[0]]=e=="show"?l[0]:f,p[k[1]]=e=="show"?l[1]:0,i.animate(n,h,b.options.easing).animate(p,h,b.options.easing,function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.effects.highlight.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -(function(a,b){a.effects.highlight=function(b){return this.queue(function(){var c=a(this),d=["backgroundImage","backgroundColor","opacity"],e=a.effects.setMode(c,b.options.mode||"show"),f={backgroundColor:c.css("backgroundColor")};e=="hide"&&(f.opacity=0),a.effects.save(c,d),c.show().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}).animate(f,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),e=="show"&&!a.support.opacity&&this.style.removeAttribute("filter"),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*! jQuery UI - v1.8.19 - 2012-04-16 -* https://github.com/jquery/jquery-ui -* Includes: jquery.effects.pulsate.js -* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ -(function(a,b){a.effects.pulsate=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"show"),e=(b.options.times||5)*2-1,f=b.duration?b.duration/2:a.fx.speeds._default/2,g=c.is(":visible"),h=0;g||(c.css("opacity",0).show(),h=1),(d=="hide"&&g||d=="show"&&!g)&&e--;for(var i=0;i').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery); \ No newline at end of file +/*! jQuery UI - v1.10.3 - 2013-05-03 +* http://jqueryui.com +* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js +* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ +(function(t,e){function i(e,i){var n,o,a,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,o=n.name,e.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap=#"+o+"]")[0],!!a&&s(a)):!1):(/input|select|textarea|button|object/.test(r)?!e.disabled:"a"===r?e.href||i:i)&&s(e)}function s(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var n=0,o=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.3",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(i){if(i!==e)return this.css("zIndex",i);if(this.length)for(var s,n,o=t(this[0]);o.length&&o[0]!==document;){if(s=o.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(n=parseInt(o.css("zIndex"),10),!isNaN(n)&&0!==n))return n;o=o.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){o.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(e){return i(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var s=t.attr(e,"tabindex"),n=isNaN(s);return(n||s>=0)&&i(e,!n)}}),t("    ").outerWidth(1).jquery||t.each(["Width","Height"],function(i,s){function n(e,i,s,n){return t.each(o,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),n&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var o="Width"===s?["Left","Right"]:["Top","Bottom"],a=s.toLowerCase(),r={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+s]=function(i){return i===e?r["inner"+s].call(this):this.each(function(){t(this).css(a,n(this,i)+"px")})},t.fn["outer"+s]=function(e,i){return"number"!=typeof e?r["outer"+s].call(this,e):this.each(function(){t(this).css(a,n(this,e,!0,i)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i){var s,n=t.plugins[e];if(n&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(s=0;n.length>s;s++)t.options[n[s][0]]&&n[s][1].apply(t.element,i)}},hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)}})})(jQuery),function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
    ",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),s===e)return o[i]===e?null:o[i];o[i]=s}else{if(s===e)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})}(jQuery),function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.3",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!e){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,o="string"==typeof this.options.cancel&&i.target.nodeName?t(i.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===t.data(i.target,this.widgetName+".preventClickEvent")&&t.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return s._mouseMove(t)},this._mouseUpDelegate=function(t){return s._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})}(jQuery),function(t){t.widget("ui.draggable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(t(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){t("
    ").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(t(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_mouseDrag:function(e,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"original"!==this.options.helper||t.contains(this.element[0].ownerDocument,this.element[0])?("invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1):!1},_mouseUp:function(e){return t("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.element.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;return n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):"document"===n.containment?(this.containment=[0,0,t(document).width()-this.helperProportions.width-this.margins.left,(t(document).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):n.containment.constructor===Array?(this.containment=n.containment,undefined):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),undefined):(this.containment=null,undefined)},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent;return this.offset.scroll||(this.offset.scroll={top:n.scrollTop(),left:n.scrollLeft()}),{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top)*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)*s}},_generatePosition:function(e){var i,s,n,o,a=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=e.pageX,l=e.pageY;return this.offset.scroll||(this.offset.scroll={top:r.scrollTop(),left:r.scrollLeft()}),this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.lefti[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s]),"drag"===e&&(this.positionAbs=this._convertPositionTo("absolute")),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i){var s=t(this).data("ui-draggable"),n=s.options,o=t.extend({},i,{item:s.element});s.sortables=[],t(n.connectToSortable).each(function(){var i=t.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",e,o))})},stop:function(e,i){var s=t(this).data("ui-draggable"),n=t.extend({},i,{item:s.element});t.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(e),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",e,n))})},drag:function(e,i){var s=t(this).data("ui-draggable"),n=this;t.each(s.sortables,function(){var o=!1,a=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,t.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==a&&this.instance._intersectsWith(this.instance.containerCache)&&t.contains(a.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=t(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},e.target=this.instance.currentItem[0],this.instance._mouseCapture(e,!0),this.instance._mouseStart(e,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",e),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(e)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",e,this.instance._uiHash(this.instance)),this.instance._mouseStop(e,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",e),s.dropped=!1)})}}),t.ui.plugin.add("draggable","cursor",{start:function(){var e=t("body"),i=t(this).data("ui-draggable").options;e.css("cursor")&&(i._cursor=e.css("cursor")),e.css("cursor",i.cursor)},stop:function(){var e=t(this).data("ui-draggable").options;e._cursor&&t("body").css("cursor",e._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._opacity&&t(i.helper).css("opacity",s._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(){var e=t(this).data("ui-draggable");e.scrollParent[0]!==document&&"HTML"!==e.scrollParent[0].tagName&&(e.overflowOffset=e.scrollParent.offset())},drag:function(e){var i=t(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-e.pageY=0;u--)r=p.snapElements[u].left,h=r+p.snapElements[u].width,l=p.snapElements[u].top,c=l+p.snapElements[u].height,r-g>v||m>h+g||l-g>b||_>c+g||!t.contains(p.snapElements[u].item.ownerDocument,p.snapElements[u].item)?(p.snapElements[u].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=!1):("inner"!==f.snapMode&&(s=g>=Math.abs(l-b),n=g>=Math.abs(c-_),o=g>=Math.abs(r-v),a=g>=Math.abs(h-m),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||o||a,"outer"!==f.snapMode&&(s=g>=Math.abs(l-_),n=g>=Math.abs(c-b),o=g>=Math.abs(r-m),a=g>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c-p.helperProportions.height,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[u].snapping&&(s||n||o||a||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=s||n||o||a||d)}}),t.ui.plugin.add("draggable","stack",{start:function(){var e,i=this.data("ui-draggable").options,s=t.makeArray(t(i.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});s.length&&(e=parseInt(t(s[0]).css("zIndex"),10)||0,t(s).each(function(i){t(this).css("zIndex",e+i)}),this.css("zIndex",e+s.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._zIndex&&t(i.helper).css("zIndex",s._zIndex)}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}t.widget("ui.droppable",{version:"1.10.3",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e=this.options,i=e.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(i)?i:function(t){return t.is(i) +},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},t.ui.ddmanager.droppables[e.scope]=t.ui.ddmanager.droppables[e.scope]||[],t.ui.ddmanager.droppables[e.scope].push(this),e.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){for(var e=0,i=t.ui.ddmanager.droppables[this.options.scope];i.length>e;e++)i[e]===this&&i.splice(e,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(e,i){"accept"===e&&(this.accept=t.isFunction(i)?i:function(t){return t.is(i)}),t.Widget.prototype._setOption.apply(this,arguments)},_activate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var e=t.data(this,"ui-droppable");return e.options.greedy&&!e.options.disabled&&e.options.scope===s.options.scope&&e.accept.call(e.element[0],s.currentItem||s.element)&&t.ui.intersect(s,t.extend(e,{offset:e.element.offset()}),e.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}}}),t.ui.intersect=function(t,i,s){if(!i.offset)return!1;var n,o,a=(t.positionAbs||t.position.absolute).left,r=a+t.helperProportions.width,h=(t.positionAbs||t.position.absolute).top,l=h+t.helperProportions.height,c=i.offset.left,u=c+i.proportions.width,d=i.offset.top,p=d+i.proportions.height;switch(s){case"fit":return a>=c&&u>=r&&h>=d&&p>=l;case"intersect":return a+t.helperProportions.width/2>c&&u>r-t.helperProportions.width/2&&h+t.helperProportions.height/2>d&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,o=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(o,d,i.proportions.height)&&e(n,c,i.proportions.width);case"touch":return(h>=d&&p>=h||l>=d&&p>=l||d>h&&l>p)&&(a>=c&&u>=a||r>=c&&u>=r||c>a&&r>u);default:return!1}},t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions.height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions={width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight})}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&t.ui.intersect(e,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").bind("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=t.ui.intersect(e,this,this.options.tolerance),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t.data(this,"ui-droppable").options.scope===n}),o.length&&(s=t.data(o[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").unbind("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}}}(jQuery),function(t){function e(t){return parseInt(t,10)||0}function i(t){return!isNaN(parseInt(t,10))}t.widget("ui.resizable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var e,i,s,n,o,a=this,r=this.options;if(this.element.addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(t("
    ").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),e=this.handles.split(","),this.handles={},i=0;e.length>i;i++)s=t.trim(e[i]),o="ui-resizable-"+s,n=t("
    "),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=t(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),t(this.handles[i]).length},this._renderAxis(this.element),this._handles=t(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),t(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(t(this).removeClass("ui-resizable-autohide"),a._handles.show())}).mouseleave(function(){r.disabled||a.resizing||(t(this).addClass("ui-resizable-autohide"),a._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,o,a=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=e(this.helper.css("left")),n=e(this.helper.css("top")),a.containment&&(s+=t(a.containment).scrollLeft()||0,n+=t(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,o=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===o?this.axis+"-resize":o),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(e){var i,s=this.helper,n={},o=this.originalMousePosition,a=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,c=this.size.height,u=e.pageX-o.left||0,d=e.pageY-o.top||0,p=this._change[a];return p?(i=p.apply(this,[e,u,d]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==c&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(n)||this._trigger("resize",e,this.ui()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&t.ui.hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,h=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(t){var e,s,n,o,a,r=this.options;a={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||t)&&(e=a.minHeight*this.aspectRatio,n=a.minWidth/this.aspectRatio,s=a.maxHeight*this.aspectRatio,o=a.maxWidth/this.aspectRatio,e>a.minWidth&&(a.minWidth=e),n>a.minHeight&&(a.minHeight=n),a.maxWidth>s&&(a.maxWidth=s),a.maxHeight>o&&(a.maxHeight=o)),this._vBoundaries=a},_updateCache:function(t){this.offset=this.helper.offset(),i(t.left)&&(this.position.left=t.left),i(t.top)&&(this.position.top=t.top),i(t.height)&&(this.size.height=t.height),i(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,s=this.size,n=this.axis;return i(t.height)?t.width=t.height*this.aspectRatio:i(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===n&&(t.left=e.left+(s.width-t.width),t.top=null),"nw"===n&&(t.top=e.top+(s.height-t.height),t.left=e.left+(s.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,s=this.axis,n=i(t.width)&&e.maxWidth&&e.maxWidtht.width,r=i(t.height)&&e.minHeight&&e.minHeight>t.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,c=/sw|nw|w/.test(s),u=/nw|ne|n/.test(s);return a&&(t.width=e.minWidth),r&&(t.height=e.minHeight),n&&(t.width=e.maxWidth),o&&(t.height=e.maxHeight),a&&c&&(t.left=h-e.minWidth),n&&c&&(t.left=h-e.maxWidth),r&&u&&(t.top=l-e.minHeight),o&&u&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var t,e,i,s,n,o=this.helper||this.element;for(t=0;this._proportionallyResizeElements.length>t;t++){if(n=this._proportionallyResizeElements[t],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],e=0;i.length>e;e++)this.borderDif[e]=(parseInt(i[e],10)||0)+(parseInt(s[e],10)||0);n.css({height:o.height()-this.borderDif[0]-this.borderDif[2]||0,width:o.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("
    "),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&t.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,c=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,o,a,r,h,l=t(this).data("ui-resizable"),c=l.options,u=l.element,d=c.containment,p=d instanceof t?d.get(0):/parent/.test(d)?u.parent().get(0):d;p&&(l.containerElement=t(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(i=t(p),s=[],t(["Top","Right","Left","Bottom"]).each(function(t,n){s[t]=e(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,o=l.containerSize.height,a=l.containerSize.width,r=t.ui.hasScroll(p,"left")?p.scrollWidth:a,h=t.ui.hasScroll(p)?p.scrollHeight:o,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(e){var i,s,n,o,a=t(this).data("ui-resizable"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio),a.position.top=a._helper?h.top:0),a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top,i=Math.abs((a._helper?a.offset.left-u.left:a.offset.left-u.left)+a.sizeDiff.width),s=Math.abs((a._helper?a.offset.top-u.top:a.offset.top-h.top)+a.sizeDiff.height),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o&&(i-=a.parentData.left),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio))},stop:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=function(e){t(e).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseInt(e.width(),10),height:parseInt(e.height(),10),left:parseInt(e.css("left"),10),top:parseInt(e.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):t.each(i.alsoResize,function(t){s(t)})},resize:function(e,i){var s=t(this).data("ui-resizable"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0},h=function(e,s){t(e).each(function(){var e=t(this),n=t(this).data("ui-resizable-alsoresize"),o={},a=s&&s.length?s:e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(a,function(t,e){var i=(n[e]||0)+(r[e]||0);i&&i>=0&&(o[e]=i||null)}),e.css(o)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):t.each(n.alsoResize,function(t,e){h(t,e)})},stop:function(){t(this).removeData("resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).data("ui-resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).data("ui-resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,c=Math.round((s.width-n.width)/h)*h,u=Math.round((s.height-n.height)/l)*l,d=n.width+c,p=n.height+u,f=i.maxWidth&&d>i.maxWidth,g=i.maxHeight&&p>i.maxHeight,m=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=h),v&&(p+=l),f&&(d-=h),g&&(p-=l),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):(e.size.width=d,e.size.height=p,e.position.top=o.top-u,e.position.left=o.left-c)}})}(jQuery),function(t){t.widget("ui.selectable",t.ui.mouse,{version:"1.10.3",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e=t(i.options.filter,i.element[0]),e.addClass("ui-selectee"),e.each(function(){var e=t(this),i=e.offset();t.data(this,"selectable-item",{element:this,$element:e,left:i.left,top:i.top,right:i.left+e.outerWidth(),bottom:i.top+e.outerHeight(),startselected:!1,selected:e.hasClass("ui-selected"),selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=e.addClass("ui-selectee"),this._mouseInit(),this.helper=t("
    ")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||o>i.right||i.top>h||a>i.bottom):"fit"===n.tolerance&&(l=i.left>o&&r>i.right&&i.top>a&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break; +this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){var i,s,n,o,a=[],r=[],h=this._connectWith();if(h&&e)for(i=h.length-1;i>=0;i--)for(n=t(h[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&r.push([t.isFunction(o.options.items)?o.options.items.call(o.element):t(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(r.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),i=r.length-1;i>=0;i--)r[i][0].each(function(){a.push(this)});return t(a)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t("
    ",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.leftthis.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)("auto"===this._storedCSS[i]||"static"===this._storedCSS[i])&&(this._storedCSS[i]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;i>=0;i--)e||s.push(function(t){return function(e){t._trigger("deactivate",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(function(t){return function(e){t._trigger("out",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})}(jQuery),function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("

    ")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function s(e,i){var s,n,a={};for(s in i)n=i[s],e[s]!==n&&(o[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(a[s]=n));return a}var n=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var e=t(this);return{el:e,start:i(this)}}),o=function(){t.each(n,function(t,i){e[i]&&a[i+"Class"](e[i])})},o(),l=l.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,o,a,r){return"boolean"==typeof n||n===e?o?t.effects.animateClass.call(this,n?{add:s}:{remove:s},o,a,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,o,a)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.3",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,o;for(o=0;s.length>o;o++)null!==s[o]&&(n=t.data(i+s[o]),n===e&&(n=""),t.css(s[o],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("

    ").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(o)&&o.call(n[0]),t.isFunction(e)&&e()}var n=t(this),o=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):a.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,o=i.queue,a=t.effects.effect[i.effect];return t.fx.off||!a?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):o===!1?this.each(e):this.queue(o||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()}(jQuery),function(t){var e=0,i={},s={};i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="hide",s.height=s.paddingTop=s.paddingBottom=s.borderTopWidth=s.borderBottomWidth="show",t.widget("ui.accordion",{version:"1.10.3",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t(),content:this.active.length?this.active.next():t()}},_createIcons:function(){var e=this.options.icons;e&&(t("").addClass("ui-accordion-header-icon ui-icon "+e.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(e.header).addClass(e.activeHeader),this.headers.addClass("ui-accordion-icons")) +},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),undefined):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),"disabled"===t&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!e),undefined)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),o.focus(),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().focus()},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var i,s=this.options,n=s.heightStyle,o=this.element.parent(),a=this.accordionId="ui-accordion-"+(this.element.attr("id")||++e);this.active=this._findActive(s.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(e){var i=t(this),s=i.attr("id"),n=i.next(),o=n.attr("id");s||(s=a+"-header-"+e,i.attr("id",s)),o||(o=a+"-panel-"+e,n.attr("id",o)),i.attr("aria-controls",o),n.attr("aria-labelledby",s)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(s.event),"fill"===n?(i=o.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.headers.each(function(){i-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===n&&(i=0,this.headers.next().each(function(){i=Math.max(i,t(this).css("height","").height())}).height(i))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n[0]===s[0],a=o&&i.collapsible,r=a?t():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:a?t():n,newPanel:r};e.preventDefault(),o&&!i.collapsible||this._trigger("beforeActivate",e,l)===!1||(i.active=a?!1:this.headers.index(n),this.active=o?t():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),o||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-expanded":"false","aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr("tabIndex",-1):i.length&&this.headers.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(t,e,n){var o,a,r,h=this,l=0,c=t.length&&(!e.length||t.index()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o?!0:a?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,undefined;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:case o.NUMPAD_ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),undefined;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),undefined):(this._searchTimeout(t),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(t),this._change(t),undefined)}}),this._initSource(),this.menu=t("
     
    "+"",T=u?"":"",w=0;7>w;w++)M=(w+c)%7,T+="=5?" class='ui-datepicker-week-end'":"")+">"+""+p[M]+"";for(P+=T+"",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),z=(this._getFirstDayOfMonth(te,Z)-c+7)%7,A=Math.ceil((z+S)/7),H=X?this.maxRows>A?this.maxRows:A:A,this.maxRows=H,E=this._daylightSavingAdjust(new Date(te,Z,1-z)),N=0;H>N;N++){for(P+="",W=u?"":"",w=0;7>w;w++)O=m?m.apply(t.input?t.input[0]:null,[E]):[!0,""],F=E.getMonth()!==Z,R=F&&!_||!O[0]||G&&G>E||J&&E>J,W+="",E.setDate(E.getDate()+1),E=this._daylightSavingAdjust(E);P+=W+""}Z++,Z>11&&(Z=0,te++),P+="
    "+this._get(t,"weekHeader")+"
    "+this._get(t,"calculateWeek")(E)+""+(F&&!v?" ":R?""+E.getDate()+"":""+E.getDate()+"")+"
    "+(X?"
    "+(U[0]>0&&D===U[1]-1?"
    ":""):""),x+=P}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),v=this._get(t,"changeYear"),_=this._get(t,"showMonthAfterYear"),b="
    ",y="";if(o||!m)y+=""+a[e]+"";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+=""}if(_||(b+=y+(!o&&m&&v?"":" ")),!t.yearshtml)if(t.yearshtml="",o||!v)b+=""+i+"";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),_&&(b+=(!o&&m&&v?"":" ")+y),b+="
    "},_adjustInstDate:function(t,e,i){var s=t.drawYear+("Y"===i?e:0),n=t.drawMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).mousedown(t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new i,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.10.3"}(jQuery),function(t){var e={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};t.widget("ui.dialog",{version:"1.10.3",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._destroyOverlay(),this.opener.filter(":focusable").focus().length||t(this.document[0].activeElement).blur(),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return i&&!e&&this._trigger("focus",t),i},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),undefined):(this._isOpen=!0,this.opener=t(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._trigger("open"),undefined)},_focusTabbable:function(){var t=this.element.find("[autofocus]");t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).focus()},_keepFocus:function(e){function i(){var e=this.document[0].activeElement,i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("
    ").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),undefined;if(e.keyCode===t.ui.keyCode.TAB){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(n.focus(1),e.preventDefault()):(s.focus(1),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("
    ").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=t("").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(e),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title||t.html(" "),t.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=t("
    ").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("
    ").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),undefined):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(e.element[0],arguments)},o={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,t("",s).button(o).appendTo(e.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),undefined)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){t(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){s.position=[o.position.left-i.document.scrollLeft(),o.position.top-i.document.scrollTop()],t(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size} +}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){t(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){s.height=t(this).height(),s.width=t(this).width(),t(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(s){var n=this,o=!1,a={};t.each(s,function(t,s){n._setOption(t,s),t in e&&(o=!0),t in i&&(a[t]=s)}),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",a)},_setOption:function(t,e){var i,s,n=this.uiDialog;"dialogClass"===t&&n.removeClass(this.options.dialogClass).addClass(e),"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:""+e}),"draggable"===t&&(i=n.is(":data(ui-draggable)"),i&&!e&&n.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&(s=n.is(":data(ui-resizable)"),s&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||e===!1||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("
    ").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=this,i=this.widgetFullName;t.ui.dialog.overlayInstances||this._delay(function(){t.ui.dialog.overlayInstances&&this.document.bind("focusin.dialog",function(s){e._allowInteraction(s)||(s.preventDefault(),t(".ui-dialog:visible:last .ui-dialog-content").data(i)._focusTabbable())})}),this.overlay=t("
    ").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),t.ui.dialog.overlayInstances++}},_destroyOverlay:function(){this.options.modal&&this.overlay&&(t.ui.dialog.overlayInstances--,t.ui.dialog.overlayInstances||this.document.unbind("focusin.dialog"),this.overlay.remove(),this.overlay=null)}}),t.ui.dialog.overlayInstances=0,t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{_position:function(){var e,i=this.options.position,s=[],n=[0,0];i?(("string"==typeof i||"object"==typeof i&&"0"in i)&&(s=i.split?i.split(" "):[i[0],i[1]],1===s.length&&(s[1]=s[0]),t.each(["left","top"],function(t,e){+s[t]===s[t]&&(n[t]=s[t],s[t]=e)}),i={my:s[0]+(0>n[0]?n[0]:"+"+n[0])+" "+s[1]+(0>n[1]?n[1]:"+"+n[1]),at:s.join(" ")}),i=t.extend({},t.ui.dialog.prototype.options.position,i)):i=t.ui.dialog.prototype.options.position,e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.position(i),e||this.uiDialog.hide()}})}(jQuery),function(t){var e=/up|down|vertical/,i=/up|left|vertical|horizontal/;t.effects.effect.blind=function(s,n){var o,a,r,h=t(this),l=["position","top","bottom","left","right","height","width"],c=t.effects.setMode(h,s.mode||"hide"),u=s.direction||"up",d=e.test(u),p=d?"height":"width",f=d?"top":"left",g=i.test(u),m={},v="show"===c;h.parent().is(".ui-effects-wrapper")?t.effects.save(h.parent(),l):t.effects.save(h,l),h.show(),o=t.effects.createWrapper(h).css({overflow:"hidden"}),a=o[p](),r=parseFloat(o.css(f))||0,m[p]=v?a:0,g||(h.css(d?"bottom":"right",0).css(d?"top":"left","auto").css({position:"absolute"}),m[f]=v?r:a+r),v&&(o.css(p,0),g||o.css(f,r+a)),o.animate(m,{duration:s.duration,easing:s.easing,queue:!1,complete:function(){"hide"===c&&h.hide(),t.effects.restore(h,l),t.effects.removeWrapper(h),n()}})}}(jQuery),function(t){t.effects.effect.bounce=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"effect"),l="hide"===h,c="show"===h,u=e.direction||"up",d=e.distance,p=e.times||5,f=2*p+(c||l?1:0),g=e.duration/f,m=e.easing,v="up"===u||"down"===u?"top":"left",_="up"===u||"left"===u,b=a.queue(),y=b.length;for((c||l)&&r.push("opacity"),t.effects.save(a,r),a.show(),t.effects.createWrapper(a),d||(d=a["top"===v?"outerHeight":"outerWidth"]()/3),c&&(o={opacity:1},o[v]=0,a.css("opacity",0).css(v,_?2*-d:2*d).animate(o,g,m)),l&&(d/=Math.pow(2,p-1)),o={},o[v]=0,s=0;p>s;s++)n={},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m).animate(o,g,m),d=l?2*d:d/2;l&&(n={opacity:0},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m)),a.queue(function(){l&&a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}),y>1&&b.splice.apply(b,[1,0].concat(b.splice(y,f+1))),a.dequeue()}}(jQuery),function(t){t.effects.effect.clip=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"hide"),l="show"===h,c=e.direction||"vertical",u="vertical"===c,d=u?"height":"width",p=u?"top":"left",f={};t.effects.save(a,r),a.show(),s=t.effects.createWrapper(a).css({overflow:"hidden"}),n="IMG"===a[0].tagName?s:a,o=n[d](),l&&(n.css(d,0),n.css(p,o/2)),f[d]=l?o:0,f[p]=l?0:o/2,n.animate(f,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){l||a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.drop=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","opacity","height","width"],a=t.effects.setMode(n,e.mode||"hide"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h?"pos":"neg",u={opacity:r?1:0};t.effects.save(n,o),n.show(),t.effects.createWrapper(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===c?-s:s),u[l]=(r?"pos"===c?"+=":"-=":"pos"===c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.explode=function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),g||p.hide(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=t.effects.setMode(p,e.mode||"hide"),g="show"===f,m=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/d),_=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*_,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*v,l=a-(d-1)/2,p.clone().appendTo("body").wrap("
    ").css({position:"absolute",visibility:"visible",left:-a*v,top:-o*_}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:_,left:r+(g?l*v:0),top:h+(g?c*_:0),opacity:g?0:1}).animate({left:r+(g?0:l*v),top:h+(g?0:c*_),opacity:g?1:0},e.duration||500,e.easing,s)}}(jQuery),function(t){t.effects.effect.fade=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}}(jQuery),function(t){t.effects.effect.fold=function(e,i){var s,n,o=t(this),a=["position","top","bottom","left","right","height","width"],r=t.effects.setMode(o,e.mode||"hide"),h="show"===r,l="hide"===r,c=e.size||15,u=/([0-9]+)%/.exec(c),d=!!e.horizFirst,p=h!==d,f=p?["width","height"]:["height","width"],g=e.duration/2,m={},v={};t.effects.save(o,a),o.show(),s=t.effects.createWrapper(o).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],u&&(c=parseInt(u[1],10)/100*n[l?0:1]),h&&s.css(d?{height:0,width:c}:{height:c,width:0}),m[f[0]]=h?n[0]:c,v[f[1]]=h?n[1]:0,s.animate(m,g,e.easing).animate(v,g,e.easing,function(){l&&o.hide(),t.effects.restore(o,a),t.effects.removeWrapper(o),i()})}}(jQuery),function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],o=t.effects.setMode(s,e.mode||"show"),a={backgroundColor:s.css("backgroundColor")};"hide"===o&&(a.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(a,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===o&&s.hide(),t.effects.restore(s,n),i()}})}}(jQuery),function(t){t.effects.effect.pulsate=function(e,i){var s,n=t(this),o=t.effects.setMode(n,e.mode||"show"),a="show"===o,r="hide"===o,h=a||"hide"===o,l=2*(e.times||5)+(h?1:0),c=e.duration/l,u=0,d=n.queue(),p=d.length;for((a||!n.is(":visible"))&&(n.css("opacity",0).show(),u=1),s=1;l>s;s++)n.animate({opacity:u},c,e.easing),u=1-u;n.animate({opacity:u},c,e.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&d.splice.apply(d,[1,0].concat(d.splice(p,l+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.puff=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"hide"),o="hide"===n,a=parseInt(e.percent,10)||150,r=a/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};t.extend(e,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:o?a:100,from:o?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(e)},t.effects.effect.scale=function(e,i){var s=t(this),n=t.extend(!0,{},e),o=t.effects.setMode(s,e.mode||"effect"),a=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"hide"===o?0:100),r=e.direction||"both",h=e.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},c={y:"horizontal"!==r?a/100:1,x:"vertical"!==r?a/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==o&&(n.origin=h||["middle","center"],n.restore=!0),n.from=e.from||("show"===o?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*c.y,width:l.width*c.x,outerHeight:l.outerHeight*c.y,outerWidth:l.outerWidth*c.x},n.fade&&("show"===o&&(n.from.opacity=0,n.to.opacity=1),"hide"===o&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},t.effects.effect.size=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],c=["fontSize"],u=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],d=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=t.effects.setMode(a,e.mode||"effect"),f=e.restore||"effect"!==p,g=e.scale||"both",m=e.origin||["middle","center"],v=a.css("position"),_=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&a.show(),s={height:a.height(),width:a.width(),outerHeight:a.outerHeight(),outerWidth:a.outerWidth()},"toggle"===e.mode&&"show"===p?(a.from=e.to||b,a.to=e.from||s):(a.from=e.from||("show"===p?b:s),a.to=e.to||("hide"===p?b:s)),o={from:{y:a.from.height/s.height,x:a.from.width/s.width},to:{y:a.to.height/s.height,x:a.to.width/s.width}},("box"===g||"both"===g)&&(o.from.y!==o.to.y&&(_=_.concat(u),a.from=t.effects.setTransition(a,u,o.from.y,a.from),a.to=t.effects.setTransition(a,u,o.to.y,a.to)),o.from.x!==o.to.x&&(_=_.concat(d),a.from=t.effects.setTransition(a,d,o.from.x,a.from),a.to=t.effects.setTransition(a,d,o.to.x,a.to))),("content"===g||"both"===g)&&o.from.y!==o.to.y&&(_=_.concat(c).concat(l),a.from=t.effects.setTransition(a,c,o.from.y,a.from),a.to=t.effects.setTransition(a,c,o.to.y,a.to)),t.effects.save(a,_),a.show(),t.effects.createWrapper(a),a.css("overflow","hidden").css(a.from),m&&(n=t.effects.getBaseline(m,s),a.from.top=(s.outerHeight-a.outerHeight())*n.y,a.from.left=(s.outerWidth-a.outerWidth())*n.x,a.to.top=(s.outerHeight-a.to.outerHeight)*n.y,a.to.left=(s.outerWidth-a.to.outerWidth)*n.x),a.css(a.from),("content"===g||"both"===g)&&(u=u.concat(["marginTop","marginBottom"]).concat(c),d=d.concat(["marginLeft","marginRight"]),l=r.concat(u).concat(d),a.find("*[width]").each(function(){var i=t(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&t.effects.save(i,l),i.from={height:s.height*o.from.y,width:s.width*o.from.x,outerHeight:s.outerHeight*o.from.y,outerWidth:s.outerWidth*o.from.x},i.to={height:s.height*o.to.y,width:s.width*o.to.x,outerHeight:s.height*o.to.y,outerWidth:s.width*o.to.x},o.from.y!==o.to.y&&(i.from=t.effects.setTransition(i,u,o.from.y,i.from),i.to=t.effects.setTransition(i,u,o.to.y,i.to)),o.from.x!==o.to.x&&(i.from=t.effects.setTransition(i,d,o.from.x,i.from),i.to=t.effects.setTransition(i,d,o.to.x,i.to)),i.css(i.from),i.animate(i.to,e.duration,e.easing,function(){f&&t.effects.restore(i,l)})})),a.animate(a.to,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){0===a.to.opacity&&a.css("opacity",a.from.opacity),"hide"===p&&a.hide(),t.effects.restore(a,_),f||("static"===v?a.css({position:"relative",top:a.to.top,left:a.to.left}):t.each(["top","left"],function(t,e){a.css(e,function(e,i){var s=parseInt(i,10),n=t?a.to.left:a.to.top;return"auto"===i?n+"px":s+n+"px"})})),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.shake=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","height","width"],a=t.effects.setMode(n,e.mode||"effect"),r=e.direction||"left",h=e.distance||20,l=e.times||3,c=2*l+1,u=Math.round(e.duration/c),d="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},g={},m={},v=n.queue(),_=v.length;for(t.effects.save(n,o),n.show(),t.effects.createWrapper(n),f[d]=(p?"-=":"+=")+h,g[d]=(p?"+=":"-=")+2*h,m[d]=(p?"-=":"+=")+2*h,n.animate(f,u,e.easing),s=1;l>s;s++)n.animate(g,u,e.easing).animate(m,u,e.easing);n.animate(g,u,e.easing).animate(f,u/2,e.easing).queue(function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}),_>1&&v.splice.apply(v,[1,0].concat(v.splice(_,c+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.slide=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","width","height"],a=t.effects.setMode(n,e.mode||"show"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u={};t.effects.save(n,o),n.show(),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0),t.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,c?isNaN(s)?"-"+s:-s:s),u[l]=(r?c?"+=":"-=":c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.transfer=function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("
    ").appendTo(document.body).addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),i()})}}(jQuery),function(t){t.widget("ui.menu",{version:"1.10.3",defaultElement:"
      ",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.mouseHandled=!0,this.select(e),i.has(".ui-menu").length?this.expand(e):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,o,a,r,h=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:h=!1,n=this.previousFilter||"",o=String.fromCharCode(e.keyCode),a=!1,clearTimeout(this.filterTimer),o===n?a=!0:o=n+o,r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=a&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(o=String.fromCharCode(e.keyCode),r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=o,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()
    "),a=n.children()[0];return t("body").append(n),i=a.offsetWidth,n.css("overflow","scroll"),s=a.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),o=i-s},getScrollInfo:function(e){var i=e.isWindow?"":e.element.css("overflow-x"),s=e.isWindow?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.widths?"left":i>0?"right":"center",vertical:0>o?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>g&&g>r(n+o)&&(h.vertical="middle"),h.important=a(r(i),r(s))>a(r(n),r(o))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(I,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,o=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-o-n;e.collisionWidth>o?h>0&&0>=l?(i=t.left+h+e.collisionWidth-o-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+o-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=a(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,o=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-o-n;e.collisionHeight>o?h>0&&0>=l?(i=t.top+h+e.collisionHeight-o-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+o-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=a(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,a=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-a-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-a-o,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,a=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-a-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-a-o,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,o,a=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(a?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},a&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)e.style[o]=s[o];e.appendChild(r),i=a||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()}(jQuery),function(t,e){t.widget("ui.progressbar",{version:"1.10.3",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=t("
    ").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove() +},value:function(t){return t===e?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),e)},_constrainedValue:function(t){return t===e&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("
    ").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}})}(jQuery),function(t){var e=5;t.widget("ui.slider",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e)})},_createRange:function(){var e=this.options,i="";e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=t("
    ").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===e.range||"max"===e.range?" ui-slider-range-"+e.range:""))):this.range=t([])},_setupEvents:function(){var t=this.handles.add(this.range).filter("a");this._off(t),this._on(t,this._handleEvents),this._hoverable(t),this._focusable(t)},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,o.addClass("ui-state-active").focus(),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_start:function(t,e){var i={handle:this.handles[e],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("start",t,i)},_slide:function(t,e,i){var s,n,o;this.options.values&&this.options.values.length?(s=this.values(e?0:1),2===this.options.values.length&&this.options.range===!0&&(0===e&&i>s||1===e&&s>i)&&(i=s),i!==this.values(e)&&(n=this.values(),n[e]=i,o=this._trigger("slide",t,{handle:this.handles[e],value:i,values:n}),s=this.values(e?0:1),o!==!1&&this.values(e,i,!0))):i!==this.value()&&(o=this._trigger("slide",t,{handle:this.handles[e],value:i}),o!==!1&&this.value(i))},_stop:function(t,e){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("stop",t,i)},_change:function(t,e){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._lastChangedValue=e,this._trigger("change",t,i)}},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),undefined):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),undefined;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),t.Widget.prototype._setOption.apply(this,arguments),e){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(i){var s,n,o,a,r=t(i.target).data("ui-slider-handle-index");switch(i.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(i.preventDefault(),!this._keySliding&&(this._keySliding=!0,t(i.target).addClass("ui-state-active"),s=this._start(i,r),s===!1))return}switch(a=this.options.step,n=o=this.options.values&&this.options.values.length?this.values(r):this.value(),i.keyCode){case t.ui.keyCode.HOME:o=this._valueMin();break;case t.ui.keyCode.END:o=this._valueMax();break;case t.ui.keyCode.PAGE_UP:o=this._trimAlignValue(n+(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.PAGE_DOWN:o=this._trimAlignValue(n-(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(n===this._valueMax())return;o=this._trimAlignValue(n+a);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(n===this._valueMin())return;o=this._trimAlignValue(n-a)}this._slide(i,r,o)},click:function(t){t.preventDefault()},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),t(e.target).removeClass("ui-state-active"))}}})}(jQuery),function(t){function e(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.widget("ui.spinner",{version:"1.10.3",defaultElement:"",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e={},i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);void 0!==n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var t=this.element[0]===this.document[0].activeElement;t||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var t=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=t.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*t.height())&&t.height()>0&&t.height(t.height()),this.options.disabled&&this.disable()},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_uiSpinnerHtml:function(){return""},_buttonHtml:function(){return""+""},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){if("culture"===t||"numberFormat"===t){var i=this._parse(this.element.val());return this.options[t]=e,this.element.val(this._format(i)),void 0}("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(e.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(e.down)),this._super(t,e),"disabled"===t&&(e?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:e(function(t){this._super(t),this._value(this.element.val())}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:e(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:e(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:e(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:e(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(e(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}})}(jQuery),function(t,e){function i(){return++n}function s(t){return t.hash.length>1&&decodeURIComponent(t.href.replace(o,""))===decodeURIComponent(location.href.replace(o,""))}var n=0,o=/#.*$/;t.widget("ui.tabs",{version:"1.10.3",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var e=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var i=this.options.active,s=this.options.collapsible,n=location.hash.substring(1);return null===i&&(n&&this.tabs.each(function(s,o){return t(o).attr("aria-controls")===n?(i=s,!1):e}),null===i&&(i=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===i||-1===i)&&(i=this.tabs.length?0:!1)),i!==!1&&(i=this.tabs.index(this.tabs.eq(i)),-1===i&&(i=s?!1:0)),!s&&i===!1&&this.anchors.length&&(i=0),i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(i){var s=t(this.document[0].activeElement).closest("li"),n=this.tabs.index(s),o=!0;if(!this._handlePageNav(i)){switch(i.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:n++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:o=!1,n--;break;case t.ui.keyCode.END:n=this.anchors.length-1;break;case t.ui.keyCode.HOME:n=0;break;case t.ui.keyCode.SPACE:return i.preventDefault(),clearTimeout(this.activating),this._activate(n),e;case t.ui.keyCode.ENTER:return i.preventDefault(),clearTimeout(this.activating),this._activate(n===this.options.active?!1:n),e;default:return}i.preventDefault(),clearTimeout(this.activating),n=this._focusNextTab(n,o),i.ctrlKey||(s.attr("aria-selected","false"),this.tabs.eq(n).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",n)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.focus())},_handlePageNav:function(i){return i.altKey&&i.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):i.altKey&&i.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):e},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).focus(),t},_setOption:function(t,i){return"active"===t?(this._activate(i),e):"disabled"===t?(this._setupDisabled(i),e):(this._super(t,i),"collapsible"===t&&(this.element.toggleClass("ui-tabs-collapsible",i),i||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(i),"heightStyle"===t&&this._setupHeightStyle(i),e)},_tabId:function(t){return t.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=t(),this.anchors.each(function(i,n){var o,a,r,h=t(n).uniqueId().attr("id"),l=t(n).closest("li"),c=l.attr("aria-controls");s(n)?(o=n.hash,a=e.element.find(e._sanitizeSelector(o))):(r=e._tabId(l),o="#"+r,a=e.element.find(o),a.length||(a=e._createPanel(r),a.insertAfter(e.panels[i-1]||e.tablist)),a.attr("aria-live","polite")),a.length&&(e.panels=e.panels.add(a)),c&&l.data("ui-tabs-aria-controls",c),l.attr({"aria-controls":o.substring(1),"aria-labelledby":h}),a.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(e){return t("
    ").attr("id",e).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(e){t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1);for(var i,s=0;i=this.tabs[s];s++)e===!0||-1!==t.inArray(s,e)?t(i).addClass("ui-state-disabled").attr("aria-disabled","true"):t(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=e},_setupEvents:function(e){var i={click:function(t){t.preventDefault()}};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr({"aria-expanded":"false","aria-hidden":"true"}),i.oldTab.attr("aria-selected","false"),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr({"aria-expanded":"true","aria-hidden":"false"}),i.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(t){return"string"==typeof t&&(t=this.anchors.index(this.anchors.filter("[href$='"+t+"']"))),t},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var s=this.options.disabled;s!==!1&&(i===e?s=!1:(i=this._getIndex(i),s=t.isArray(s)?t.map(s,function(t){return t!==i?t:null}):t.map(this.tabs,function(t,e){return e!==i?e:null})),this._setupDisabled(s))},disable:function(i){var s=this.options.disabled;if(s!==!0){if(i===e)s=!0;else{if(i=this._getIndex(i),-1!==t.inArray(i,s))return;s=t.isArray(s)?t.merge([i],s).sort():[i]}this._setupDisabled(s)}},load:function(e,i){e=this._getIndex(e);var n=this,o=this.tabs.eq(e),a=o.find(".ui-tabs-anchor"),r=this._getPanelForTab(o),h={tab:o,panel:r};s(a[0])||(this.xhr=t.ajax(this._ajaxSettings(a,i,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(o.addClass("ui-tabs-loading"),r.attr("aria-busy","true"),this.xhr.success(function(t){setTimeout(function(){r.html(t),n._trigger("load",i,h)},1)}).complete(function(t,e){setTimeout(function(){"abort"===e&&n.panels.stop(!1,!0),o.removeClass("ui-tabs-loading"),r.removeAttr("aria-busy"),t===n.xhr&&delete n.xhr},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href"),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}})}(jQuery),function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.3",options:{content:function(){var e=t(this).attr("title")||"";return t("").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=o),this._open(e,t,i)})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function o(t){l.of=t,a.is(":hidden")||a.position(l)}var a,r,h,l=t.extend({},this.options.position); +if(n){if(a=this._find(s),a.length)return a.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),a=this._tooltip(s),e(s,a.attr("id")),a.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:o}),o(i)):a.position(t.extend({of:s},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){a.is(":visible")&&(o(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:a}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(a)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),o.stop(!0),this._hide(o,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:o}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("
    ").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("
    ").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery); \ No newline at end of file diff --git a/common/js/plugins/ui/jquery.ui.datepicker-ko.js b/common/js/plugins/ui/jquery.ui.datepicker-ko.js index 61ea6eaf8..af36f3d6b 100644 --- a/common/js/plugins/ui/jquery.ui.datepicker-ko.js +++ b/common/js/plugins/ui/jquery.ui.datepicker-ko.js @@ -1,20 +1,23 @@ /* Korean initialisation for the jQuery calendar extension. */ -/* Written by DaeKwon Kang (ncrash.dk@gmail.com). */ - jQuery.datepicker.regional['ko'] = { +/* Written by DaeKwon Kang (ncrash.dk@gmail.com), Edited by Genie. */ +jQuery(function($){ + $.datepicker.regional['ko'] = { closeText: '닫기', prevText: '이전달', nextText: '다음달', currentText: '오늘', - monthNames: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)', - '7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'], - monthNamesShort: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)', - '7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'], - dayNames: ['일','월','화','수','목','금','토'], + monthNames: ['1월','2월','3월','4월','5월','6월', + '7월','8월','9월','10월','11월','12월'], + monthNamesShort: ['1월','2월','3월','4월','5월','6월', + '7월','8월','9월','10월','11월','12월'], + dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'], dayNamesShort: ['일','월','화','수','목','금','토'], dayNamesMin: ['일','월','화','수','목','금','토'], weekHeader: 'Wk', dateFormat: 'yy-mm-dd', firstDay: 0, isRTL: false, - showMonthAfterYear: false, + showMonthAfterYear: true, yearSuffix: '년'}; + $.datepicker.setDefaults($.datepicker.regional['ko']); +}); diff --git a/common/js/plugins/ui/plugin.load b/common/js/plugins/ui/plugin.load index b497ba25b..49fcfdc53 100644 --- a/common/js/plugins/ui/plugin.load +++ b/common/js/plugins/ui/plugin.load @@ -1,3 +1,3 @@ jquery-ui.min.js -jquery-ui.css +jquery-ui.min.css jquery.ui.datepicker-ko.js From 608cdf138a4f2a15c9ef3ffaf86494d440cf893a Mon Sep 17 00:00:00 2001 From: bnu Date: Sun, 24 Nov 2013 00:37:11 +0900 Subject: [PATCH 119/473] =?UTF-8?q?grunt=20=E2=80=98jshint=E2=80=99task?= =?UTF-8?q?=EC=97=90=EC=84=9C=20jQuery=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Gruntfile.js b/Gruntfile.js index 4bc54e98d..96e01d794 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -118,6 +118,7 @@ module.exports = function(grunt) { 'modules/widget/tpl/js/generate_code.js', 'modules/widget/tpl/js/widget.js', 'modules/widget/tpl/js/widget_admin.js', + '!**/jquery*.js', '!**/*.min.js', '!**/*-packed.js' ], From 0ea0e78599bc413620665aed1dc030ed9e36721d Mon Sep 17 00:00:00 2001 From: bnu Date: Sun, 24 Nov 2013 00:38:49 +0900 Subject: [PATCH 120/473] minify --- modules/editor/skins/xpresseditor/js/xpresseditor.js | 4 +++- modules/editor/skins/xpresseditor/js/xpresseditor.min.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js index a0a8c1361..4013aa264 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js @@ -5378,11 +5378,13 @@ xe.XE_AutoSave = $.Class({ $ON_MSG_APP_READY : function() { var elTitle = $(this.form._saved_doc_title); var elContent = $(this.form._saved_doc_content); + var elDocument_srl = $(this.form._saved_doc_document_srl); var title = $.trim(elTitle.val()); var content = $.trim(elContent.val()); + var document_srl = $.trim(elDocument_srl.val()); - if (title || content) { + if (title || content || document_srl) { if (confirm(this.form._saved_doc_message.value)) { $(this.form.title).val(title); this.oApp.setIR(content); diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js index 360ee9a62..ae6bcccc4 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js @@ -1,4 +1,4 @@ function editorStart_xe(a,b,c,d,e,f,g,h){function i(){try{var a,b=q.contentWindow.document;if("about:blank"==b.location)throw"blank";b.body.innerHTML=b.body.innerHTML.trim(),a=b.body.innerHTML,p.registerPlugin(new xe.XE_EditingArea_WYSIWYG(q)),p.registerPlugin(new xe.XpressRangeManager(q)),p.registerPlugin(new xe.XE_ExecCommand(q)),g&&!b.body.style.fontFamily&&(b.body.style.fontFamily=g),h&&!b.body.style.fontSize&&(b.body.style.fontSize=h),p.run()}catch(c){setTimeout(i,0)}}"undefined"==typeof e&&(e="white"),"undefined"==typeof f&&(f="xeStyle"),"undefined"==typeof g&&(g=""),"undefined"==typeof h&&(h="");var j=request_uri+"modules/editor/styles/"+f+"/editor.html",k=jQuery("#xpress-editor-"+a),l=jQuery(''),m=jQuery(''),n=k.get(0).form;n.setAttribute("editor_sequence",a),k.css("display","none");var o="";jQuery("input[name=content]",n).size()>0&&(o=jQuery("input[name=content]",n).val().replace(/src=\"files\/attach/g,'src="'+request_uri+"files/attach"),jQuery("#xpress-editor-"+a).val(o)),k.hide().css("width","100%").before(l).after(m);var p=new xe.XpressCore,q=l.get(0),r=k.get(0),t=m.get(0),u=jQuery(".xpress-editor",n).get(0);p.getFrame=function(){return q},p.getContent=function(){editorGetContentTextarea_xe(a)};var v=n[c].value;return xFF&&!v&&(v="
    "),v=editorReplacePath(v),n[c].value=v,jQuery("#xpress-editor-"+a).val(v),editorRelKeys[a]=new Array,editorRelKeys[a].primary=n[b],editorRelKeys[a].content=n[c],editorRelKeys[a].func=editorGetContentTextarea_xe,editorRelKeys[a].editor=p,editorRelKeys[a].pasteHTML=function(a){p.exec("PASTE_HTML",[a])},xe.Editors[a]=p,p.registerPlugin(new xe.CorePlugin(null)),p.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+a).val())),p.registerPlugin(new xe.StringConverterManager),p.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG",r,{nHeight:parseInt(d),nMinHeight:100},null,u)),p.registerPlugin(new xe.XE_EditingArea_HTMLSrc(t)),p.registerPlugin(new xe.XE_EditingAreaVerticalResizer(u)),p.registerPlugin(new xe.Utils),p.registerPlugin(new xe.DialogLayerManager),p.registerPlugin(new xe.ActiveLayerManager),p.registerPlugin(new xe.Hotkey),p.registerPlugin(new xe.XE_WYSIWYGStyler),p.registerPlugin(new xe.XE_WYSIWYGStyleGetter),p.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap)),p.registerPlugin(new xe.XE_Toolbar(u)),p.registerPlugin(new xe.XE_XHTMLFormatter),p.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(a)),jQuery("ul.extra1").length&&(p.registerPlugin(new xe.XE_ColorPalette(u)),p.registerPlugin(new xe.XE_FontColor(u)),p.registerPlugin(new xe.XE_BGColor(u)),p.registerPlugin(new xe.XE_Quote(u)),p.registerPlugin(new xe.XE_FontNameWithSelectUI(u)),p.registerPlugin(new xe.XE_FontSizeWithSelectUI(u)),p.registerPlugin(new xe.XE_LineHeightWithSelectUI(u)),p.registerPlugin(new xe.XE_UndoRedo),p.registerPlugin(new xe.XE_Table(u)),p.registerPlugin(new xe.XE_Hyperlink(u)),p.registerPlugin(new xe.XE_FormatWithSelectUI(u)),p.registerPlugin(new xe.XE_SCharacter(u))),jQuery("ul.extra2").length&&p.registerPlugin(new xe.XE_Extension(u,a)),jQuery("ul.extra3").length&&p.registerPlugin(new xe.XE_EditingModeToggler(u)),jQuery("#editorresize").length&&p.registerPlugin(new xe.XE_Editorresize(u,q)),jQuery.browser.msie||jQuery.browser.opera||p.registerPlugin(new xe.XE_WYSIWYGEnterKey(q)),(s=n._saved_doc_title)&&p.registerPlugin(new xe.XE_AutoSave(r,u)),i(),p}function editorGetContentTextarea_xe(a){var b=xe.Editors[a]||null;if(!b)return"";var c=b.getIR();if(!jQuery.trim(c.replace(/( |<\/?(p|br|span|div)([^>]+)?>)/gi,"")))return"";if(c=c.replace(/
    $/i,""),c.length<1024){var d=Array("#text","A","BR","IMG","EM","STRONG","SPAN","BIG","CITE","CODE","DD","DFN","HR","INS","KBD","LINK","Q","SAMP","SMALL","SUB","SUP","TT"),e=!0,f=jQuery("
    "+c+"
    ").eq(0),g=f.contents();jQuery.each(g,function(){3!=this.nodeType&&-1==jQuery.inArray(this.nodeName,d)&&(e=!1)}),e&&(c="

    "+c+"

    ")}return c=c.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/gi,function(a,b,c){return"src="+(b||"")+c}),c=c.replace(/\<(\/)?([A-Z]+)([^>]*)\>/gi,function(a,b,c,d){return d=d?d.replace(/ ([A-Z]+?)\=/gi,function(a,b){return b=b.toLowerCase()," "+b+"="}):"",c=c.toLowerCase(),b||(b=""),"<"+b+c+d+">"}),c=c.replace("
    ","
    ")}function editorGetIframe(a){return jQuery("iframe#editor_iframe_"+a).get(0)}function editorReplaceHTML(a,b){b=editorReplacePath(b);var c=parseInt(a.id.replace(/^.*_/,""),10);editorRelKeys[c].pasteHTML(b)}function editorReplacePath(a){return a=a.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/gi,function(a,b,c,d,e,f,g){"url("==c?(d="",f=")"):("undefined"==typeof d&&(d='"'),"undefined"==typeof f&&(f='"'),"undefined"==typeof g&&(g=""));var h=jQuery.trim(e).replace(/^\.\//,"");return/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(h)?a:"<"+b+c+d+request_uri+h+f+g})}function editorGetAutoSavedDoc(a){var b=new Array;b.mid=current_mid,b.editor_sequence=a.getAttribute("editor_sequence"),setTimeout(function(){var a=new Array("error","message","editor_sequence","title","content","document_srl");exec_xml("editor","procEditorLoadSavedDocument",b,function(a){editorRelKeys[b.editor_sequence].primary.value=a.document_srl,"object"==typeof uploadSettingObj[b.editor_sequence]&&editorUploadInit(uploadSettingObj[b.editor_sequence],!0)},a)},0)}!function(a){function b(b){function c(a){return function(){return a.apply(this.$this,arguments)}}var d=b.prototype;this.prototype.$super={};for(var e in d)d.propertyIsEnumerable(e)&&("undefined"==typeof this.prototype[e]&&(this.prototype[e]=d[e]),this.prototype.$super[e]=a.isFunction(d[e])?c(d[e]):d[e]);return this}a.extend({Class:function(c){function d(){"undefined"!=typeof this.$super&&(this.$super.$this=this),a.isFunction(this.$init)&&this.$init.apply(this,arguments)}return d.prototype=c,d.constructor=d,d.extend=b,d},$:function(b){return"string"==typeof b?"<"==b.substring(0,1)?a(b).get(0):a("#"+b).get(0):b},fnBind:function(b,c){var d=a.makeArray(arguments);return d.shift(),d.shift(),function(){var e=d.concat(a.makeArray(arguments));return b.apply(c,e)}}}),a.browser.nVersion=parseFloat(a.browser.version),"undefined"==typeof window.xe&&(window.xe={}),xe.XpressCore=a.Class({name:"XpressCore",$init:function(b){b=b?a.Class({}).extend({oDebugger:null}).extend(b):{},b.oDebugger&&(this.oDebugger=b.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,c){return this.appStatus==xe.APP_STATUS.NOT_READY?(this.commandQueue[this.commandQueue.length]={msg:a,args:b,event:c},!0):(this.exec=this._exec,this.exec(a,b,c),void 0)},delayedExec:function(b,c,d,e){var f=a.fnBind(this.exec,this,b,c,e);setTimeout(f,d)},_exec:function(a,b,c){return(this._exec=this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this,a,b,c)},_execWithDebugger:function(a,b,c){this.oDebugger.log_MessageStart(a,b);var d=this._doExec(a,b,c);return this.oDebugger.log_MessageEnd(a,b),d},_execWithoutDebugger:function(a,b,c){return this._doExec(a,b,c)},_doExec:function(a,b,c){var d=!1;if(!this.oDisabledCommand[a]){var e=[];if(b&&b.length)for(var f=b.length,g=0;f>g;g++)e[g]=b[g];c&&(e[e.length]=c);var d=!0;d=this._execMsgStep("BEFORE",a,e),d&&(d=this._execMsgStep("ON",a,e)),d&&(d=this._execMsgStep("AFTER",a,e))}return d},registerPlugin:function(a){if(!a)throw"An error occured in registerPlugin(): invalid plug-in";return a.nIdx=this.aPlugins.length,a.oApp=this,this.aPlugins[a.nIdx]=a,a.status!=xe.PLUGIN_STATUS.NOT_READY&&(a.status=xe.PLUGIN_STATUS.READY),this.exec("MSG_PLUGIN_REGISTERED",[a]),a.nIdx},disableCommand:function(a,b){this.oDisabledCommand[a]=b},registerBrowserEvent:function(b,c,d,e,f){if(b){e=e||[];var g=f?a.fnBind(this.delayedExec,this,d,e,f):a.fnBind(this.exec,this,d,e);a(b).bind(c,g)}},run:function(){this._changeAppStatus(xe.APP_STATUS.WAITING_FOR_PLUGINS_READY);var a=this.commandQueue.length;for(i=0;a>i;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,c=0;b>c;c++)this._doAddToCommandMap(a,this.aPlugins[c])},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,c){return(this._execMsgStep=this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this,a,b,c)},_execMsgStepWithDebugger:function(a,b,c){this.oDebugger.log_MessageStepStart(a,b,c);var d=this._execMsgHandler("$"+a+"_"+b,c);return this.oDebugger.log_MessageStepEnd(a,b,c),d},_execMsgStepWithoutDebugger:function(a,b,c){return this._execMsgHandler("$"+a+"_"+b,c)},_execMsgHandler:function(a,b){this.oCommandMap[a]||this.createCommandMap(a);var c=this.oCommandMap[a],d=c.length;if(0==d)return!0;var e,f=!0;if(a.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){for(var g=0;d>g;g++)if(e=this._execHandler(c[g],a,b),e===!1){f=!1;break}}else for(var g=0;d>g;g++)if(("function"!=typeof c[g].$PRECONDITION||this._execHandler(c[g],"$PRECONDITION",[a,b]))&&(e=this._execHandler(c[g],a,b),e===!1)){f=!1;break}return f},_execHandler:function(a,b,c){return(this._execHandler=this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this,a,b,c)},_execHandlerWithDebugger:function(a,b,c){this.oDebugger.log_CallHandlerStart(a,b,c);var d=a[b].apply(a,c);return this.oDebugger.log_CallHandlerEnd(a,b,c),d},_execHandlerWithoutDebugger:function(a,b,c){return a[b].apply(a,c)},_doAddToCommandMap:function(a,b){"function"==typeof b[a]&&(this.oCommandMap[a][this.oCommandMap[a].length]=b)},_waitForPluginReady:function(){for(var b=!0,c=0;cb)return b;var i=b-1,j=a[b].cloneNode(!1);for(a[b]==e&&(c=j),a[b]==f&&(d=j);i>=0&&xe.DOMFix.parentNode(a[i])==a[b];)i=this._recurConstructClonedTree(a,i,a[b],j,c,d);return h.insertBefore(j,h.firstChild),i},a[a.length]=xe.DOMFix.parentNode(a[a.length-1]),_recurConstructClonedTree(a,a.length-1,a[a.length-1],b),{oStartContainer:c,oEndContainer:d}},cloneRange:function(){return this._copyRange(new xe.W3CDOMRange(this._document))},_copyRange:function(a){return 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,a},collapse:function(a){a?(this.endContainer=this.startContainer,this.endOffset=this.startOffset):(this.startContainer=this.endContainer,this.startOffset=this.endOffset),this._updateRangeInfo()},compareBoundaryPoints:function(a,b){switch(a){case xe.W3CDOMRange.START_TO_START:return this._compareEndPoint(this.startContainer,this.startOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.START_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.END_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.endContainer,b.endOffset);case xe.W3CDOMRange.END_TO_START:return this._compareEndPoint(this.startContainer,this.startOffset,b.endContainer,b.endOffset)}},_findBody:function(a){if(!a)return null;for(;a;){if("BODY"==a.tagName)return a;a=xe.DOMFix.parentNode(a)}return null},_compareEndPoint:function(a,b,c,d){var e,f;a&&this._findBody(a)==this._document.body||(a=this._document.body,b=0),c&&this._findBody(c)==this._document.body||(c=this._document.body,d=0);var g=function(a,b){return-1==b&&(b=a+1),b>a?-1:a==b?0:1},h=this._getCommonAncestorContainer(a,c),i=a;if(i!=h){for(;(oTmpNode=xe.DOMFix.parentNode(i))!=h;)i=oTmpNode;e=this._getPosIdx(i)+.5}else e=b;var j=c;if(j!=h){for(;(oTmpNode=xe.DOMFix.parentNode(j))!=h;)j=oTmpNode;f=this._getPosIdx(j)+.5}else f=d;return g(e,f)},_getCommonAncestorContainer:function(a,b){for(var c=b;a;){for(;c;){if(a==c)return a;c=xe.DOMFix.parentNode(c)}c=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 c,d;b||(c=xe.DOMFix.parentNode(a[0]),d=0);for(var e=0;ea.nodeValue.length&&(b=a.nodeValue.length):b>xe.DOMFix.childNodes(a).length&&(b=xe.DOMFix.childNodes(a).length),b},setEnd:function(a,b){b=this._endsNodeValidation(a,b),this.endContainer=a,this.endOffset=b,this.startContainer&&-1==this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)||this.collapse(!1),this._updateRangeInfo()},setEndAfter:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");return"BODY"==a.tagName?(this.setEnd(a,xe.DOMFix.childNodes(a).length),void 0):(this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1),void 0)},setEndBefore:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");return"BODY"==a.tagName?(this.setEnd(a,0),void 0):(this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a)),void 0)},setStart:function(a,b){b=this._endsNodeValidation(a,b),this.startContainer=a,this.startOffset=b,this.endContainer&&-1==this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)||this.collapse(!0),this._updateRangeInfo()},setStartAfter:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");return"BODY"==a.tagName?(this.setStart(a,xe.DOMFix.childNodes(a).length),void 0):(this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1),void 0)},setStartBefore:function(a){if(!a)throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");return"BODY"==a.tagName?(this.setStart(a,0),void 0):(this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a)),void 0)},surroundContents:function(a){a.appendChild(this.extractContents()),this.insertNode(a),this.selectNode(a)},toString:function(){var a=this._document.createElement("DIV");return a.appendChild(this.cloneContents()),a.textContent||a.innerText||""},_isBlankTextNode:function(a){return 3==a.nodeType&&""==a.nodeValue?!0:!1},_getPosIdx:function(a){for(var b=0,c=a.previousSibling;c;c=c.previousSibling)b++;return b},_updateRangeInfo:function(){return this.startContainer?(this.collapsed=this._isCollapsed(this.startContainer,this.startOffset,this.endContainer,this.endOffset),this.commonAncestorContainer=this._getCommonAncestorContainer(this.startContainer,this.endContainer),void 0):(this.init(this._document),void 0)},_isCollapsed:function(a,b,c,d){var e=!1;if(a==c&&b==d)e=!0;else{var f=this._getActualStartNode(a,b),g=this._getActualEndNode(c,d);f=this._getNextNode(this._getPrevNode(f)),g=this._getPrevNode(this._getNextNode(g)),f&&g&&"BODY"!=g.tagName&&(this._getNextNode(g)==f||g==f&&this._isBlankTextNode(g))&&(e=!0)}return e},_splitTextEndNodesOfTheRange:function(){var a=this._splitTextEndNodes({oStartContainer:this.startContainer,iStartOffset:this.startOffset,oEndContainer:this.endContainer,iEndOffset:this.endOffset});this.startContainer=a.oStartContainer,this.startOffset=a.iStartOffset,this.endContainer=a.oEndContainer,this.endOffset=a.iEndOffset},_splitTextEndNodes:function(a){return a=this._splitStartTextNode(a),a=this._splitEndTextNode(a)},_splitStartTextNode:function(a){var b=a.oStartContainer,c=a.iStartOffset,d=a.oEndContainer,e=a.iEndOffset;if(!b)return a;if(3!=b.nodeType)return a;if(0==c)return a;if(b.nodeValue.length<=c)return a;var f=b.splitText(c);return b==d&&(e-=c,d=f),b=f,c=0,{oStartContainer:b,iStartOffset:c,oEndContainer:d,iEndOffset:e}},_splitEndTextNode:function(a){var b=a.oStartContainer,c=a.iStartOffset,d=a.oEndContainer,e=a.iEndOffset;return d?3!=d.nodeType?a:e>=d.nodeValue.length?a:0==e?a:(d.splitText(e),{oStartContainer:b,iStartOffset:c,oEndContainer:d,iEndOffset:e}):a},_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 c=a;return 3==a.nodeType?b>=a.nodeValue.length?(c=this._getNextNode(a),"BODY"==c.tagName&&(c=null)):c=a:b=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():3==this.endContainer.nodeType?0==this.endOffset?this._getPrevNode(this.endContainer):this.endContainer:0==this.endOffset?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1]},getNodeAroundRange:function(a,b){if(this.collapsed&&this.startContainer&&3==this.startContainer.nodeType)return this.startContainer;if(!this.collapsed||this.startContainer&&3==this.startContainer.nodeType)return this.getStartNode();var c,d,e;return d=this.startOffset>=xe.DOMFix.childNodes(this.startContainer).length?this._getNextNode(this.startContainer):xe.DOMFix.childNodes(this.startContainer)[this.startOffset],c=0==this.endOffset?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1],a?(e=c,e||b||(e=d)):(e=d,e||b||(e=c)),e},_getXPath:function(a){for(var b="";a&&1==a.nodeType;)b="/"+a.tagName+"["+this._getPosIdx4XPath(a)+"]"+b,a=xe.DOMFix.parentNode(a);return b},_getPosIdx4XPath:function(a){for(var b=0,c=a.previousSibling;c;c=c.previousSibling)c.tagName==a.tagName&&b++;return b},_evaluateXPath:function(a,b){a=a.substring(1,a.length-1);for(var c=a.split(/\//),d=b.body,e=2;el;l++)h[l].tagName==f&&(i[k++]=h[l]);d=i.length-1&&e){for(var f=xe.DOMFix.childNodes(e),g=null,h=c,i=d;(g=f[h])&&3==g.nodeType&&g.nodeValue.length=b&&e>=0?!0:bIncludePartlyIncluded?1==c?!1:-1==d?!1:!0:!1},isNodeInRange:function(a,b,c){var d=new xe.XpressRange(this._window);return c&&a.firstChild?(d.setStartBefore(a.firstChild),d.setEndAfter(a.lastChild)):d.selectNode(a),isRangeInRange(d,b)},pasteHTML:function(a){if(""==a)return this.deleteContents(),void 0;var b=this._document.createElement("DIV");b.innerHTML=a;for(var c=b.firstChild,d=b.lastChild,e=this.cloneRange(),f=e.placeStringBookmark();b.lastChild;)this.insertNode(b.lastChild);this.setEndNodes(c,d),e.moveToBookmark(f),e.deleteContents(),e.removeStringBookmark(f)},toString:function(){return this.toString=xe.W3CDOMRange.prototype.toString,this.toString()},toHTMLString:function(){var a=this._document.createElement("DIV");return a.appendChild(this.cloneContents()),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,c=a.lastChild?a.lastChild:a;3==b.nodeType?this.setStart(b,0):this.setStartBefore(b),3==c.nodeType?this.setEnd(c,c.nodeValue.length):this.setEndAfter(c)}},styleRange:function(b,c,d){var e=this._getStyleParentNodes(d);if(!(e.length<1)){for(var f,g,h=0;ho;o++)if(c=k[o],c&&3==c.nodeType&&""!=c.nodeValue){if(h=xe.DOMFix.parentNode(c),"SPAN"==h.tagName){var p=a(h).html();if(d=this._getVeryFirstRealChild(h),f=d==c?1:p.indexOf(d),-1!=f&&(d=this._getVeryLastRealChild(h),g=d==c?1:p.indexOf(d)),-1!=f&&-1!=g){l[m++]=h;continue}}e=this._document.createElement("SPAN"),h.insertBefore(e,c),e.appendChild(c),l[m++]=e,b&&e.setAttribute(b,"true")}return this.setStartBefore(i),this.setEndAfter(j),l},_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(var b=a.firstChild;b&&3==b.nodeType&&""==b.nodeValue;)b=b.nextSibling;return b},_getLastRealChild:function(a){for(var b=a.lastChild;b&&3==b.nodeType&&""==b.nodeValue;)b=b.previousSibling;return b},_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&&!d){if(h.test(a.tagName))return f=a,d=e,g=!0,void 0;e=a,c(a.previousSibling),d||b(xe.DOMFix.parentNode(a))}}function c(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!1,void 0;if(a.firstChild&&"TABLE"!=a.tagName)for(var b=a.lastChild;b&&!d;)c(b),b=b.previousSibling;else e=a;d||c(a.previousSibling)}}var d=null,e=a,f=a,g=!0,h=this.rxLineBreaker;return b(a),{oNode:d,oLineBreaker:f,bParentBreak:g}},_getLineEndInfo:function(a){function b(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!0,void 0;e=a,c(a.nextSibling),d||b(xe.DOMFix.parentNode(a))}}function c(a){if(a&&!d){if(h.test(a.tagName))return f=a,d=e,g=!1,void 0;if(a.firstChild&&"TABLE"!=a.tagName)for(var b=a.firstChild;b&&!d;)c(b),b=b.nextSibling;else e=a;d||c(a.nextSibling)}}var d=null,e=a,f=a,g=!0,h=this.rxLineBreaker;return b(a),{oNode:d,oLineBreaker:f,bParentBreak:g}},getLineInfo:function(){var a=this.getStartNode(),b=this.getEndNode();a||(a=this.getNodeAroundRange(!0,!0)),b||(b=this.getNodeAroundRange(!0,!0));var c=this._getLineStartInfo(a),d=c.oNode,e=this._getLineEndInfo(b),f=e.oNode,g=this._compareEndPoint(xe.DOMFix.parentNode(d),this._getPosIdx(d),this.endContainer,this.endOffset),h=this._compareEndPoint(xe.DOMFix.parentNode(f),this._getPosIdx(f)+1,this.startContainer,this.startOffset);return 0>=g&&h>=0||(a=this.getNodeAroundRange(!1,!0),b=this.getNodeAroundRange(!1,!0),c=this._getLineStartInfo(a),e=this._getLineEndInfo(b)),{oStart:c,oEnd:e}}}).extend(xe.W3CDOMRange),xe.SimpleSelection=function(b){this.init=function(a){this._window=a||window,this._document=this._window.document},this.init(b),a.browser.msie?xe.SimpleSelectionImpl_IE.apply(this):xe.SimpleSelectionImpl_FF.apply(this),this.selectRange=function(a){this.selectNone(),this.addRange(a)},this.selectionLoaded=!0,this._oSelection||(this.selectionLoaded=!1)},xe.SimpleSelectionImpl_FF=function(){this._oSelection=this._window.getSelection(),this.getRangeAt=function(a){a=a||0;try{var b=this._oSelection.getRangeAt(a)}catch(c){return new xe.W3CDOMRange(this._document)}return this._FFRange2W3CRange(b)},this.addRange=function(a){var b=this._W3CRange2FFRange(a);this._oSelection.addRange(b)},this.selectNone=function(){this._oSelection.removeAllRanges()},this._FFRange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document);return b.setStart(a.startContainer,a.startOffset),b.setEnd(a.endContainer,a.endOffset),b},this._W3CRange2FFRange=function(a){var b=this._document.createRange(); return b.setStart(a.startContainer,a.startOffset),b.setEnd(a.endContainer,a.endOffset),b}},xe.SimpleSelectionImpl_IE=function(){this._oSelection=this._document.selection,this.getRangeAt=function(a){if(a=a||0,"Control"==this._oSelection.type){var b=new xe.W3CDOMRange(this._document),c=this._oSelection.createRange().item(a);return c&&c.ownerDocument==this._document?(b.selectNode(c),b):b}var c=this._oSelection.createRangeCollection().item(a).parentElement();if(!c||c.ownerDocument!=this._document){var b=new xe.W3CDOMRange(this._document);return b}return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(a))},this.addRange=function(a){var b=this._W3CRange2IERange(a);b.select()},this.selectNone=function(){this._oSelection.empty()},this._W3CRange2IERange=function(a){var b=this._getIERangeAt(a.startContainer,a.startOffset),c=this._getIERangeAt(a.endContainer,a.endOffset);return b.setEndPoint("EndToEnd",c),b},this._getIERangeAt=function(a,b){var c=this._document.body.createTextRange(),d=this._getSelectableNodeAndOffsetForIE(a,b),e=d.oSelectableNodeForIE,f=d.iOffsetForIE;return c.moveToElementText(e),c.collapse(d.bCollapseToStart),c.moveStart("character",f),c},this._getSelectableNodeAndOffsetForIE=function(a,b){var c=this._document.body.createTextRange(),d=null,e=null,f=0;3==a.nodeType?(d=xe.DOMFix.parentNode(a),e=xe.DOMFix.childNodes(d),f=e.length):(d=a,e=xe.DOMFix.childNodes(d),f=b);for(var g=null,h=0,i=!0,j=0;f>j;j++)if(g=e[j],3==g.nodeType){if(g==a)break;h+=g.nodeValue.length}else c.moveToElementText(g),d=g,h=0,i=!1;return 3==a.nodeType&&(h+=b),{oSelectableNodeForIE:d,iOffsetForIE:h,bCollapseToStart:i}},this._IERange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document),c=null,d=null;c=a.duplicate(),c.collapse(!0),d=this._getW3CContainerAndOffset(c,!0),b.setStart(d.oContainer,d.iOffset);var e=a.duplicate();return e.collapse(!0),e.isEqual(a)?b.collapse(!0):(c=a.duplicate(),c.collapse(!1),d=this._getW3CContainerAndOffset(c),b.setEnd(d.oContainer,d.iOffset)),b},this._getW3CContainerAndOffset=function(a,b){for(var c=a,d=c.parentElement(),e=-1,f=this._document.body.createTextRange(),g=xe.DOMFix.childNodes(d),h=null,i=0,j=0;j=0)break;h=g[j]}var i=j;if(0!=i&&3==g[i-1].nodeType){var k=this._document.body.createTextRange(),l=null;h?(k.moveToElementText(h),k.collapse(!1),l=h.nextSibling):(k.moveToElementText(d),k.collapse(!0),l=d.firstChild);var m=c.duplicate();m.setEndPoint("StartToStart",k);for(var n=m.text.length;n>l.nodeValue.length&&l.nextSibling;)n-=l.nodeValue.length,l=l.nextSibling;{l.nodeValue}b&&l.nextSibling&&3==l.nextSibling.nodeType&&n==l.nodeValue.length&&(n-=l.nodeValue.length,l=l.nextSibling),d=l,e=n}else d=c.parentElement(),e=i;return{oContainer:d,iOffset:e}}},xe.DOMFix=new(a.Class({$init:function(){a.browser.msie||a.browser.opera?(this.childNodes=this._childNodes_Fix,this.parentNode=this._parentNode_Fix):(this.childNodes=this._childNodes_Native,this.parentNode=this._parentNode_Native)},_parentNode_Native:function(a){return a.parentNode},_parentNode_Fix:function(a){if(!a)return a;for(;a.previousSibling;)a=a.previousSibling;return a.parentNode},_childNodes_Native:function(a){return a.childNodes},_childNodes_Fix:function(a){var b=null,c=0;if(a){var b=[];for(a=a.firstChild;a;)b[c++]=a,a=a.nextSibling}return b}})),xe.DraggableLayer=a.Class({$init:function(b,c){this.oOptions=a.extend({bModal:"false",oHandle:b,iMinX:-999999,iMinY:-999999,iMaxX:999999,iMaxY:999999},c),this.oHandle=this.oOptions.oHandle,b.style.display="block",b.style.position="absolute",b.style.zIndex="9999",this.aBasePosition=this.getBaseOffset(b),b.style.top=this.toInt(a(b).offset().top)-this.aBasePosition.top+"px",b.style.left=this.toInt(a(b).offset().left)-this.aBasePosition.left+"px",this.$FnMouseDown=a.fnBind(this._mousedown,this,b),this.$FnMouseMove=a.fnBind(this._mousemove,this,b),this.$FnMouseUp=a.fnBind(this._mouseup,this,b),a(this.oHandle).bind("mousedown",this.$FnMouseDown)},_mousedown:function(b,c){"INPUT"!=c.target.tagName&&(this.MouseOffsetY=c.pageY-this.toInt(b.style.top)-this.aBasePosition.top,this.MouseOffsetX=c.pageX-this.toInt(b.style.left)-this.aBasePosition.left,a(b).bind("mousemove",this.$FnMouseMove),a(b).bind("mouseup",this.$FnMouseUp))},_mousemove:function(a,b){var c=b.pageY-this.MouseOffsetY-this.aBasePosition.top,d=b.pageX-this.MouseOffsetX-this.aBasePosition.left;cthis.oOptions.iMaxY&&(c=this.oOptions.iMaxY),dthis.oOptions.iMaxX&&(d=this.oOptions.iMaxX),a.style.top=c+"px",a.style.left=d+"px"},_mouseup:function(b){a(b).unbind("mousemove",this.$FnMouseMove),a(b).unbind("mouseup",this.$FnMouseUp)},toInt:function(a){var b=parseInt(a);return b||0},findNonStatic:function(b){return b?"BODY"==b.tagName?b:a(b).css("position").match(/absolute|relative/i)?b:this.findNonStatic(b.offsetParent):null},getBaseOffset:function(b){var c=this.findNonStatic(b.offsetParent),d=a(c).offset();return{top:d.top,left:d.left}}}),xe.CorePlugin=a.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,c,d,e){this.oApp.registerBrowserEvent(a,b,c,d,e)},$ON_DISABLE_COMMAND:function(a){this.oApp.disableCommand(a,!0)},$ON_ENABLE_COMMAND:function(a){this.oApp.disableCommand(a,!1)},$ON_EXEC_ON_READY_FUNCTION:function(){"function"==typeof this.funcOnReady&&this.funcOnReady()}}),xe.Utils=a.Class({name:"Utils",$init:function(){if(a.browser.msie&&6==a.browser.nVersion)try{document.execCommand("BackgroundImageCache",!1,!0)}catch(b){}},$ON_ATTACH_HOVER_EVENTS:function(b,c){c=c||"hover",b&&a(b).hover(function(){a(this).addClass(c)},function(){a(this).removeClass(c)})}}),xe.XpressRangeManager=a.Class({name:"XpressRangeManager",oWindow:null,$init:function(a){this.oWindow=a||window},$BEFORE_MSG_APP_READY:function(){this.oWindow&&"IFRAME"==this.oWindow.tagName&&(this.oWindow=this.oWindow.contentWindow),this.oApp.exec("ADD_APP_PROPERTY",["getSelection",a.fnBind(this.getSelection,this)]),this.oApp.exec("ADD_APP_PROPERTY",["getEmptySelection",a.fnBind(this.getEmptySelection,this)])},$ON_SET_EDITING_WINDOW:function(a){this.oWindow=a},getEmptySelection:function(){var a=new xe.XpressRange(this.oWindow);return a},getSelection:function(){this.oApp.exec("RESTORE_IE_SELECTION",[]);var a=this.getEmptySelection();try{a.setFromSelection()}catch(b){}return a}}),xe.Hotkey=a.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},(a.browser.msie||a.browser.safari)&&(this.keyhash.hyphen=189,this.keyhash.equal=187,this.keyhash.meta=91)},$ON_MSG_APP_READY:function(){a(this.oApp.getWYSIWYGDocument()||document).keydown(a.fnBind(this.keydown,this))},$ON_REGISTER_HOTKEY:function(b,c,d){d||(d=[]);var e=a.fnBind(this.oApp.exec,this.oApp,c,d);return(b=this.normalize(b))?(this.add(b,e),void 0):!1},add:function(a,b){"undefined"==typeof this.storage[a]?this.storage[a]=[b]:this.storage[a].push(b)},keydown:function(b){var c=[],d=this.keyhash;if(!(a.inArray(b.keyCode,[d.shift,d.ctrl,d.alt,d.meta])>=0)&&(b.shiftKey&&c.push("shift"),b.altKey&&c.push("alt"),b.ctrlKey&&c.push("ctrl"),b.metaKey&&c.push("meta"),c.length&&(1==c.length&&b.metaKey&&(c=["ctrl","meta"]),c.push(b.keyCode),c=c.join("+"),this.storage[c])))return a.each(this.storage[c],function(){this()}),!1},normalize:function(b){var c,d,e,f,g,h=(b||"").toLowerCase().split("+");return c=d=e=f=g=!1,a.each(h,function(){var a=""+this;switch(a){case"shift":c=!0;case"alt":e=!0;case"ctrl":d=!0;case"meta":f=!0;default:g=a}}),g?(h=[],c&&h.push("shift"),e&&h.push("alt"),d&&h.push("ctrl"),(f||d&&!c&&!e)&&h.push("meta"),h.push(this.keyhash[g]||g.toUpperCase().charCodeAt(0)),h.join("+")):""}}),xe.DialogLayerManager=a.Class({name:"DialogLayerManager",aMadeDraggable:null,aOpenedLayers:null,$init:function(){this.aMadeDraggable=[],this.aOpenedLayers=[]},$ON_SHOW_DIALOG_LAYER:function(b,c){b=a.$(b),c=a.$(c)||!1,b&&-1==a.inArray(b,this.aOpenedLayers)&&(this.oApp.exec("POSITION_DIALOG_LAYER",[b]),this.aOpenedLayers[this.aOpenedLayers.length]=b,-1==a.inArray(b,this.aMadeDraggable)?(new xe.DraggableLayer(b,{bModal:c,iMinY:0}),this.aMadeDraggable[this.aMadeDraggable.length]=b):b.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(b){b=a.$(b),b&&(b.style.display="none"),this.aOpenedLayers=a.grep(this.aOpenedLayers,function(a){return a!=b})},$ON_SET_DIALOG_LAYER_POSITION:function(a,b,c){a.style.top=b,a.style.left=c}}),xe.ActiveLayerManager=a.Class({name:"ActiveLayerManager",oCurrentLayer:null,$ON_TOGGLE_ACTIVE_LAYER:function(a,b,c,d,e){a==this.oCurrentLayer?this.oApp.exec("HIDE_ACTIVE_LAYER",[]):(this.oApp.exec("SHOW_ACTIVE_LAYER",[a,d,e]),b&&this.oApp.exec(b,c))},$ON_SHOW_ACTIVE_LAYER:function(b,c,d){b=a.$(b),this.sOnCloseCmd=c,this.aOnCloseParam=d;var e=this.oCurrentLayer;b!=e&&(this.oApp.exec("HIDE_ACTIVE_LAYER",[]),b.style.display="block",this.oCurrentLayer=b)},$ON_HIDE_ACTIVE_LAYER:function(){var a=this.oCurrentLayer;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=a.Class({name:"StringConverterManager",oConverters:null,$init:function(){this.oConverters={}},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["applyConverter",a.fnBind(this.applyConverter,this)]),this.oApp.exec("ADD_APP_PROPERTY",["addConverter",a.fnBind(this.addConverter,this)])},applyConverter:function(a,b){var c=this.oConverters[a];if(!c)return b;for(var d=0;df;f++)if(e.test(c[f].className)){var g=RegExp.$1;if(null!=this.htUIList[g])continue;this.htUIList[g]=a(">*:first-child",c[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",a.fnBind(this.getToolbarButtonByUIName,this)])},$ON_EVENT_TOOLBAR_MOUSEOVER:function(b){"BUTTON"==b.target.tagName&&a(b.target).addClass("hover").parent("span").addClass("hover")},$ON_EVENT_TOOLBAR_MOUSEOUT:function(b){"BUTTON"==b.target.tagName&&a(b.target).removeClass("hover").parent("span").removeClass("hover")},$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER:function(a,b,c,d,e,f){this.oApp.exec("TOGGLE_ACTIVE_LAYER",[a,"MSG_TOOLBAR_LAYER_SHOWN",[a,b,c,d],e,f])},$ON_MSG_TOOLBAR_LAYER_SHOWN:function(a,b,c,d){this.oApp.exec("POSITION_TOOLBAR_LAYER",[a,b]),c&&this.oApp.exec(c,d)},$ON_SHOW_TOOLBAR_ACTIVE_LAYER:function(a,b,c,d){this.oApp.exec("SHOW_ACTIVE_LAYER",[a,b,c]),this.oApp.exec("POSITION_TOOLBAR_LAYER",[a,d])},$ON_ENABLE_UI:function(b){var c=this.htUIList[b];if(c){a(c).removeClass("off"),c.disabled=!1;var d="";if(this.aUICmdMap[b])for(var e=0;ef&&(b.style.left=f-e-5+"px")}},getToolbarButtonByUIName:function(a){return this.htUIList[a]}}),xe.XE_EditingAreaManager=a.Class({name:"XE_EditingAreaManager",oActivePlugin:null,oIRField:null,bIsDirty:!1,$init:function(b,c,d,e,f){this.sInitialMode=b,this.oIRField=a.$(c),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(b){b=a.$(b)||document,this.elEditingAreaContainer=a("DIV.xpress_xeditor_editing_area_container",b).get(0),this.elEditingAreaSkipUI=a("A.skip",b).get(0)},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["elEditingAreaContainer",this.elEditingAreaContainer]),this.oApp.exec("ADD_APP_PROPERTY",["getIR",a.fnBind(this.getIR,this)]),this.oApp.exec("ADD_APP_PROPERTY",["setIR",this.setIR]),this.oApp.exec("ADD_APP_PROPERTY",["getEditingMode",a.fnBind(this.getEditingMode,this)])},$ON_MSG_APP_READY:function(){this.oApp.exec("CHANGE_EDITING_MODE",[this.sInitialMode,!0]),this.oApp.exec("LOAD_IR_FIELD",[!1]),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){var c=this._oPrevActivePlugin.getIR();this.oApp.exec("SET_IR",[c]),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&&"function"==typeof this.oActivePlugin.setIR&&this.oActivePlugin.focus()},$BEFORE_SET_IR:function(a,b){b=b||!1,b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_SET_IR:function(a){this.oActivePlugin&&"function"==typeof this.oActivePlugin.setIR&&this.oActivePlugin.setIR(a)},$AFTER_SET_IR:function(a,b){b=b||!1,b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_REGISTER_EDITING_AREA:function(a){this.oEditingMode[a.sMode]=a,this.attachDocumentEvents(a.oEditingArea)},$ON_MSG_EDITING_AREA_RESIZE_STARTED:function(){this.oActivePlugin.elEditingArea.style.display="none",this.iStartingHeight=parseInt(this.elEditingAreaContainer.style.height)},$ON_RESIZE_EDITING_AREA:function(a,b){var c=parseInt(a),d=parseInt(b);c"]);break;default:return}a.preventDefault(),a.stopPropagation()}},$ON_EVENT_EDITING_AREA_KEYUP:function(a){229==a.keyCode||13==a.keyCode||a.altKey||a.ctrlKey||a.keyCode>=33&&a.keyCode<=40||16==a.keyCode||this._recordUndo(a)},$ON_PASTE_HTML:function(b,c){if(this.oApp.getEditingMode()==this.sMode){var d=c||this.oApp.getSelection();if(d.pasteHTML(b),!a.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(){this._oIERange&&(this._oIERange.select(),this._oPrevIERange=this._oIERange,this._oIERange=null)},initIframe:function(){try{if(this.doc=this.iframe.contentWindow.document,null==this.doc||"about:blank"==this.doc.location.href)throw new Error("Access denied");this._enableWYSIWYG(),this.status=xe.PLUGIN_STATUS.READY}catch(b){if(!(this._nIFrameReadyCount-->0))throw"iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ";setTimeout(a.fnBind(this.initIframe,this),100)}},getIR:function(){var a,b=this.doc.body.innerHTML;return a=this.oApp.applyConverter?this.oApp.applyConverter(this.sMode+"_TO_IR",b):b},setIR:function(b){var c;c=this.oApp.applyConverter?this.oApp.applyConverter("IR_TO_"+this.sMode,b):b,this.doc.body.innerHTML=c,a.browser.mozilla&&""==this.doc.body.innerHTML&&(this.doc.body.innerHTML="
    ")},getWindow:function(){return this.iframe.contentWindow},getDocument:function(){return this.iframe.contentWindow.document},focus:function(){},_recordUndo:function(a){var b=new Date;b-this.iLastUndoRecorded"),""==h.innerHTML&&(h.innerHTML="
    "),h.nextSibling&&"BR"==h.nextSibling.tagName&&h.parentNode.removeChild(h.nextSibling),b.selectNodeContents(h),b.collapseToStart(),b.select(),this.oApp.exec("CHECK_STYLE_CHANGE",[])}else b.removeStringBookmark(c)}}}),xe.XE_WYSIWYGStyler=a.Class({name:"XE_WYSIWYGStyler",$PRECONDITION:function(){return"WYSIWYG"==this.oApp.getEditingMode()},$ON_SET_WYSIWYG_STYLE:function(b){var c=this.oApp.getSelection();if(c.collapsed){var d=this.oApp.getWYSIWYGDocument().createElement("SPAN");c.insertNode(d),d.innerHTML=unescape("%uFEFF");var e;for(var f in b)e=b[f],"string"==typeof e&&(d.style[f]=e);return c.selectNodeContents(d),c.collapseToEnd(),c._window.focus(),c._window.document.body.focus(),c.select(),a.browser.mozilla&&3==a.browser.nVersion&&(d.innerHTML=""),void 0}this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["FONT STYLE"]),c.styleRange(b),c._window.focus(),c.select(),this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["FONT STYLE"])}}),xe.XE_WYSIWYGStyleGetter=a.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$/)?Math.ceil(parseInt(a)/parseInt(b.fontSize)*10)/10:a}},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"WYSIWYG"!=this.oApp.getEditingMode()?!1:!0},$ON_MSG_APP_READY:function(){this.oDocument=this.oApp.getWYSIWYGDocument(),this.oApp.exec("ADD_APP_PROPERTY",["getCurrentStyle",a.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(b){(8==b.keyCode||b.keyCode>=33&&b.keyCode<=40||45==b.keyCode||46==b.keyCode)&&(this.hKeyUp&&clearTimeout(this.hKeyUp),this.hKeyUp=setTimeout(a.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();for(var 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={};for(var b in this.oStyleMap)a[b]="Value"==this.oStyleMap[b].type?"":0; return a},_getStyle:function(){var a,b,c=this.oApp.getSelection(),d=function(a){return a.childNodes&&0!=a.childNodes.length?!1:!0},e=c.getNodes(!1,d);a=0==e.length?this._getStyleOf(c.commonAncestorContainer):this._getStyleOf(e[0]);for(b in a)this.oStyleMap[b].converter&&(a[b]=this.oStyleMap[b].converter(a[b],a)),this.oStyle[b]!=a[b]&&this.oApp.exec("MSG_STYLE_CHANGED",[b,a[b]]);this.oStyle=a},_getStyleOf:function(b){var c=this._getBlankStyle();if(!b)return c;3==b.nodeType&&(b=b.parentNode);var d,e=a(b);for(var f in this.oStyle)if(d=this.oStyleMap[f],d.type&&"Value"==d.type){if(d.css){var g=e.css(d.css);"fontFamily"==f&&(g=g.split(/,/)[0]),c[f]=g}else if(d.command)try{c[f]=this.oDocument.queryCommandState(d.command)}catch(h){}}else if(d.command)try{c[f]=this.oDocument.queryCommandState(d.command)?1:0}catch(h){}return c}}),xe.XE_FontSizeWithSelectUI=a.Class({name:"XE_FontSizeWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFontSizeSelect=a("SELECT.xpress_xeditor_ui_fontSize_select",b).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){"fontSize"==a&&(this.elFontSizeSelect.value=b,this.elFontSizeSelect.selectedIndex<0&&(this.elFontSizeSelect.selectedIndex=0))},$ON_SET_FONTSIZE_FROM_SELECT_UI:function(){var a=this.elFontSizeSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontSize:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_FontNameWithSelectUI=a.Class({name:"XE_FontNameWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFontNameSelect=a("SELECT.xpress_xeditor_ui_fontName_select",b).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){"fontFamily"==a&&(this.elFontNameSelect.value=b.toLowerCase(),this.elFontNameSelect.selectedIndex<0&&(this.elFontNameSelect.selectedIndex=0))},$ON_SET_FONTNAME_FROM_SELECT_UI:function(){var a=this.elFontNameSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontFamily:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_LineHeight=a.Class({name:"XE_LineHeight",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(){},$ON_SET_LINEHEIGHT:function(a){this.setLineHeight(a)},getLineHeight:function(){var b,c,d,e=this._getSelectedNodes(!1);if(0==e.length)return-1;var f=e.length;0==f?d=-1:(c=this._getLineWrapper(e[0]),d=this._getWrapperLineheight(c));var g=this.oSelection.getStartNode();if(d>0)for(var h=1;f>h;h++)if(!this._isChildOf(e[h],b)&&e[h]&&(b=this._getLineWrapper(e[h]),b!=c)){if(curHeight=this._getWrapperLineheight(b),curHeight!=d){d=-1;break}c=b}b=this._getLineWrapper(e[f-1]);var i=this.oSelection.getEndNode();return selectText=a.fnBind(function(a,b){this.oSelection.setEndNodes(a,b),this.oSelection.select()},this,g,i),setTimeout(selectText,100),d},setLineHeight:function(b){function c(a,b){if(!a)try{a=thisRef.oSelection.surroundContentsWithNewNode("P")}catch(c){a=thisRef.oSelection.surroundContentsWithNewNode("DIV")}return a.style.lineHeight=b,a}function d(a){for(;a&&"BODY"!=a.tagName;)a=xe.DOMFix.parentNode(a);return a?!0:!1}thisRef=this;var e=this._getSelectedNodes(!1);if(0!=e.length){var f,g,h=e.length;this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["LINEHEIGHT"]),g=this._getLineWrapper(e[0]),g=c(g,b);for(var i=g,j=g,k=1;h>k;k++){try{if(!d(xe.DOMFix.parentNode(e[k])))continue}catch(l){continue}this._isChildOf(e[k],f)||(f=this._getLineWrapper(e[k]),f!=g&&(f=c(f,b),g=f))}j=f||i,setTimeout(a.fnBind(function(a,b){this.oSelection.setEndNodes(a,b),this.oSelection.select(),this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["LINEHEIGHT"])},this,i,j),100)}},_getSelectedNodes:function(a){a||(this.oSelection=this.oApp.getSelection()),this.oSelection.collapsed&&this.oSelection.selectNode(this.oSelection.commonAncestorContainer);var b=this.oSelection.getTextNodes();if(0==b.length){var c=this.oSelection.getStartNode();c?b[0]=c:b=[]}return b},_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&&"BODY"!=a.tagName;){if(a==b)return!0;a=xe.DOMFix.parentNode(a)}return!1},_getLineWrapper:function(a){var b=this.oApp.getEmptySelection();b.selectNode(a);var c,d,e,f,g=b.getLineInfo(),h=g.oStart,i=g.oEnd,j=null;return c=h.oNode,e=h.oLineBreaker,d=i.oNode,f=i.oLineBreaker,this.oSelection.setEndNodes(c,d),e==f&&("P"==e.tagName||"DIV"==e.tagName?j=e:this.oSelection.setEndNodes(e.firstChild,e.lastChild)),j}}),xe.XE_LineHeightWithSelectUI=a.Class({name:"XE_LineHeightWithSelectUI",_assignHTMLObjects:function(b){this.elLineHeightSelect=a("SELECT.xpress_xeditor_ui_lineHeight_select",b).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){"lineHeight"==a&&(this.elLineHeightSelect.value=b,this.elLineHeightSelect.selectedIndex<0&&(this.elLineHeightSelect.selectedIndex=0))},$ON_SET_LINEHEIGHT_FROM_SELECT_UI:function(){var a=this.elLineHeightSelect.value;a&&(this.elLineHeightSelect.selectedIndex=0,this.oApp.exec("SET_LINEHEIGHT",[a]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}).extend(xe.XE_LineHeight),xe.XE_ColorPalette=a.Class({name:"XE_ColorPalette",rxRGBColorPattern:/rgb\((\d+), ?(\d+), ?(\d+)\)/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elColorPaletteLayer=a("UL.xpress_xeditor_color_palette",b).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){function b(a){var b=parseInt(a).toString(16);return b.length<2&&(b="0"+b),b.toUpperCase()}if(this.rxRGBColorPattern.test(a)){var c=b(RegExp.$1),d=b(RegExp.$2),e=b(RegExp.$3);a="#"+c+d+e}this.oApp.exec(this.sCallbackCmd,[a])},$ON_EVENT_MOUSEUP_COLOR_PALETTE:function(a){var b=a.target;b.style.backgroundColor&&this.oApp.exec("COLOR_PALETTE_APPLY_COLOR",[b.style.backgroundColor])}}),xe.XE_FontColor=a.Class({name:"XE_FontColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_fontcolor_layer",b).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["fontColor","click","TOGGLE_FONTCOLOR_LAYER"])},$ON_TOGGLE_FONTCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_FONTCOLOR",this.elDropdownLayer]])},$ON_APPLY_FONTCOLOR:function(a){return this.rxColorPattern.test(a)?(this.oApp.exec("SET_WYSIWYG_STYLE",[{color:a}]),this.oApp.exec("HIDE_ACTIVE_LAYER"),void 0):(alert(this.oApp.$MSG("XE_FontColor.invalidColorCode")),void 0)}}),xe.XE_BGColor=a.Class({name:"XE_BGColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_bgcolor_layer",b).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["bgColor","click","TOGGLE_BGCOLOR_LAYER"]),this.oApp.registerBrowserEvent(this.elDropdownLayer,"click","EVENT_APPLY_BGCOLOR",[])},$ON_TOGGLE_BGCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_BGCOLOR",this.elDropdownLayer]])},$ON_EVENT_APPLY_BGCOLOR:function(a){var b=a.target;if("SPAN"==b.tagName&&(b=b.parentNode),"BUTTON"==b.tagName){var c,d;c=b.style.backgroundColor,d=b.style.color,this.oApp.exec("APPLY_BGCOLOR",[c,d])}},$ON_APPLY_BGCOLOR:function(a,b){if(!this.rxColorPattern.test(a))return alert(this.oApp.$MSG("XE_BGColor.invalidColorCode")),void 0;var c={backgroundColor:a};b&&(c.color=b),this.oApp.exec("SET_WYSIWYG_STYLE",[c]),this.oApp.exec("HIDE_ACTIVE_LAYER")}}),xe.XE_Quote=a.Class({name:"XE_Quote",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_blockquote_layer",b).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){var b=a.target;if("BUTTON"==b.tagName){var c=b.parentNode.className;"q8"!=c?this._wrapBlock("BLOCKQUOTE",c):this._unwrapBlock("BLOCKQUOTE"),this.oApp.exec("HIDE_ACTIVE_LAYER",[])}},_unwrapBlock:function(a){for(var b=this.oApp.getSelection(),c=b.commonAncestorContainer;c&&c.tagName!=a;)c=c.parentNode;if(c){for(;c.firstChild;)c.parentNode.insertBefore(c.firstChild,c);c.parentNode.removeChild(c)}},_wrapBlock:function(a,b){var c,d,e=this.oApp.getSelection(),f=e.getLineInfo(),g=f.oStart,h=f.oEnd,i=/BODY|TD|LI/i;c=g.bParentBreak&&!i.test(g.oLineBreaker.tagName)?g.oNode.parentNode:g.oNode,d=h.bParentBreak&&!i.test(h.oLineBreaker.tagName)?h.oNode.parentNode:h.oNode,e.setStartBefore(c),e.setEndAfter(d);var j=this._expandToTableStart(e,d);j&&(d=j,e.setEndAfter(j)),j=this._expandToTableStart(e,c),j&&(c=j,e.setStartBefore(j)),j=c;for(var k=e.commonAncestorContainer;j&&j!=k&&j.parentNode!=k;)j=j.parentNode;oFormattingNode=e._document.createElement(a),b&&(oFormattingNode.className=b),j==k?k.insertBefore(oFormattingNode,k.firstChild):k.insertBefore(oFormattingNode,j),e.setStartAfter(oFormattingNode),e.setEndAfter(d),e.surroundContents(oFormattingNode);for(var l,m=oFormattingNode.childNodes,n=m.length-1;n>=0;n--)if(3==m[n].nodeType||"BR"==m[n].tagName){var o=e._document.createElement("P");for(l=m[n].nextSibling;n>=0&&m[n]&&(3==m[n].nodeType||"BR"==m[n].tagName);)o.insertBefore(m[n--],o.firstChild);oFormattingNode.insertBefore(o,l),n++}if(oFormattingNode&&oFormattingNode.parentNode){var o=e._document.createElement("P");o.innerHTML=unescape("
    "),oFormattingNode.parentNode.insertBefore(o,oFormattingNode.nextSibling)}return this.oApp.exec("RECORD_UNDO_ACTION",["Block Quote"]),oFormattingNode},_expandToTableStart:function(a,b){for(var c=a.commonAncestorContainer,d=null,e=!1;b&&!e;){if(b==c&&(e=!0),/TBODY|TFOOT|THEAD|TR/i.test(b.tagName)){d=this._getTableRoot(b);break}b=b.parentNode}return d},_getTableRoot:function(a){for(;a&&"TABLE"!=a.tagName;)a=a.parentNode;return a}}),xe.XE_SCharacter=a.Class({name:"XE_SCharacter",$init:function(b){this.bIE=a.browser.msie,this._assignHTMLObjects(b),this.charSet=[],this.charSet[0]=unescape("FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[1]=unescape("%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[2]=unescape("3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[3]=unescape("3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[4]=unescape("0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" "),this.charSet[5]=unescape("3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6").replace(/(\S{4})/g,function(a){return"%u"+a}).split(" ")},_assignHTMLObjects:function(b){b=a.$(b)||document,this.elDropdownLayer=a("DIV.xpress_xeditor_sCharacter_layer",b).get(0),this.oTextField=a("INPUT",this.elDropdownLayer).get(0),this.oInsertButton=a("+ BUTTON",this.oTextField).get(0),this.aCloseButton=a("BUTTON.close",this.elDropdownLayer).get(),this.aSCharList=a(".list",this.elDropdownLayer).get();var c=a(">UL",this.elDropdownLayer).get(0);this.aLabelA=a("A",c).get()},$ON_MSG_APP_READY:function(){var b=a.fnBind(this.oApp.exec,this.oApp,"INSERT_SCHARACTERS",[this.oTextField.value]);a(this.oInsertButton).click(b),this.oApp.exec("SET_SCHARACTER_LIST",[this.charSet]);for(var c=0;cd;d++)c[d]=document.createElement("LI"),c[d].innerHTML='",this.aSCharList[a].appendChild(c[d])}},_stopBrowserEvent:function(b,c){a(b).bind(c,function(a){a.stopPropagation(),a.preventDefault()})}}),xe.XE_UndoRedo=a.Class({name:"XE_UndoRedo",actionHistory:null,oCurStateIdx:null,iMinimumSizeChange:10,sBlankContentsForFF:"
    ",$init:function(){this.aUndoHistory=[],this.oCurStateIdx={nIdx:0,nStep:0}},$PRECONDITION:function(a){if(a.match(/_DO_RECORD_UNDO_HISTORY_AT$/))return!0;try{if("WYSIWYG"!=this.oApp.getEditingMode())return!1}catch(b){return!1}return!0},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT",[this.oCurStateIdx,"","",null])},$ON_MSG_APP_READY:function(){this.bFF=a.browser.mozilla,this.oApp.exec("ADD_APP_PROPERTY",["getUndoHistory",a.fnBind(this.getUndoHistory,this)]),this.oApp.exec("ADD_APP_PROPERTY",["getUndoStateIdx",a.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(){if(this.oApp.exec("DO_RECORD_UNDO_HISTORY",["KEYPRESS",!1,!1,1]),0!=this.oCurStateIdx.nIdx){if(this.oCurStateIdx.nStep>0)this.oCurStateIdx.nStep--;else{var a=this.aUndoHistory[this.oCurStateIdx.nIdx];this.oCurStateIdx.nIdx--,a.nTotalSteps>1?this.oCurStateIdx.nStep=0:(a=this.aUndoHistory[this.oCurStateIdx.nIdx],this.oCurStateIdx.nStep=a.nTotalSteps-1)}this.oApp.exec("RESTORE_UNDO_HISTORY",[this.oCurStateIdx.nIdx,this.oCurStateIdx.nStep]),this.oApp.exec("CHECK_STYLE_CHANGE",[])}},$ON_REDO:function(){if(!(this.oCurStateIdx.nIdx>=this.aUndoHistory.length)){var a=this.aUndoHistory[this.oCurStateIdx.nIdx];this.oCurStateIdx.nIdx==this.aUndoHistory.length-1&&this.oCurStateIdx.nStep>=a.nTotalSteps-1||(this.oCurStateIdx.nStep"+b+"    ";this.oSelection.pasteHTML(e)}else{var f=Math.ceil(1e4*Math.random()),g=this.sATagMarker+f,h=""==b?["unlink"]:["createLink",!1,g+b];this.oApp.exec("EXECCOMMAND",h);try{this.oSelection.setFromSelection()}catch(i){}var j=this.oApp.getWYSIWYGDocument();a(j.body.getElementsByTagName("A")).filter('[href^="'+g+'"]').attr("href",function(){var b=new RegExp("^"+g.replace(/([\.\\])/g,"\\$1"),"i");return d?a(this).attr("target",d):a(this).removeAttr("target"),this.href.replace(b,"")})}this.oApp.exec("HIDE_ACTIVE_LAYER"),setTimeout(a.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){13==a.keyCode&&(this.oApp.exec("XE_APPLY_HYPERLINK"),a.preventDefault(),a.stopPropagation())}}),xe.XE_Table=a.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(b){var c=null;this.elDropdownLayer=a("DIV.xpress_xeditor_table_layer",b).get(0),this.welDropdownLayer=a(this.elDropdownLayer),c=a("INPUT",this.elDropdownLayer).get(),this.oRowInput=c[0],this.oColumnInput=c[1],this.oBorderWidthInput=c[2],this.oBorderColorInput=c[3],this.oBGColorInput=c[4],c=a("BUTTON",this.elDropdownLayer).get(),this.oButton_AddRow=c[0],this.oButton_RemoveRow=c[1],this.oButton_AddColumn=c[2],this.oButton_RemoveColumn=c[3],this.oButton_IncBorderWidth=c[4],this.oButton_DecBorderWidth=c[5],this.oButton_BorderColorPreview=c[6],this.oButton_BorderColor=c[7],this.oButton_BGColorPreview=c[8],this.oButton_BGColor=c[9],this.oButton_Insert=c[10],this.oButton_Cancel=c[11],this.oSampleTable=a("TABLE",this.elDropdownLayer).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["table","click","ST_TOGGLE_TOOLBAR_LAYER"]),this.oApp.registerBrowserEvent(this.oRowInput,"change","ST_SET_ROW_NUM",[null,0]),this.oApp.registerBrowserEvent(this.oColumnInput,"change","ST_SET_COLUMN_NUM",[null,0]),this.oApp.registerBrowserEvent(this.oBorderWidthInput,"change","ST_SET_BORDER_WIDTH",[null,0]),this.oApp.registerBrowserEvent(this.oButton_AddRow,"click","ST_ADD_ROW"),this.oApp.registerBrowserEvent(this.oButton_RemoveRow,"click","ST_REMOVE_ROW"),this.oApp.registerBrowserEvent(this.oButton_AddColumn,"click","ST_ADD_COLUMN"),this.oApp.registerBrowserEvent(this.oButton_RemoveColumn,"click","ST_REMOVE_COLUMN"),this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth,"click","ST_INC_BORDER_WIDTH"),this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth,"click","ST_DEC_BORDER_WIDTH"),this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview,"click","ST_TOGGLE_BORDER_COLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BGColorPreview,"click","ST_TOGGLE_BGCOLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BorderColor,"click","ST_TOGGLE_BORDER_COLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_BGColor,"click","ST_TOGGLE_BGCOLOR_LAYER"),this.oApp.registerBrowserEvent(this.oButton_Insert,"click","ST_INSERT_TABLE"),this.oApp.registerBrowserEvent(this.oButton_Cancel,"click","ST_CLOSE"),this.oApp.exec("ST_SET_BORDER_COLOR",["#CCCCCC"]),this.oApp.exec("ST_SET_BGCOLOR",["#FFFFFF"])},$ON_ST_TOGGLE_TOOLBAR_LAYER:function(){this.oApp.exec("RECORD_UNDO_ACTION_FORCED",["KEYPRESS"]),this._showNewTable(),this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_ST_ADD_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,1])},$ON_ST_REMOVE_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,-1])},$ON_ST_ADD_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,1])},$ON_ST_REMOVE_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,-1])},$ON_ST_SET_ROW_NUM:function(a,b){a=a||parseInt(this.oRowInput.value),b=b||0,a+=b,athis.iMaxRows&&(a=this.iMaxRows),this.oRowInput.value=a,this._showNewTable()},$ON_ST_SET_COLUMN_NUM:function(a,b){a=a||parseInt(this.oColumnInput.value),b=b||0,a+=b,athis.iMaxColumns&&(a=this.iMaxColumns),this.oColumnInput.value=a,this._showNewTable()},$ON_ST_INSERT_TABLE:function(){var a=this._getTableString();this.oApp.exec("PASTE_HTML",[a]),this.oApp.exec("ST_CLOSE",[])},$ON_ST_CLOSE:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",[])},$ON_ST_SET_BORDER_WIDTH:function(a,b){a=a||parseInt(this.oBorderWidthInput.value),b=b||0,a+=b,athis.iMaxBorderWidth&&(a=this.iMaxBorderWidth),this.oBorderWidthInput.value=a,this._showNewTable()},$ON_ST_INC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,1])},$ON_ST_DEC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,-1])},$ON_ST_TOGGLE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.hasClass("p1")?this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",[]):this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER",[])},$ON_ST_SHOW_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.addClass("p1"),this.welDropdownLayer.removeClass("p2"),this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BORDER_COLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1"),this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_TOGGLE_BGCOLOR_LAYER:function(){this.welDropdownLayer.hasClass("p2")?this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",[]):this.oApp.exec("ST_SHOW_BGCOLOR_LAYER",[])},$ON_ST_SHOW_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1"),this.welDropdownLayer.addClass("p2"),this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BGCOLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p2"),this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_SET_BORDER_COLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BORDER_COLOR",[a]),this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",[])},$ON_ST_SET_BORDER_COLOR:function(a){this.oBorderColorInput.value=a,this.oButton_BorderColorPreview.style.backgroundColor=a,this._showNewTable()},$ON_ST_SET_BGCOLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BGCOLOR",[a]),this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",[])},$ON_ST_SET_BGCOLOR:function(a){this.oBGColorInput.value=a,this.oButton_BGColorPreview.style.backgroundColor=a,this._showNewTable()},_showNewTable:function(){var a=document.createElement("DIV");a.innerHTML=this._getTableString();var b=a.firstChild;this.oSampleTable.parentNode.insertBefore(b,this.oSampleTable),this.oSampleTable.parentNode.removeChild(this.oSampleTable),this.oSampleTable=b},_getTableString:function(){var b=this.oBorderColorInput.value,c=this.oBGColorInput.value,d=this.oBorderWidthInput.value,e="";e=a.browser.msie?"


     

    ',g='',h=this.oColumnInput.value,i=0;h>i;i++)g+=e;g+="\n";var j=this.oRowInput.value;f+="";for(var i=0;j>i;i++)f+=g;return f+="",f+="
    "}}),xe.XE_EditingModeToggler=a.Class({name:"XE_EditingModeToggler",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){b=a.$(b)||document,this.elModeToggleButton=a("BUTTON.xpress_xeditor_mode_toggle_button",b).get(0),this.welModeToggleButton=a(this.elModeToggleButton)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elModeToggleButton,"click","EVENT_TOGGLE_EDITING_MODE",[])},$ON_EVENT_TOGGLE_EDITING_MODE:function(){"WYSIWYG"==this.oApp.getEditingMode()?this.oApp.exec("CHANGE_EDITING_MODE",["HTMLSrc"]):this.oApp.exec("CHANGE_EDITING_MODE",["WYSIWYG"])},$ON_CHANGE_EDITING_MODE:function(a){"HTMLSrc"==a?(this.welModeToggleButton.addClass("active").parent("span").addClass("active"),this.oApp.exec("DISABLE_ALL_UI",[])):(this.welModeToggleButton.removeClass("active").parent("span").removeClass("active"),this.oApp.exec("ENABLE_ALL_UI",[])) -}}),xe.XE_Editorresize=a.Class({name:"XE_Editorresize",$init:function(b,c){this.inputArea=a(".xpress_xeditor_editing_area_container",b).get(0),this.oVerticalResizer=a(".xpress_xeditor_editingArea_verticalResizer",b).get(0),this.oCheckBox=a("#editorresize",b).get(0),this.oIframe=c;var d=this;a(c).load(function(){d.oIframeBody=a(c).contents().find("body")})},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.oCheckBox,"change","XE_TOGGLE_EDITOR_RESIZE")},$ON_XE_TOGGLE_EDITOR_RESIZE:function(){1==this.oCheckBox.checked?(void 0==this._prevHeight&&(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"):(a(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(){var a=this;setTimeout(function(){a.inputArea.style.height=a.oIframe.style.height=a.oIframeBody[0].scrollHeight+"px"},0)}});var d={"XE_EditingAreaManager.onExit":"%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.","XE_FontColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff","XE_BGColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff","XE_Hyperlink.invalidURL":"%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4."};xe.XpressCore.oMessageMap=d;regex_handler=/<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/gi,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+)/gi,regex_quote_attr=/([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g;var e=("a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style".split(","),"area,br,col,embed,hr,img,input,param,base,meta,link,basefont,isindex".split(","));xe.XE_XHTMLFormatter=a.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(b){var c=[];if(a.browser.msie&&(b=b.replace(regex_jquery,""),b=b.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\/-]+)(.*?)>/gi,b=b.replace(regex,function(b,d,f,g){var h="";if(d=d||"",f=f.toLowerCase(),g=a.trim(g||""),d){var i=[],j="";if(a.inArray(f,e)>=0)return"";if(!c.length)return"";do j=c.pop(),j.tag==f&&"deleted"!=j.state&&i.push("");while(c.length&&j.tag!=f);return i.join("")}if(a.inArray(f,e)>=0){var k=g.length;return"br"==f&&(g=""),g&&"/"==g.substring(k-1,k)||(g+=" /"),"<"+f+" "+a.trim(g)+">"}return c.push({tag:f,state:h}),"<"+d+f+(g?" "+g:"")+">"}),c.length){var d="";do d=c.pop(),"deleted"!=d.state&&(b+="");while(c.length)}return regex=/<\/p>[ \t]*(\n)?/gi,b=b.replace(regex,"

    \n")},IR_TO:function(a){return a}}),xe.XE_Extension=a.Class({name:"XE_Extension",seq:"",last_doc:"",$init:function(a,b){this.seq=b,this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_extension_layer",b).get(0)},_removeAttrs:function(a){return a},_addEvent:function(){if("WYSIWYG"==this.oApp.getEditingMode()){var b=this.oApp.getWYSIWYGDocument(),c=this.seq,d=function(){var b=a(this),d=b.attr("editor_component");d&&a.isFunction(openComponent)&&(editorPrevNode=b.get(0),openComponent(d,c))};a(b).find("img,div[editor_component]").each(function(){var c=a(this);"IMG"!=this.nodeName||c.attr("editor_component")||c.attr("widget")||c.attr("editor_component","image_link"),this.last_doc!=b&&(c.unbind("dblclick.widget").bind("dblclick.widget",d),this.last_doc=b)})}},$ON_MSG_APP_READY:function(){var b=this.oApp;b.exec("REGISTER_UI_EVENT",["extension","click","TOGGLE_EXTENSION_LAYER"]);var c=function(){b.exec("HIDE_ACTIVE_LAYER",[])};a("a",this.elDropdownLayer).each(function(){var b=a(this);b.attr("component_onclick_event_added")||(b.click(c),b.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=a.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=a("autosave_message")},$ON_MSG_APP_READY:function(){var b=a(this.form._saved_doc_title),c=a(this.form._saved_doc_content),d=a.trim(b.val()),e=a.trim(c.val());(d||e)&&(confirm(this.form._saved_doc_message.value)?(a(this.form.title).val(d),this.oApp.setIR(e),"function"==typeof editorGetAutoSavedDoc&&editorGetAutoSavedDoc(this.form)):editorRemoveSavedDoc()),editorEnableAutoSave(this.form,a(this.form).attr("editor_sequence")),this.oApp.exec("REGISTER_HOTKEY",["ctrl+shift+s","AUTO_SAVE"])},$ON_AUTO_SAVE:function(){_editorAutoSave()}}),xe.XE_FormatWithSelectUI=a.Class({name:"XE_FormatWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFormatSelect=a("SELECT.xpress_xeditor_ui_format_select",b).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 b=this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");return b?(a.browser.msie&&/([0-9])/.test(b)&&(b="h"+RegExp.$1),this.elFormatSelect.value=b.toLowerCase(),this.elFormatSelect.selectedIndex<0&&(this.elFormatSelect.selectedIndex=0),this.elFormatSelect.value!=b.toLowerCase()&&(this.elFormatSelect.selectedIndex=0),void 0):this.elFormatSelect.selectedIndex=0},$ON_SET_FORMAT_FROM_SELECT_UI:function(){var b=this.elFormatSelect.value;b&&(a.browser.msie&&(b="<"+b+">"),this.oApp.exec("EXECCOMMAND",["FormatBlock",!1,b]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_Table=a.Class({_startSel:null,_endSel:null,$ON_MSG_APP_READY:function(){this._doc=a(this.oApp.getWYSIWYGDocument()),this.$FnMouseDown=a.fnBind(this._mousedown,this),this.$FnMouseUp=a.fnBind(this._mouseup,this),this.$FnMouseMove=a.fnBind(this._mousemove,this),this._doc.mousedown(this.$FnMouseDown),this._startSel=null,this._endSel=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 b="",c=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),d=this;if(c.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Merge"]),c.each(function(){b+=a(this).html()}).eq(0).html(b);var e=0;c.eq(0).nextAll("td,th").andSelf().filter(".xe_selected_cell").each(function(){e+=d._getSpan(this,"col")});var f=(this._getRect(c.eq(0)),c.eq(0).parent("tr")),g=c.eq(c.length-1).parent("tr"),h=c.parents("table").eq(0).find("tr"),i=h.index(g.get(0))-h.index(f.get(0))+this._getSpan(c.eq(c.length-1),"row");c.eq(0).attr("colSpan",e).attr("rowSpan",i),c.slice(1).remove()}},$ON_CELL_SPLIT_BY_ROW:function(){var b=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),c=b.parents("table").eq(0),d=this;if(b.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Row"]);var e=this._getRect(b.eq(0)).top,f=this._getRect(b.eq(b.length-1)).bottom;(b=c.find("td,th").filter(function(){var b=d._getRect(a(this));return!(b.bottom<=e||b.top>=f)})).filter(".xe_selected_cell").each(function(){var c=a(this),e=c.parent("tr"),f=d._getSpan(c,"row"),g=d._getRect(c),h=[],i=c.clone().html("
    "),j=1,k=1;f>1?(j=Math.ceil(f/2),k=f-j,h.push(function(){c.attr("rowSpan",j)}),i.attr("rowSpan",k)):(b.filter(function(){if(c.get(0)==this)return!1;var b=a(this),e=d._getRect(b);return e.bottom<=g.top||e.top>=g.bottom?!1:!0}).each(function(){var b=a(this),c=d._getSpan(b,"row")+1;h.push(function(){b.attr("rowSpan",c)})}),a.browser.msie?e.after(e.clone().empty().get(0).outerHTML):e.after(e.clone().empty()));var l=e.nextAll("tr");if(l.length){var m=l.eq(j-1).children("td,th").filter(function(){return d._getRect(a(this)).left>g.left});a.browser.msie?m.length?m.eq(0).before(i.get(0).outerHTML):l.eq(j-1).append(i.get(0).outerHTML):m.length?m.slice(0,1).before(i):l.slice(j-1,1).append(i)}else e.after(e.clone().empty().append(i));a.each(h,function(){this()})})}},$ON_CELL_SPLIT_BY_COL:function(){{var b=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),c=b.parents("table").slice(0,1),d=this;(new Date).getTime()}if(b.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Column"]);var e=b.eq(0).parent("tr"),f=this._getRect(e.find(".xe_selected_cell:first")).left,g=this._getRect(e.find(".xe_selected_cell:last")).right;(b=c.find("td,th").filter(function(){var b=d._getRect(a(this));return!(b.right<=f||b.left>=g)})).filter(".xe_selected_cell").each(function(){var c=a(this),e=d._getSpan(c,"col"),f=c.clone().html("
    ");if(e>1){var g=Math.ceil(e/2),h=e-g;c.attr("colSpan",g),f.attr("colSpan",h)}else{var i=d._getRect(c);b.filter(function(){if(c.get(0)==this)return!1;var b=a(this),e=d._getRect(b);return e.right<=i.left||e.left>=i.right?!1:!0}).each(function(){var b=a(this);b.attr("colSpan",d._getSpan(b,"col")+1)}),f.attr("colSpan",1)}a.browser.msie?c.after(f.get(0).outerHTML):c.after(f)})}},$ON_CHECK_STYLE_CHANGE:function(){var b=["merge_cells","split_col","split_row"],c=this.oApp,d=this._startSel&&this._startSel.is(".xe_selected_cell")?"ENABLE_UI":"DISABLE_UI";a.each(b,function(){c.exec(d,[this])})},_mousedown:function(b){function c(){return e=f.getSelection().cloneRange(),e.collapseToStart(),e=a(e.startContainer).parents().andSelf().filter("td,th").eq(0),e.length?(g._getRect(g._startSel=e),g._doc.bind("mousemove",g.$FnMouseMove),g._doc.bind("mouseup",g.$FnMouseUp),void 0):g._removeAllListener()||!0}var d=a(b.target),e=d.parents().andSelf().filter("td,th,table"),f=this.oApp,g=this;a("td.xe_selected_cell",this.oApp.getWYSIWYGDocument()).removeClass("xe_selected_cell"),this._startSel=null,this._endSel=null,e.length&&this._isLeftClicked(b.button)&&setTimeout(c,0)},_mouseup:function(){this._removeAllListener(),this._startSel=this._endSel=null},_mousemove:function(b){function c(){var a=f.oApp.getSelection();f._startSel&&(f._startSel.get(0).firstChild||f._startSel.text(" "),a.selectNode(f._startSel.get(0).firstChild),a.collapseToStart(),a.select())}var d=a(b.target),e=d.parents().andSelf().filter("td,th").eq(0),f=this;if(e.length&&this._isLeftClicked(b.button)&&!(!this._endSel&&e.get(0)==this._startSel.get(0)||this._endSel&&e.get(0)==this._endSel.get(0))){this._getRect(this._endSel=e);var g=Math.min(this._startSel.rect.top,this._endSel.rect.top),h=Math.min(this._startSel.rect.left,this._endSel.rect.left),i=Math.max(this._startSel.rect.bottom,this._endSel.rect.bottom),j=Math.max(this._startSel.rect.right,this._endSel.rect.right),k=e.parents("table"),l=k.find("td,th").removeClass("xe_selected_cell"),m=a();do m.each(function(){var b=f._getRect(a(this));b.right>j&&(j=b.right),b.lefti&&(i=b.bottom)}),l=l.filter(":not(.xe_selected_cell)"),m=l.filter(function(){var b=f._getRect(a(this));return b.right<=h||b.left>=j||b.bottom<=g||b.top>=i?!1:!0}).addClass("xe_selected_cell");while(m.length);return a.browser.mozilla||setTimeout(c,0),!1}},_removeAllListener:function(){this._doc.unbind("mousemove",this.$FnMouseMove),this._doc.unbind("mouseup",this.$FnMouseUp)},_isLeftClicked:function(b){return a.browser.msie?!!(1&b):0==b},_getRect:function(a){var b=a.get(0);return 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,a.rect},_getSpan:function(b,c){var d=parseInt(a(b).attr(c+"span"));return isNaN(d)?1:d}}).extend(xe.XE_Table)}(jQuery),window.xe||(xe={}),xe.Editors=[],xe.XE_GET_WYSYWYG_MODE=jQuery.Class({name:"XE_GET_WYSYWYG_MODE",$init:function(a){this.editor_sequence=a},$ON_CHANGE_EDITING_MODE:function(a){editorMode[this.editor_sequence]="HTMLSrc"==a?"html":"wysiwyg"}}),xe.XE_PreservTemplate=jQuery.Class({name:"XE_PreservTemplate",isRun:!1,$BEFORE_SET_IR:function(a){return this.isRun||a?void 0:(this.isRun=!0,!1)}}),xe.XE_Preview=jQuery.Class({name:"XE_Preview",elPreviewButton:null,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elPreviewButton=jQuery("BUTTON.xpress_xeditor_preview_button",a)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elPreviewButton.get(0),"click","EVENT_PREVIEW",[])},$ON_EVENT_PREVIEW:function(){}}); \ No newline at end of file +}}),xe.XE_Editorresize=a.Class({name:"XE_Editorresize",$init:function(b,c){this.inputArea=a(".xpress_xeditor_editing_area_container",b).get(0),this.oVerticalResizer=a(".xpress_xeditor_editingArea_verticalResizer",b).get(0),this.oCheckBox=a("#editorresize",b).get(0),this.oIframe=c;var d=this;a(c).load(function(){d.oIframeBody=a(c).contents().find("body")})},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.oCheckBox,"change","XE_TOGGLE_EDITOR_RESIZE")},$ON_XE_TOGGLE_EDITOR_RESIZE:function(){1==this.oCheckBox.checked?(void 0==this._prevHeight&&(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"):(a(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(){var a=this;setTimeout(function(){a.inputArea.style.height=a.oIframe.style.height=a.oIframeBody[0].scrollHeight+"px"},0)}});var d={"XE_EditingAreaManager.onExit":"%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.","XE_FontColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff","XE_BGColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff","XE_Hyperlink.invalidURL":"%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4."};xe.XpressCore.oMessageMap=d;regex_handler=/<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/gi,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+)/gi,regex_quote_attr=/([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g;var e=("a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style".split(","),"area,br,col,embed,hr,img,input,param,base,meta,link,basefont,isindex".split(","));xe.XE_XHTMLFormatter=a.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(b){var c=[];if(a.browser.msie&&(b=b.replace(regex_jquery,""),b=b.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\/-]+)(.*?)>/gi,b=b.replace(regex,function(b,d,f,g){var h="";if(d=d||"",f=f.toLowerCase(),g=a.trim(g||""),d){var i=[],j="";if(a.inArray(f,e)>=0)return"";if(!c.length)return"";do j=c.pop(),j.tag==f&&"deleted"!=j.state&&i.push("");while(c.length&&j.tag!=f);return i.join("")}if(a.inArray(f,e)>=0){var k=g.length;return"br"==f&&(g=""),g&&"/"==g.substring(k-1,k)||(g+=" /"),"<"+f+" "+a.trim(g)+">"}return c.push({tag:f,state:h}),"<"+d+f+(g?" "+g:"")+">"}),c.length){var d="";do d=c.pop(),"deleted"!=d.state&&(b+="");while(c.length)}return regex=/<\/p>[ \t]*(\n)?/gi,b=b.replace(regex,"

    \n")},IR_TO:function(a){return a}}),xe.XE_Extension=a.Class({name:"XE_Extension",seq:"",last_doc:"",$init:function(a,b){this.seq=b,this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elDropdownLayer=a("DIV.xpress_xeditor_extension_layer",b).get(0)},_removeAttrs:function(a){return a},_addEvent:function(){if("WYSIWYG"==this.oApp.getEditingMode()){var b=this.oApp.getWYSIWYGDocument(),c=this.seq,d=function(){var b=a(this),d=b.attr("editor_component");d&&a.isFunction(openComponent)&&(editorPrevNode=b.get(0),openComponent(d,c))};a(b).find("img,div[editor_component]").each(function(){var c=a(this);"IMG"!=this.nodeName||c.attr("editor_component")||c.attr("widget")||c.attr("editor_component","image_link"),this.last_doc!=b&&(c.unbind("dblclick.widget").bind("dblclick.widget",d),this.last_doc=b)})}},$ON_MSG_APP_READY:function(){var b=this.oApp;b.exec("REGISTER_UI_EVENT",["extension","click","TOGGLE_EXTENSION_LAYER"]);var c=function(){b.exec("HIDE_ACTIVE_LAYER",[])};a("a",this.elDropdownLayer).each(function(){var b=a(this);b.attr("component_onclick_event_added")||(b.click(c),b.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=a.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=a("autosave_message")},$ON_MSG_APP_READY:function(){var b=a(this.form._saved_doc_title),c=a(this.form._saved_doc_content),d=a(this.form._saved_doc_document_srl),e=a.trim(b.val()),f=a.trim(c.val()),g=a.trim(d.val());(e||f||g)&&(confirm(this.form._saved_doc_message.value)?(a(this.form.title).val(e),this.oApp.setIR(f),"function"==typeof editorGetAutoSavedDoc&&editorGetAutoSavedDoc(this.form)):editorRemoveSavedDoc()),editorEnableAutoSave(this.form,a(this.form).attr("editor_sequence")),this.oApp.exec("REGISTER_HOTKEY",["ctrl+shift+s","AUTO_SAVE"])},$ON_AUTO_SAVE:function(){_editorAutoSave()}}),xe.XE_FormatWithSelectUI=a.Class({name:"XE_FormatWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(b){this.elFormatSelect=a("SELECT.xpress_xeditor_ui_format_select",b).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 b=this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");return b?(a.browser.msie&&/([0-9])/.test(b)&&(b="h"+RegExp.$1),this.elFormatSelect.value=b.toLowerCase(),this.elFormatSelect.selectedIndex<0&&(this.elFormatSelect.selectedIndex=0),this.elFormatSelect.value!=b.toLowerCase()&&(this.elFormatSelect.selectedIndex=0),void 0):this.elFormatSelect.selectedIndex=0},$ON_SET_FORMAT_FROM_SELECT_UI:function(){var b=this.elFormatSelect.value;b&&(a.browser.msie&&(b="<"+b+">"),this.oApp.exec("EXECCOMMAND",["FormatBlock",!1,b]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}}),xe.XE_Table=a.Class({_startSel:null,_endSel:null,$ON_MSG_APP_READY:function(){this._doc=a(this.oApp.getWYSIWYGDocument()),this.$FnMouseDown=a.fnBind(this._mousedown,this),this.$FnMouseUp=a.fnBind(this._mouseup,this),this.$FnMouseMove=a.fnBind(this._mousemove,this),this._doc.mousedown(this.$FnMouseDown),this._startSel=null,this._endSel=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 b="",c=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),d=this;if(c.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Merge"]),c.each(function(){b+=a(this).html()}).eq(0).html(b);var e=0;c.eq(0).nextAll("td,th").andSelf().filter(".xe_selected_cell").each(function(){e+=d._getSpan(this,"col")});var f=(this._getRect(c.eq(0)),c.eq(0).parent("tr")),g=c.eq(c.length-1).parent("tr"),h=c.parents("table").eq(0).find("tr"),i=h.index(g.get(0))-h.index(f.get(0))+this._getSpan(c.eq(c.length-1),"row");c.eq(0).attr("colSpan",e).attr("rowSpan",i),c.slice(1).remove()}},$ON_CELL_SPLIT_BY_ROW:function(){var b=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),c=b.parents("table").eq(0),d=this;if(b.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Row"]);var e=this._getRect(b.eq(0)).top,f=this._getRect(b.eq(b.length-1)).bottom;(b=c.find("td,th").filter(function(){var b=d._getRect(a(this));return!(b.bottom<=e||b.top>=f)})).filter(".xe_selected_cell").each(function(){var c=a(this),e=c.parent("tr"),f=d._getSpan(c,"row"),g=d._getRect(c),h=[],i=c.clone().html("
    "),j=1,k=1;f>1?(j=Math.ceil(f/2),k=f-j,h.push(function(){c.attr("rowSpan",j)}),i.attr("rowSpan",k)):(b.filter(function(){if(c.get(0)==this)return!1;var b=a(this),e=d._getRect(b);return e.bottom<=g.top||e.top>=g.bottom?!1:!0}).each(function(){var b=a(this),c=d._getSpan(b,"row")+1;h.push(function(){b.attr("rowSpan",c)})}),a.browser.msie?e.after(e.clone().empty().get(0).outerHTML):e.after(e.clone().empty()));var l=e.nextAll("tr");if(l.length){var m=l.eq(j-1).children("td,th").filter(function(){return d._getRect(a(this)).left>g.left});a.browser.msie?m.length?m.eq(0).before(i.get(0).outerHTML):l.eq(j-1).append(i.get(0).outerHTML):m.length?m.slice(0,1).before(i):l.slice(j-1,1).append(i)}else e.after(e.clone().empty().append(i));a.each(h,function(){this()})})}},$ON_CELL_SPLIT_BY_COL:function(){{var b=a(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),c=b.parents("table").slice(0,1),d=this;(new Date).getTime()}if(b.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Column"]);var e=b.eq(0).parent("tr"),f=this._getRect(e.find(".xe_selected_cell:first")).left,g=this._getRect(e.find(".xe_selected_cell:last")).right;(b=c.find("td,th").filter(function(){var b=d._getRect(a(this));return!(b.right<=f||b.left>=g)})).filter(".xe_selected_cell").each(function(){var c=a(this),e=d._getSpan(c,"col"),f=c.clone().html("
    ");if(e>1){var g=Math.ceil(e/2),h=e-g;c.attr("colSpan",g),f.attr("colSpan",h)}else{var i=d._getRect(c);b.filter(function(){if(c.get(0)==this)return!1;var b=a(this),e=d._getRect(b);return e.right<=i.left||e.left>=i.right?!1:!0}).each(function(){var b=a(this);b.attr("colSpan",d._getSpan(b,"col")+1)}),f.attr("colSpan",1)}a.browser.msie?c.after(f.get(0).outerHTML):c.after(f)})}},$ON_CHECK_STYLE_CHANGE:function(){var b=["merge_cells","split_col","split_row"],c=this.oApp,d=this._startSel&&this._startSel.is(".xe_selected_cell")?"ENABLE_UI":"DISABLE_UI";a.each(b,function(){c.exec(d,[this])})},_mousedown:function(b){function c(){return e=f.getSelection().cloneRange(),e.collapseToStart(),e=a(e.startContainer).parents().andSelf().filter("td,th").eq(0),e.length?(g._getRect(g._startSel=e),g._doc.bind("mousemove",g.$FnMouseMove),g._doc.bind("mouseup",g.$FnMouseUp),void 0):g._removeAllListener()||!0}var d=a(b.target),e=d.parents().andSelf().filter("td,th,table"),f=this.oApp,g=this;a("td.xe_selected_cell",this.oApp.getWYSIWYGDocument()).removeClass("xe_selected_cell"),this._startSel=null,this._endSel=null,e.length&&this._isLeftClicked(b.button)&&setTimeout(c,0)},_mouseup:function(){this._removeAllListener(),this._startSel=this._endSel=null},_mousemove:function(b){function c(){var a=f.oApp.getSelection();f._startSel&&(f._startSel.get(0).firstChild||f._startSel.text(" "),a.selectNode(f._startSel.get(0).firstChild),a.collapseToStart(),a.select())}var d=a(b.target),e=d.parents().andSelf().filter("td,th").eq(0),f=this;if(e.length&&this._isLeftClicked(b.button)&&!(!this._endSel&&e.get(0)==this._startSel.get(0)||this._endSel&&e.get(0)==this._endSel.get(0))){this._getRect(this._endSel=e);var g=Math.min(this._startSel.rect.top,this._endSel.rect.top),h=Math.min(this._startSel.rect.left,this._endSel.rect.left),i=Math.max(this._startSel.rect.bottom,this._endSel.rect.bottom),j=Math.max(this._startSel.rect.right,this._endSel.rect.right),k=e.parents("table"),l=k.find("td,th").removeClass("xe_selected_cell"),m=a();do m.each(function(){var b=f._getRect(a(this));b.right>j&&(j=b.right),b.lefti&&(i=b.bottom)}),l=l.filter(":not(.xe_selected_cell)"),m=l.filter(function(){var b=f._getRect(a(this));return b.right<=h||b.left>=j||b.bottom<=g||b.top>=i?!1:!0}).addClass("xe_selected_cell");while(m.length);return a.browser.mozilla||setTimeout(c,0),!1}},_removeAllListener:function(){this._doc.unbind("mousemove",this.$FnMouseMove),this._doc.unbind("mouseup",this.$FnMouseUp)},_isLeftClicked:function(b){return a.browser.msie?!!(1&b):0==b},_getRect:function(a){var b=a.get(0);return 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,a.rect},_getSpan:function(b,c){var d=parseInt(a(b).attr(c+"span"));return isNaN(d)?1:d}}).extend(xe.XE_Table)}(jQuery),window.xe||(xe={}),xe.Editors=[],xe.XE_GET_WYSYWYG_MODE=jQuery.Class({name:"XE_GET_WYSYWYG_MODE",$init:function(a){this.editor_sequence=a},$ON_CHANGE_EDITING_MODE:function(a){editorMode[this.editor_sequence]="HTMLSrc"==a?"html":"wysiwyg"}}),xe.XE_PreservTemplate=jQuery.Class({name:"XE_PreservTemplate",isRun:!1,$BEFORE_SET_IR:function(a){return this.isRun||a?void 0:(this.isRun=!0,!1)}}),xe.XE_Preview=jQuery.Class({name:"XE_Preview",elPreviewButton:null,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elPreviewButton=jQuery("BUTTON.xpress_xeditor_preview_button",a)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elPreviewButton.get(0),"click","EVENT_PREVIEW",[])},$ON_EVENT_PREVIEW:function(){}}); \ No newline at end of file From 21be1718e63138cc494d07767adffe1610bf1306 Mon Sep 17 00:00:00 2001 From: bnu Date: Sun, 24 Nov 2013 01:51:51 +0900 Subject: [PATCH 121/473] =?UTF-8?q?minify=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 96e01d794..0a41f9f26 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -79,6 +79,9 @@ module.exports = function(grunt) { 'modules/widget/tpl/js/generate_code.min.js': ['modules/widget/tpl/js/generate_code.js'], 'modules/widget/tpl/js/widget.min.js': ['modules/widget/tpl/js/widget.js'], 'modules/widget/tpl/js/widget_admin.min.js': ['modules/widget/tpl/js/widget_admin.js'], + // modules/poll + 'modules/poll/tpl/js/poll_admin.min.js': ['modules/poll/tpl/js/poll_admin.js'], + 'modules/poll/tpl/js/poll.min.js': ['modules/poll/tpl/js/poll.js'], } } }, @@ -109,6 +112,18 @@ module.exports = function(grunt) { files: { 'modules/widget/tpl/css/widget.min.css': ['modules/widget/tpl/css/widget.css'], } + }, + 'moudle-poll': { + files: { + 'modules/poll/tpl/css/poll.min.css': ['modules/poll/tpl/css/poll.css'], + 'modules/poll/skins/default/css/poll.min.css': ['modules/poll/skins/default/css/poll.css'], + 'modules/poll/skins/simple/css/poll.min.css': ['modules/poll/skins/simple/css/poll.css'], + } + }, + 'moudle-editor': { + files: { + 'modules/editor/skins/xpresseditor/css/default.min.css': ['modules/editor/skins/xpresseditor/css/default.css'], + } } }, jshint: { From 75a2a95ff01d2f5aed1d0e7dbe3853150ec80bdd Mon Sep 17 00:00:00 2001 From: bnu Date: Sun, 24 Nov 2013 01:52:23 +0900 Subject: [PATCH 122/473] minify js, css --- common/js/common.min.js | 1 - modules/editor/skins/xpresseditor/css/default.min.css | 2 +- modules/poll/skins/default/css/poll.min.css | 2 +- modules/poll/skins/simple/css/poll.min.css | 2 +- modules/poll/tpl/css/poll.min.css | 2 +- modules/poll/tpl/js/poll.min.js | 3 +-- modules/poll/tpl/js/poll_admin.min.js | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 common/js/common.min.js diff --git a/common/js/common.min.js b/common/js/common.min.js deleted file mode 100644 index 8a3dd079a..000000000 --- a/common/js/common.min.js +++ /dev/null @@ -1 +0,0 @@ -if(jQuery){jQuery.noConflict()}(function(b){var a=navigator.userAgent.toLowerCase();b.os={Linux:/linux/.test(a),Unix:/x11/.test(a),Mac:/mac/.test(a),Windows:/win/.test(a)};b.os.name=(b.os.Windows)?"Windows":(b.os.Linux)?"Linux":(b.os.Unix)?"Unix":(b.os.Mac)?"Mac":"";window.XE={loaded_popup_menus:new Array(),addedDocument:new Array(),checkboxToggleAll:function(d){if(!is_def(d)){d="cart"}var c={wrap:null,checked:"toggle",doClick:false};switch(arguments.length){case 1:if(typeof(arguments[0])=="string"){d=arguments[0]}else{b.extend(c,arguments[0]||{});d="cart"}break;case 2:d=arguments[0];b.extend(c,arguments[1]||{})}if(c.doClick==true){c.checked=null}if(typeof(c.wrap)=="string"){c.wrap="#"+c.wrap}if(c.wrap){var e=b(c.wrap).find("input[name="+d+"]:checkbox")}else{var e=b("input[name="+d+"]:checkbox")}if(c.checked=="toggle"){e.each(function(){b(this).attr("checked",(b(this).attr("checked"))?false:true)})}else{(c.doClick==true)?e.click():e.attr("checked",c.checked)}},displayPopupMenu:function(k,e,h){var s=h.target_srl;var r=h.menu_id;var j=k.menus;var n="";if(this.loaded_popup_menus[r]){n=this.loaded_popup_menus[r]}else{if(j){var t=j.item;if(typeof(t.length)=="undefined"||t.length<1){t=new Array(t)}if(t.length){for(var l=0;l"+p+" "}}}this.loaded_popup_menus[r]=n}if(n){var f=b("#popup_menu_area").html("
      "+n+"
    ");var g={top:h.page_y,left:h.page_x};if(f.outerHeight()+g.top>b(window).height()+b(window).scrollTop()){g.top=b(window).height()-f.outerHeight()+b(window).scrollTop()}if(f.outerWidth()+g.left>b(window).width()+b(window).scrollLeft()){g.left=b(window).width()-f.outerWidth()+b(window).scrollLeft()}f.css({top:g.top,left:g.left}).show().focus()}}}})(jQuery);jQuery(function(c){c('a[href^="#"]').click(function(){c(c(this).attr("href")).attr("tabindex","0").focus()});if(c.browser.msie){c("select").each(function(g,d){var f=false;var h=new Array();for(var e=0;e-1)?h[g]:e}}if(!f){return}d.oldonchange=d.onchange;d.onchange=function(){if(this.options[this.selectedIndex].disabled){this.selectedIndex=h[g]}else{if(this.oldonchange){this.oldonchange()}}};if(d.selectedIndex>=0&&d.options[d.selectedIndex].disabled){d.onchange()}})}var a=c(".xe_content .fold_button");if(a.size()){var b=c("div.fold_container",a);c("button.more",a).click(function(){c(this).hide().next("button").show().parent().next(b).show()});c("button.less",a).click(function(){c(this).hide().prev("button").show().parent().next(b).hide()})}jQuery('input[type="submit"],button[type="submit"]').click(function(e){var d=jQuery(e.currentTarget);setTimeout(function(){return function(){d.attr("disabled","disabled")}}(),0);setTimeout(function(){return function(){d.removeAttr("disabled")}}(),3000)})});(function(){function a(d,c){return(d.replace(/#.*$/,"")===c.replace(/#.*$/,""))}var b=Array.isArray||function(c){return Object.prototype.toString.call(c)=="[object Array]"};String.prototype.getQuery=function(e){var h=a(this,window.location.href)?current_url:this;var c=h.indexOf("?");if(c==-1){return null}var g=h.substr(c+1,this.length),d={};g.replace(/([^=]+)=([^&]*)(&|$)/g,function(){d[arguments[1]]=arguments[2]});var f=d[e];if(typeof(f)=="undefined"){f=""}return f};String.prototype.setQuery=function(p,e){var j=a(this,window.location.href)?current_url:this;var o=j.indexOf("?");var f=j.replace(/#$/,"");var k,r,q;if(typeof(e)=="undefined"){e=""}if(o!=-1){var h=f.substr(o+1,j.length),l={},t=[];f=j.substr(0,o);h.replace(/([^=]+)=([^&]*)(&|$)/g,function(i,c,u){l[c]=u});l[p]=e;for(var d in l){if(!l.hasOwnProperty(d)){continue}if(!(q=String(l[d]).trim())){continue}t.push(d+"="+decodeURI(q))}h=t.join("&");f=f+(h?"?"+h:"")}else{if(String(e).trim()){f=f+"?"+p+"="+e}}r=/^https:\/\/([^:\/]+)(:\d+|)/i;if(r.test(f)){var s="http://"+RegExp.$1;if(window.http_port&&http_port!=80){s+=":"+http_port}f=f.replace(r,s)}var n=!!window.enforce_ssl;if(!n&&b(window.ssl_actions)&&(k=f.getQuery("act"))){for(var g=0,m=ssl_actions.length;g-1&&!a.getQuery("vid")){a=a.setQuery("vid",xeVid)}try{if(f!="_blank"&&winopen_list[f]){winopen_list[f].close();winopen_list[f]=null}}catch(d){}if(typeof(f)=="undefined"){f="_blank"}if(typeof(b)=="undefined"){b=""}var c=window.open(a,f,b);c.focus();if(f!="_blank"){winopen_list[f]=c}}function popopen(a,b){if(typeof(b)=="undefined"){b="_blank"}if(typeof(xeVid)!="undefined"&&a.indexOf(request_uri)>-1&&!a.getQuery("vid")){a=a.setQuery("vid",xeVid)}winopen(a,b,"width=800,height=600,scrollbars=yes,resizable=yes,toolbars=no")}function sendMailTo(a){location.href="mailto:"+a}function move_url(a,b){if(!a){return false}if(typeof(b)=="undefined"){b="N"}if(b=="N"){b=false}else{b=true}if(/^\./.test(a)){a=request_uri+a}if(b){winopen(a)}else{location.href=a}return false}function displayMultimedia(e,d,a,b){var c=_displayMultimedia(e,d,a,b);if(c){document.writeln(c)}}function _displayMultimedia(a,c,i,k){if(a.indexOf("files")==0){a=request_uri+a}var e={wmode:"transparent",allowScriptAccess:"sameDomain",quality:"high",flashvars:"",autostart:false};var d=jQuery.extend(e,k||{});var j=(d.autostart&&d.autostart!="false")?"true":"false";delete (d.autostart);var f="";var g="";var h="";if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(a)){h=''}else{if(/\.flv$/i.test(a)||/\.mov$/i.test(a)||/\.moov$/i.test(a)||/\.m4v$/i.test(a)){h=''}else{if(/\.swf/i.test(a)){f="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";if(typeof(enforce_ssl)!="undefined"&&enforce_ssl){g="https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"}else{g="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"}h='';h+='';for(var b in d){if(d[b]!="undefined"&&d[b]!=""){h+=''}}h+=''}else{if(jQuery.browser.mozilla||jQuery.browser.opera){j=(d.autostart&&d.autostart!="false")?"1":"0"}h='.popup"),a,d,c,e,g;g=b.css({overflow:"scroll"}).offset();a=b.width(10).height(10000).get(0).scrollWidth+g.left*2;d=b.height(10).width(10000).get(0).scrollHeight+g.top*2;if(a<800){a=800+g.left*2}c=i.width();e=i.height();if(a!=c){window.resizeBy(a-c,0)}if(d!=e){window.resizeBy(0,d-e)}b.width(a-g.left*2).css({overflow:"",height:""})}function doCallModuleAction(a,c,b){var d={target_srl:b,cur_mid:current_mid,mid:current_mid};exec_xml(a,c,d,completeCallModuleAction)}function completeCallModuleAction(a,b){if(a.message!="success"){alert(a.message)}location.reload()}function completeMessage(a){alert(a.message);location.reload()}function doChangeLangType(a){if(typeof(a)=="string"){setLangType(a)}else{var b=a.options[a.selectedIndex].value;setLangType(b)}location.href=location.href.setQuery("l","")}function setLangType(b){var a=new Date();a.setTime(a.getTime()+(7000*24*3600000));setCookie("lang_type",b,a,"/")}function doDocumentPreview(e){var a=e;while(a.nodeName!="FORM"){a=a.parentNode}if(a.nodeName!="FORM"){return}var b=a.getAttribute("editor_sequence");var c=editorGetContent(b);var d=window.open("","previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");var f=jQuery("#previewDocument");if(!f.length){jQuery('
    ').appendTo(document.body);f=jQuery("#previewDocument")[0]}else{f=f[0]}if(f){f.content.value=c;f.submit()}}function doDocumentSave(f){var b=f.form.getAttribute("editor_sequence");var h=editorRelKeys[b]["content"].value;if(typeof(b)!="undefined"&&b&&typeof(editorRelKeys)!="undefined"&&typeof(editorGetContent)=="function"){var c=editorGetContent(b);editorRelKeys[b]["content"].value=c}var g={},e=["error","message","document_srl"],a=f.form.elements,d=jQuery(f.form).serializeArray();jQuery.each(d,function(j,k){var l=jQuery.trim(k.value);if(!l){return true}if(/\[\]$/.test(k.name)){k.name=k.name.replace(/\[\]$/,"")}if(g[k.name]){g[k.name]+="|@|"+l}else{g[k.name]=k.value}});exec_xml("document","procDocumentTempSave",g,completeDocumentSave,e,g,f.form);editorRelKeys[b]["content"].value=h;return false}function completeDocumentSave(a){jQuery("input[name=document_srl]").eq(0).val(a.document_srl);alert(a.message)}var objForSavedDoc=null;function doDocumentLoad(a){objForSavedDoc=a.form;popopen(request_uri.setQuery("module","document").setQuery("act","dispTempSavedList"))}function doDocumentSelect(a){if(!opener||!opener.objForSavedDoc){window.close();return}opener.location.href=opener.current_url.setQuery("document_srl",a).setQuery("act","dispBoardWrite");window.close()}function viewSkinInfo(a,b){popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+a+"&skin="+b,"SkinInfo")}var addedDocument=new Array();function doAddDocumentCart(b){var a=b.value;addedDocument[addedDocument.length]=a;setTimeout(function(){callAddDocumentCart(addedDocument.length)},100)}function callAddDocumentCart(a){if(addedDocument.length<1||a!=addedDocument.length){return}var b=new Array();b.srls=addedDocument.join(",");exec_xml("document","procDocumentAddCart",b,null);addedDocument=new Array()}function transRGB2Hex(d){if(!d){return d}if(d.indexOf("#")>-1){return d.replace(/^#/,"")}if(d.toLowerCase().indexOf("rgb")<0){return d}d=d.replace(/^rgb\(/i,"").replace(/\)$/,"");value_list=d.split(",");var c="";for(var b=0;b>2;g=((k&3)<<4)|(h>>4);e=((h&15)<<2)|(f>>6);d=f&63;if(isNaN(h)){e=d=64}else{if(isNaN(f)){d=64}}a=a+this._keyStr.charAt(j)+this._keyStr.charAt(g)+this._keyStr.charAt(e)+this._keyStr.charAt(d)}return a},decode:function(c){var a="";var k,h,f;var j,g,e,d;var b=0;c=c.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(b>4);h=((g&15)<<4)|(e>>2);f=((e&3)<<6)|d;a=a+String.fromCharCode(k);if(e!=64){a=a+String.fromCharCode(h)}if(d!=64){a=a+String.fromCharCode(f)}}a=Base64._utf8_decode(a);return a},_utf8_encode:function(b){b=b.replace(/\r\n/g,"\n");var a="";for(var e=0;e127)&&(d<2048)){a+=String.fromCharCode((d>>6)|192);a+=String.fromCharCode((d&63)|128)}else{a+=String.fromCharCode((d>>12)|224);a+=String.fromCharCode(((d>>6)&63)|128);a+=String.fromCharCode((d&63)|128)}}}return a},_utf8_decode:function(a){var b="";var d=0;var e=c1=c2=0;while(d191)&&(e<224)){c2=a.charCodeAt(d+1);b+=String.fromCharCode(((e&31)<<6)|(c2&63));d+=2}else{c2=a.charCodeAt(d+1);c3=a.charCodeAt(d+2);b+=String.fromCharCode(((e&15)<<12)|((c2&63)<<6)|(c3&63));d+=3}}}return b}};if(typeof(resizeImageContents)=="undefined"){function resizeImageContents(){}}if(typeof(activateOptionDisabled)=="undefined"){function activateOptionDisabled(){}}objectExtend=jQuery.extend;function toggleDisplay(a){jQuery("#"+a).toggle()}function svc_folder_open(a){jQuery("#_folder_open_"+a).hide();jQuery("#_folder_close_"+a).show();jQuery("#_folder_"+a).show()}function svc_folder_close(a){jQuery("#_folder_open_"+a).show();jQuery("#_folder_close_"+a).hide();jQuery("#_folder_"+a).hide()}function open_calendar(c,d,b){if(typeof(d)=="undefined"){d=""}var a="./common/tpl/calendar.php?";if(c){a+="fo_id="+c}if(d){a+="&day_str="+d}if(b){a+="&callback_func="+b}popopen(a,"Calendar")}var loaded_popup_menus=XE.loaded_popup_menus;function createPopupMenu(){}function chkPopupMenu(){}function displayPopupMenu(a,b,c){XE.displayPopupMenu(a,b,c)}function GetObjLeft(a){return jQuery(a).offset().left}function GetObjTop(a){return jQuery(a).offset().top}function replaceOuterHTML(b,a){jQuery(b).replaceWith(a)}function getOuterHTML(a){return jQuery(a).html().trim()}function setCookie(b,c,a,e){var d=b+"="+escape(c)+((!a)?"":("; expires="+a.toGMTString()))+"; path="+((!e)?"/":e);document.cookie=d}function getCookie(b){var a=document.cookie.match(new RegExp(b+"=(.*?)(?:;|$)"));if(a){return unescape(a[1])}}function is_def(a){return(typeof(a)!="undefined")}function ucfirst(a){return a.charAt(0).toUpperCase()+a.slice(1)}function get_by_id(a){return document.getElementById(a)}jQuery(function(a){a(document).click(function(d){var e=a("#popup_menu_area");if(!e.length){e=a('
    {$lang->db_info_desc}

    {$lang->advanced_setup}

    -