From ee068d81b1de806e29430fe630d4094962b921fa Mon Sep 17 00:00:00 2001 From: royallin Date: Fri, 22 Jan 2010 10:44:37 +0000 Subject: [PATCH 01/22] Update TW language git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7236 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/zh-TW.lang.php | 2 +- modules/document/lang/zh-TW.lang.php | 2 +- modules/editor/lang/zh-TW.lang.php | 4 ++-- widgets/content/conf/info.xml | 14 +++++++------- widgets/content/skins/default/skin.xml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php index fc55a95fa..f75b838aa 100644 --- a/common/lang/zh-TW.lang.php +++ b/common/lang/zh-TW.lang.php @@ -257,7 +257,7 @@ $lang->confirm_move = '確定要移動嗎?'; $lang->confirm_reset = '確定要重置嗎?'; $lang->confirm_leave = '確定要退出嗎?'; - $lang->confirm_update = 'Are you sure to update?'; + $lang->confirm_update = '確定要更新嗎?'; $lang->column_type = '格式'; $lang->column_type_list['text'] = '文字輸入(text)'; diff --git a/modules/document/lang/zh-TW.lang.php b/modules/document/lang/zh-TW.lang.php index abb61db42..853d81eb2 100644 --- a/modules/document/lang/zh-TW.lang.php +++ b/modules/document/lang/zh-TW.lang.php @@ -95,5 +95,5 @@ 'trash_ipaddress' => '移除IP位址', ); - $lang->success_trashed = "Successfully moved to trashcan"; + $lang->success_trashed = "成功地移到垃圾桶"; ?> diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php index e5cb8b7ee..ee78f91c9 100644 --- a/modules/editor/lang/zh-TW.lang.php +++ b/modules/editor/lang/zh-TW.lang.php @@ -228,6 +228,6 @@ $lang->edit->confirm_submit_without_saving = '有內容尚未儲存。\\n是否要繼續進行?'; - $lang->edit->image_align = '이미지 정렬'; - $lang->edit->attached_files = '첨부 파일'; + $lang->edit->image_align = '圖片對齊'; + $lang->edit->attached_files = '附加檔案'; ?> \ No newline at end of file diff --git a/widgets/content/conf/info.xml b/widgets/content/conf/info.xml index c12c5324d..561de39a0 100644 --- a/widgets/content/conf/info.xml +++ b/widgets/content/conf/info.xml @@ -4,13 +4,13 @@ Content Nội dung 全局内容控件 - 內容組件 + 內容 コンテンツウィジェット 게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다. This widget displays Content such as articles, comments, or attached files. Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm. 以各种样式显示主题，评论，附件等站内内容的全局控件。 - 是種可輸出討論板、評論，附加檔案等內容的組件。 + 這個 Widget 可輸出討論板、評論，附加檔案等內容。 掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。 0.1 2009-03-16 @@ -675,13 +675,13 @@ Feed(RSS/ATOM) URL 피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다. (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0) - 请输入RSS格式地址。 + 请输入RSS格式地址。 (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0) Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0). RSS URLはタイプが RSSの時だけ登録出来ます。 (サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0) - 피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다. - (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0) + 請輸入 RSS 位址。 + (支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0) text @@ -731,14 +731,14 @@ HTML Display Type Hiển thị kiểu HTML HTML 출력 방식 - HTML 출력 방식 + HTML 樣式選擇 TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다) TABLE(表)タグとUL(リスト型)タグを選択して表示します。(デフォールトはTABLE) TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다) You can choose TABLE tag or UL tag to display. (default is TABLE) Bạn có thể chọn Table Tag hay UL Tag để hiển thị. (Mặc định là Table) TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다) - TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다) + 可選擇 TABLE(表格) 或 UL(列表) 樣式。(預設是 TABLE 樣式) table Table diff --git a/widgets/content/skins/default/skin.xml b/widgets/content/skins/default/skin.xml index 7b5636459..647e8c79e 100644 --- a/widgets/content/skins/default/skin.xml +++ b/widgets/content/skins/default/skin.xml @@ -3,7 +3,7 @@ Content 위젯 기본 스킨 Skin mặc định Widget Nội dung 全局内容控件默认皮肤 - 内容組件預設面板 + 内容預設面板 コンテンツウィジェットのデフォルトスキン Content 위젯 기본 스킨 입니다. Html/Publish: 정찬명 @@ -20,7 +20,7 @@ Design : mada Programming : SOL - 内容控件預設面板。 + 内容預設面板。 Html/Publish: Chan-Myung Jeong Design : mada Programming : SOL @@ -58,7 +58,7 @@ 暗色背景 Dark Background Nền tối - 暗色背景 + 黑色背景 From 33b755c4a6bb148f8ec10578e67f10ea3648bbb9 Mon Sep 17 00:00:00 2001 From: haneul Date: Mon, 25 Jan 2010 02:33:54 +0000 Subject: [PATCH 02/22] #18637858 : fixed wrong default value on queries for get count of comments, trackbacks for speicified module git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7237 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/queries/getCommentCount.xml | 3 +-- modules/trackback/queries/getTrackbackCount.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/comment/queries/getCommentCount.xml b/modules/comment/queries/getCommentCount.xml index 80c8ac276..94b67c0ed 100644 --- a/modules/comment/queries/getCommentCount.xml +++ b/modules/comment/queries/getCommentCount.xml @@ -6,8 +6,7 @@ - + - diff --git a/modules/trackback/queries/getTrackbackCount.xml b/modules/trackback/queries/getTrackbackCount.xml index eb77e6d8f..c168a2f51 100644 --- a/modules/trackback/queries/getTrackbackCount.xml +++ b/modules/trackback/queries/getTrackbackCount.xml @@ -6,7 +6,7 @@ - + From 2576c191339353ca0ea61510f06a9d05bc077811 Mon Sep 17 00:00:00 2001 From: taggon Date: Mon, 25 Jan 2010 02:37:00 +0000 Subject: [PATCH 03/22] =?UTF-8?q?#18641767=20Firefox=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=A0=80=EC=9E=A5=EC=9D=B4=20=ED=95=9C?= =?UTF-8?q?=EB=B2=88=EB=A7=8C=20=EC=8B=A4=ED=96=89=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7238 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/tpl/js/editor_common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js index 4097b926f..f79e68879 100644 --- a/modules/editor/tpl/js/editor_common.js +++ b/modules/editor/tpl/js/editor_common.js @@ -38,7 +38,7 @@ function editorEnableAutoSave(fo_obj, editor_sequence) { var title = fo_obj.title.value; var content = editorRelKeys[editor_sequence]['content'].value; editorAutoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false}; - setTimeout(_editorAutoSave, 50000); + setTimeout('_editorAutoSave()', 3000); } // ajax를 이용하여 editor.procEditorSaveDoc 호출하여 자동 저장시킴 exe는 강제 코드 @@ -84,7 +84,7 @@ function _editorAutoSave(exe) { } // 50초마다 동기화를 시킴 강제 실행은 제외 - if(!exe) setTimeout(_editorAutoSave, 50000); + if(!exe) setTimeout('_editorAutoSave()', 50000); } // 자동저장된 모든 메세지를 삭제하는 루틴 From 666defd69a21e0c4dacfcc2f0887d2f514eb7a3d Mon Sep 17 00:00:00 2001 From: taggon Date: Mon, 25 Jan 2010 02:51:12 +0000 Subject: [PATCH 04/22] =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EA=B0=84=EA=B2=A9=20=EB=B3=80=EA=B2=BD(=EB=94=94=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=ED=96=88=EB=8D=98=20=EC=8B=9C=EA=B0=84=EC=9D=84=20=EC=9B=90?= =?UTF-8?q?=EB=9E=98=EB=8C=80=EB=A1=9C=20=EB=8F=8C=EB=A0=A4=EB=86=93?= =?UTF-8?q?=EC=9D=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7239 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/tpl/js/editor_common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js index f79e68879..cf70c1ee8 100644 --- a/modules/editor/tpl/js/editor_common.js +++ b/modules/editor/tpl/js/editor_common.js @@ -38,7 +38,7 @@ function editorEnableAutoSave(fo_obj, editor_sequence) { var title = fo_obj.title.value; var content = editorRelKeys[editor_sequence]['content'].value; editorAutoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false}; - setTimeout('_editorAutoSave()', 3000); + setTimeout('_editorAutoSave()', 50000); } // ajax를 이용하여 editor.procEditorSaveDoc 호출하여 자동 저장시킴 exe는 강제 코드 From bd317e765d2e5e1bbb432566d569130d5fd04f62 Mon Sep 17 00:00:00 2001 From: ngleader Date: Mon, 25 Jan 2010 06:17:09 +0000 Subject: [PATCH 05/22] =?UTF-8?q?chrome=EC=97=90=EC=84=9C=20xpresseditor?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=EC=B0=BD=EC=A1=B0=EC=A0=88=20=20css=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7240 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/skins/xpresseditor/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 480fc867a..b1f0325e1 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -44,7 +44,7 @@ .xpress-editor .input_area textarea{ *margin:0 -10px; _margin-bottom:-2px;} .xpress-editor .input_area textarea.blind{ display:none;} .xpress-editor .input_control{ position:relative; display:block; width:100%; clear:both; text-align:center; background:#fbfbfb url(../img/btn_expand.gif) no-repeat center center; cursor:n-resize;} -.xpress-editor .input_control span{ display:block; height:10px; border-top:1px solid #dfdfdf; visibility:visible; font-size:0; line-height:200%; white-space:nowrap; color:#fff;} +.xpress-editor .input_control span{ display:block; height:10px; visibility:hidden; overflow:visible; font-size:0; line-height:200%; white-space:nowrap; color:#fff;} .xpress-editor.black .input_control { background:#111 url(../img/btn_expand.black.gif) no-repeat center center;} .xpress-editor.black .input_control span{ border-top:1px solid #333; color:#000;} From 4eaeba6aa54f3eb4c8b8fc62f378becbe0436407 Mon Sep 17 00:00:00 2001 From: taggon Date: Mon, 25 Jan 2010 08:31:51 +0000 Subject: [PATCH 06/22] =?UTF-8?q?#18642837=20=EC=9E=90=EB=8F=99=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C(domain.com/~user)=EB=A5=BC=20=EC=A0=95?= =?UTF-8?q?=EC=83=81=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8D=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7241 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/autolink/autolink.js | 3 ++- addons/autolink/autolink.spec.html | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js index eea4ecf52..a6744c2bf 100644 --- a/addons/autolink/autolink.js +++ b/addons/autolink/autolink.js @@ -9,10 +9,11 @@ var max_255_re = '(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])'; var ip_re = '(?:'+max_255_re+'\\.){3}'+max_255_re; var port_re = '(?::([0-9]+))?'; + var user_re = '(?:/~[\\w-]+)?'; var path_re = '((?:/[\\w!"$-/:-@]+)*)'; var hash_re = '(?:#([\\w!-@]+))?'; - var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+path_re+hash_re+')', 'ig'); + var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+user_re+path_re+hash_re+')', 'ig'); var AutoLink = xe.createPlugin("autolink", { targets : [], diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html index aea13835c..b4873678f 100644 --- a/addons/autolink/autolink.spec.html +++ b/addons/autolink/autolink.spec.html @@ -60,6 +60,10 @@ describe('AutoLink functionality', { "#test9 - don't include parenthesis" : function() { value_of( $('#test9 a').length ).should_be(1); value_of( $('#test9 a').attr('href') ).should_be('http://www.naver.com'); + }, + "#test10 - include tild" : function() { + value_of( $('#test10 a').length ).should_be(1); + value_of( $('#test10 a').attr('href') ).should_be('http://www.xpressengine.com:8000/~user/?mid=def'); } }); @@ -102,6 +106,7 @@ describe('Autolink trigger', {
http://mygony.com
Go to http://mygony.com
Naver(http://www.naver.com)
+
User homepage : http://www.xpressengine.com:8000/~user/?mid=def should be a link.
\ No newline at end of file From e915d3fe1dd9d99404a5773235a86a0fbf22c5f5 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 26 Jan 2010 02:33:57 +0000 Subject: [PATCH 07/22] #18645001 : fixed a bug that update for header, footer text and description did not work when emptying those fields git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7242 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/queries/updateModule.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml index 015bafd21..a61972501 100644 --- a/modules/module/queries/updateModule.xml +++ b/modules/module/queries/updateModule.xml @@ -10,12 +10,12 @@ - + - - + + From 81d1ded1cf0145f86c943b29c2db65becf142398 Mon Sep 17 00:00:00 2001 From: taggon Date: Tue, 26 Jan 2010 04:35:39 +0000 Subject: [PATCH 08/22] =?UTF-8?q?VALIDATE=20=EB=A9=94=EC=8B=9C=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EC=A4=91=EB=8B=A8=EB=90=98=EB=A9=B4=20=ED=8F=BC=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=EC=9D=84=20=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7243 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/xml_js_filter.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index c9fa1322d..a90803135 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -59,7 +59,11 @@ var Validator = xe.createApp('Validator', { if (oForm._filter) filter = oForm._filter.value; - return this.cast('VALIDATE', [oForm, filter]); + var params = [oForm, filter]; + var result = this.cast('VALIDATE', params); + if (typeof result == 'undefined') result = false; + + return result; }, API_ONREADY : function() { var self = this; From 2661914c076317e27bffc9d45f6916634bcea477 Mon Sep 17 00:00:00 2001 From: taggon Date: Tue, 26 Jan 2010 04:58:48 +0000 Subject: [PATCH 09/22] =?UTF-8?q?#18646138=20JAF=EC=97=90=EC=84=9C=20BEFOR?= =?UTF-8?q?E=20=ED=9B=84=EC=BB=A4=EC=9D=98=20=EB=B0=98=ED=99=98=EA=B0=92?= =?UTF-8?q?=EC=9D=84=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8D=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7244 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/js_app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/js/js_app.js b/common/js/js_app.js index a6cf46d53..0a376e711 100644 --- a/common/js/js_app.js +++ b/common/js/js_app.js @@ -240,8 +240,7 @@ _app_base = { if (!/^(?:AFTER_|BEFORE_)/.test(msg)) { // top level function return vRet; } else { - if (typeof vRet == 'undefined') vRet = true; - return $.isArray(vRet)?$.inArray(false, vRet):!!vRet; + return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet); } } }; From 187e14796ec01ad348c9fbfa1dc4483c1cc76c3b Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 26 Jan 2010 09:37:56 +0000 Subject: [PATCH 10/22] =?UTF-8?q?dreditor=20component=EC=9D=98=20xml=20inf?= =?UTF-8?q?ormation=20=EB=B3=80=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/sandbox@7245 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/editor.model.php | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index b24c9f96e..10cf147d3 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -92,28 +92,28 @@ $oParser = new XmlParser(); $xml_doc = $oParser->loadXmlFile($xml_file); - $component_info->component_name = $drComponentName; - $component_info->title = $xml_doc->component->title->body; - $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body); - $component_info->version = $xml_doc->component->version->body; - $component_info->date = $xml_doc->component->date->body; - $component_info->homepage = $xml_doc->component->link->body; - $component_info->license = $xml_doc->component->license->body; - $component_info->license_link = $xml_doc->component->license->attrs->link; + $drcomponent_info->drcomponent_name = $drComponentName; + $drcomponent_info->title = $xml_doc->drcomponent->title->body; + $drcomponent_info->description = str_replace('\n', "\n", $xml_doc->drcomponent->description->body); + $drcomponent_info->version = $xml_doc->drcomponent->version->body; + $drcomponent_info->date = $xml_doc->drcomponent->date->body; + $drcomponent_info->homepage = $xml_doc->drcomponent->link->body; + $drcomponent_info->license = $xml_doc->drcomponent->license->body; + $drcomponent_info->license_link = $xml_doc->drcomponent->license->attrs->link; $buff = 'component_name = "%s";', $component_info->component_name); - $buff .= sprintf('$xml_info->title = "%s";', $component_info->title); - $buff .= sprintf('$xml_info->description = "%s";', $component_info->description); - $buff .= sprintf('$xml_info->version = "%s";', $component_info->version); - $buff .= sprintf('$xml_info->date = "%s";', $component_info->date); - $buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage); - $buff .= sprintf('$xml_info->license = "%s";', $component_info->license); - $buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link); + $buff .= sprintf('$xml_info->drcomponent_name = "%s";', $drcomponent_info->drcomponent_name); + $buff .= sprintf('$xml_info->title = "%s";', $drcomponent_info->title); + $buff .= sprintf('$xml_info->description = "%s";', $drcomponent_info->description); + $buff .= sprintf('$xml_info->version = "%s";', $drcomponent_info->version); + $buff .= sprintf('$xml_info->date = "%s";', $drcomponent_info->date); + $buff .= sprintf('$xml_info->homepage = "%s";', $drcomponent_info->homepage); + $buff .= sprintf('$xml_info->license = "%s";', $drcomponent_info->license); + $buff .= sprintf('$xml_info->license_link = "%s";', $drcomponent_info->license_link); // 작성자 정보 - if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author; - else $author_list = $xml_doc->component->author; + if(!is_array($xml_doc->drcomponent->author)) $author_list[] = $xml_doc->drcomponent->author; + else $author_list = $xml_doc->drcomponent->author; for($i=0; $i < count($author_list); $i++) { $buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body); @@ -122,9 +122,9 @@ } // history - if($xml_doc->component->history) { - if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history; - else $history_list = $xml_doc->component->history; + if($xml_doc->drcomponent->history) { + if(!is_array($xml_doc->drcomponent->history)) $history_list[] = $xml_doc->drcomponent->history; + else $history_list = $xml_doc->drcomponent->history; for($i=0; $i < count($history_list); $i++) { unset($obj); @@ -156,7 +156,7 @@ } // 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능) - $extra_vars = $xml_doc->component->extra_vars->var; + $extra_vars = $xml_doc->drcomponent->extra_vars->var; if($extra_vars) { if(!is_array($extra_vars)) $extra_vars = array($extra_vars); foreach($extra_vars as $key => $val) { From fd430e7d3205215fb52ab30cc438ea1050ee25e9 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 26 Jan 2010 10:03:19 +0000 Subject: [PATCH 11/22] rollback [7245] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7246 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/editor.model.php | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 10cf147d3..b24c9f96e 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -92,28 +92,28 @@ $oParser = new XmlParser(); $xml_doc = $oParser->loadXmlFile($xml_file); - $drcomponent_info->drcomponent_name = $drComponentName; - $drcomponent_info->title = $xml_doc->drcomponent->title->body; - $drcomponent_info->description = str_replace('\n', "\n", $xml_doc->drcomponent->description->body); - $drcomponent_info->version = $xml_doc->drcomponent->version->body; - $drcomponent_info->date = $xml_doc->drcomponent->date->body; - $drcomponent_info->homepage = $xml_doc->drcomponent->link->body; - $drcomponent_info->license = $xml_doc->drcomponent->license->body; - $drcomponent_info->license_link = $xml_doc->drcomponent->license->attrs->link; + $component_info->component_name = $drComponentName; + $component_info->title = $xml_doc->component->title->body; + $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body); + $component_info->version = $xml_doc->component->version->body; + $component_info->date = $xml_doc->component->date->body; + $component_info->homepage = $xml_doc->component->link->body; + $component_info->license = $xml_doc->component->license->body; + $component_info->license_link = $xml_doc->component->license->attrs->link; $buff = 'drcomponent_name = "%s";', $drcomponent_info->drcomponent_name); - $buff .= sprintf('$xml_info->title = "%s";', $drcomponent_info->title); - $buff .= sprintf('$xml_info->description = "%s";', $drcomponent_info->description); - $buff .= sprintf('$xml_info->version = "%s";', $drcomponent_info->version); - $buff .= sprintf('$xml_info->date = "%s";', $drcomponent_info->date); - $buff .= sprintf('$xml_info->homepage = "%s";', $drcomponent_info->homepage); - $buff .= sprintf('$xml_info->license = "%s";', $drcomponent_info->license); - $buff .= sprintf('$xml_info->license_link = "%s";', $drcomponent_info->license_link); + $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name); + $buff .= sprintf('$xml_info->title = "%s";', $component_info->title); + $buff .= sprintf('$xml_info->description = "%s";', $component_info->description); + $buff .= sprintf('$xml_info->version = "%s";', $component_info->version); + $buff .= sprintf('$xml_info->date = "%s";', $component_info->date); + $buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage); + $buff .= sprintf('$xml_info->license = "%s";', $component_info->license); + $buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link); // 작성자 정보 - if(!is_array($xml_doc->drcomponent->author)) $author_list[] = $xml_doc->drcomponent->author; - else $author_list = $xml_doc->drcomponent->author; + if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author; + else $author_list = $xml_doc->component->author; for($i=0; $i < count($author_list); $i++) { $buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body); @@ -122,9 +122,9 @@ } // history - if($xml_doc->drcomponent->history) { - if(!is_array($xml_doc->drcomponent->history)) $history_list[] = $xml_doc->drcomponent->history; - else $history_list = $xml_doc->drcomponent->history; + if($xml_doc->component->history) { + if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history; + else $history_list = $xml_doc->component->history; for($i=0; $i < count($history_list); $i++) { unset($obj); @@ -156,7 +156,7 @@ } // 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능) - $extra_vars = $xml_doc->drcomponent->extra_vars->var; + $extra_vars = $xml_doc->component->extra_vars->var; if($extra_vars) { if(!is_array($extra_vars)) $extra_vars = array($extra_vars); foreach($extra_vars as $key => $val) { From e6ea10f0b0f1ff2c83cdeaafdd47e6516bd8f7f2 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 26 Jan 2010 10:19:11 +0000 Subject: [PATCH 12/22] #18646979 : check install for drcomponent git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7247 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.admin.controller.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index cf3ed8848..96079da55 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -82,6 +82,10 @@ case "widgetstyle": $config_file = "/skin.xml"; break; + case "drcomponent": + $config_file = "/info.xml"; + $type = "component"; + break; default: continue; From f8449745e20d0e6e1c852d4d5bb02ec02800e03d Mon Sep 17 00:00:00 2001 From: ngleader Date: Wed, 27 Jan 2010 07:14:29 +0000 Subject: [PATCH 13/22] =?UTF-8?q?#18649172=20ttxml=20importer=20=EB=AF=B8?= =?UTF-8?q?=EB=B0=9C=ED=96=89=EC=83=81=ED=83=9C=20=EC=A0=81=EC=9A=A9(texty?= =?UTF-8?q?le)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7248 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/importer/ttimport.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php index 84e6bb98f..6d3a6d037 100644 --- a/modules/importer/ttimport.class.php +++ b/modules/importer/ttimport.class.php @@ -117,6 +117,7 @@ $author_xml_id = $xmlDoc->post->author->body; + if($xmlDoc->post->category->body) { $tmp_arr = explode('/',$xmlDoc->post->category->body); $category = trim($tmp_arr[count($tmp_arr)-1]); @@ -218,6 +219,13 @@ } } + if($module_name =='textyle'){ + // 발행이 아닌 것들은 저장상태로 + if($xmlDoc->post->visibility->body != 'syndicated'){ + $obj->module_srl = $member_info->member_srl; + } + } + // 문서 입력 $output = executeQuery('document.insertDocument', $obj); From 9d6c3fe5213df85eed3a9a45a375a57cc5f13e91 Mon Sep 17 00:00:00 2001 From: haneul Date: Wed, 27 Jan 2010 07:26:35 +0000 Subject: [PATCH 14/22] #18649209 : fixed a bug that in a poll, users cannot set poll with multiple options git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7249 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/poll_maker/tpl/popup.html | 7 ++++--- modules/poll/skins/default/js/poll.js | 4 ++-- modules/poll/skins/simple/js/poll.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index 5226c73bc..ddfc49b5f 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -61,9 +61,6 @@ - -
-