From 080d104f34ad19ae628eece331eb5fe64cc550a0 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 10 Dec 2007 10:02:47 +0000 Subject: [PATCH 001/105] =?UTF-8?q?#323=20=EC=84=9C=EB=AA=85=EC=9D=B4=20?= =?UTF-8?q?=EA=B8=B8=EC=9D=B4=EC=A0=9C=ED=95=9C=EC=9D=84=20=EC=B4=88?= =?UTF-8?q?=EA=B3=BC=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=EB=B0=94=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D?= 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@3293 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 4450afcba..7de316df2 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1618,7 +1618,7 @@ if($signature) { // 서명 높이 제한 값이 있으면 표시 높이 제한 if($memberModuleConfig->signature_max_height) { - $GLOBALS['_transSignatureList'][$member_srl] = sprintf('
%s
', $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $signature); + $GLOBALS['_transSignatureList'][$member_srl] = sprintf('
%s
', $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $memberModuleConfig->signature_max_height, $signature); } else { $GLOBALS['_transSignatureList'][$member_srl] = sprintf('
%s
', $signature); } From 99b4cc4a3a16131cd923295de2266dd91d265f52 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 10 Dec 2007 10:09:29 +0000 Subject: [PATCH 002/105] =?UTF-8?q?r3275=EC=97=90=EC=84=9C=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=20=EB=93=A4=EC=96=B4=EA=B0=84=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=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@3294 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.view.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 9abaf1406..03f9e1eee 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -110,7 +110,6 @@ $option->enable_default_component = true; $option->enable_component = false; $option->resizable = false; - if($memberModuleConfig->signature_max_height) $option->height = 200; $editor = $oEditorModel->getEditor($member_info->member_srl, $option); Context::set('editor', $editor); From c185c94c9e2f7655a5ffd2cb8601103e4d576273 Mon Sep 17 00:00:00 2001 From: haojilin Date: Mon, 10 Dec 2007 11:54:37 +0000 Subject: [PATCH 003/105] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=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/sandbox@3295 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/tag_list/conf/info.xml | 140 ++++++++++++++++----------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/widgets/tag_list/conf/info.xml b/widgets/tag_list/conf/info.xml index 8cfd26304..b56ab2f13 100644 --- a/widgets/tag_list/conf/info.xml +++ b/widgets/tag_list/conf/info.xml @@ -1,70 +1,70 @@ - - - 꼬리표 목록 출력 - 标签 - タグリスト表示 - Show Tag List - Mostrar la lista de etiqueta - Отображение списка тегов - - 제로 - 제로 - Zero - zero - zero - zero - 선택된 모듈의 꼬리표 목록을 정해진 순위만큼 노출하여 줍니다 - 显示被选模块指定个数的标签目录。 - 選択されたモジュールのタグリストを指定された順位まで表示します。 - This widget displays configured number of tags from target module. - Este widget muestra la liste de etiqueta según el orden definido en el módulo seleccionado. - Этот виджет отображает конфигурированное число тегов из модуля назначения. - - - - 제목 - 栏目名 - タイトル - Title - Título - Заголовок - text - 꼬리표 출력시 제목으로 출력됩니다. - 显示为标签目录的标题。 - タグ出力の際、タイトルとして表示されます。 - This will be shown as a title with tag list. - Este será el título al ser mostrada la etiqueta. - Это будет показано как заголовок со списком тегов. - - - 목록수 - 目录数 - リスト数 - Number of tags - Número de etiquetas - Число тегов - text - 출력될 목록의 수를 정하실 수 있습니다. (기본 20개) - 可设置要显示的标签数。 (默认为 20个) - 出力されるリストの数を指定することができます。（デフォルト２０個） - You can configure the number of tags to show. (Default is 20) - Usted puede definir el número de etiquetas a mostrar. (predefinido: 20) - Вы можете сконфигурировать число тегов для показа. (стандарт: 20) - - - 대상 모듈 - 模块对象 - モジュール - Target Module - Módulo Objetivo - Модуль назначения - mid_list - 선택하신 모듈에 등록된 꼬리표를 대상으로 합니다. - 将把被选模块当中的标签作为对象。 - チェックされたモジュールに登録されたタグを対象とします。 - Tag list will be shown based on this target module. - Objetivo de la lista de etiquetas será la del módulo seleccionado. - Список тегов будет показан на основании этого модуля назначения. - - - + + + 꼬리표 목록 출력 + 标签 + タグリスト表示 + Show Tag List + Mostrar la lista de etiqueta + Отображение списка тегов + + 제로 + zero + Zero + zero + zero + zero + 선택된 모듈의 꼬리표 목록을 정해진 순위만큼 노출하여 줍니다 + 显示被选模块指定个数的标签目录。 + 選択されたモジュールのタグリストを指定された順位まで表示します。 + This widget displays configured number of tags from target module. + Este widget muestra la liste de etiqueta según el orden definido en el módulo seleccionado. + Этот виджет отображает конфигурированное число тегов из модуля назначения. + + + + 제목 + 栏目名 + タイトル + Title + Título + Заголовок + text + 꼬리표 출력시 제목으로 출력됩니다. + 显示为标签目录的标题。 + タグ出力の際、タイトルとして表示されます。 + This will be shown as a title with tag list. + Este será el título al ser mostrada la etiqueta. + Это будет показано как заголовок со списком тегов. + + + 목록수 + 目录数 + リスト数 + Number of tags + Número de etiquetas + Число тегов + text + 출력될 목록의 수를 정하실 수 있습니다. (기본 20개) + 可设置要显示的标签数。 (默认为 20个) + 出力されるリストの数を指定することができます。（デフォルト２０個） + You can configure the number of tags to show. (Default is 20) + Usted puede definir el número de etiquetas a mostrar. (predefinido: 20) + Вы можете сконфигурировать число тегов для показа. (стандарт: 20) + + + 대상 모듈 + 模块对象 + モジュール + Target Module + Módulo Objetivo + Модуль назначения + mid_list + 선택하신 모듈에 등록된 꼬리표를 대상으로 합니다. + 将把被选模块当中的标签作为对象。 + チェックされたモジュールに登録されたタグを対象とします。 + Tag list will be shown based on this target module. + Objetivo de la lista de etiquetas será la del módulo seleccionado. + Список тегов будет показан на основании этого модуля назначения. + + + From 03ffc760b2631b527780286672df7def0f39a0e3 Mon Sep 17 00:00:00 2001 From: haojilin Date: Mon, 10 Dec 2007 12:20:50 +0000 Subject: [PATCH 004/105] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20.?= 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@3296 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/widget/lang/zh-CN.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/widget/lang/zh-CN.lang.php b/modules/widget/lang/zh-CN.lang.php index 308d7a31b..76f91fd91 100644 --- a/modules/widget/lang/zh-CN.lang.php +++ b/modules/widget/lang/zh-CN.lang.php @@ -38,7 +38,7 @@ $lang->msg_widget_proc_is_null = '不能执行%s控件的 proc()！'; $lang->about_widget_code = '输入被选控件所需要的下列各项后，按『代码生成』按钮，即可在页面下方获得可以用在布局模版代码片断。'; - $lang->about_widget_code_in_page = '输入下列各项必要值后，按“添加”按钮，即可把控件插入到页面当中。'; + $lang->about_widget_code_in_page = '输入下列各项必要值后，按『代码生成』按钮，即可把控件插入到页面当中。'; $lang->about_widget = "控件是在布局或页面模块中使用的一种小部件。\n不仅可以关联内部模块或外部open api，而且通过设置可以用在多种用途。\n即使不使用Zeroboard XE的页面模块或布局模块，也可以通过『代码生成』功能直接可以添加相应控件。"; $lang->cmd_content_insert = "添加内容"; From 70a6df58717aaf1130278bd52473d5701c66f10b Mon Sep 17 00:00:00 2001 From: haneul Date: Mon, 10 Dec 2007 13:17:23 +0000 Subject: [PATCH 005/105] fix daylong error git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3297 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/lifepod/lifepod.view.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/lifepod/lifepod.view.php b/modules/lifepod/lifepod.view.php index 5e223a1cc..b75fc9624 100644 --- a/modules/lifepod/lifepod.view.php +++ b/modules/lifepod/lifepod.view.php @@ -27,10 +27,10 @@ $this->setTemplatePath($template_path); } - function dateFormatChange($dates) { + function dateFormatChange($dates, $plus = 0) { $dates = str_replace( "T", " ", $dates); $dates = str_replace( "Z", "+0", $dates); - $dates = date("Y-m-d H:i:s", strtotime($dates)); + $dates = date("Y-m-d H:i:s", strtotime($dates) + $plus); return $dates; } @@ -57,7 +57,10 @@ } if($val->childNodes["date-end"]) { - $val->childNodes["date-end"]->body = $this->dateFormatChange($val->childNodes["date-end"]->body); + $plus = 0; + if($val->childNodes["type"]->body == "daylong") + $plus = -1; + $val->childNodes["date-end"]->body = $this->dateFormatChange($val->childNodes["date-end"]->body, $plus); } } From 7e262bf62ae870b78d7730b50e05ff9066fb4497 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 11 Dec 2007 03:32:05 +0000 Subject: [PATCH 006/105] ticket:328 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3298 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/lifepod/conf/info.xml | 2 +- modules/lifepod/lifepod.view.php | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/lifepod/conf/info.xml b/modules/lifepod/conf/info.xml index 390c7b35e..bd27922e1 100644 --- a/modules/lifepod/conf/info.xml +++ b/modules/lifepod/conf/info.xml @@ -1,5 +1,5 @@ - + 라이프팟 연동 Lifepod diff --git a/modules/lifepod/lifepod.view.php b/modules/lifepod/lifepod.view.php index b75fc9624..e711c6245 100644 --- a/modules/lifepod/lifepod.view.php +++ b/modules/lifepod/lifepod.view.php @@ -27,18 +27,20 @@ $this->setTemplatePath($template_path); } + /** + * @brief Reformatting date data from Lifepod API into data type compatible to Lifepod UI + **/ function dateFormatChange($dates, $plus = 0) { - $dates = str_replace( "T", " ", $dates); - $dates = str_replace( "Z", "+0", $dates); + $dates = ereg_replace("(\d\d\d\d)(\d\d)(\d\d)T(\d\d)(\d\d)(\d\d)Z", "\\1-\\2-\\3 \\4:\\5:\\6+0", $dates); $dates = date("Y-m-d H:i:s", strtotime($dates) + $plus); return $dates; } /** - * @brief 달력 + * @brief Displaying Calendar **/ function dispLifepodContent() { - // 권한 체크 + // check permission if(!$this->grant->view) return $this->dispLifepodMessage('msg_not_permitted'); $oLifepodModel = &getModel('lifepod'); @@ -47,7 +49,6 @@ $cMonth = Context::get('month'); $cDay = Context::get('day'); - // 특정 페이지 선택시 페이지 정보 가져오기 $page = $oLifepodModel->getPage($cYear, $cMonth, $cDay); foreach ($page->data as $key => $val) { From 1ac1aa0c8a34428765db47cd6bcffe3642cd2068 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 11 Dec 2007 05:51:41 +0000 Subject: [PATCH 007/105] =?UTF-8?q?xml=5Fparser=5Fcreate=EC=8B=9C=EC=97=90?= =?UTF-8?q?=20utf-8=20=EC=9D=B8=EC=BD=94=EB=94=A9=20=EC=A7=80=EC=A0=95?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD.=20=ED=95=9C=EC=8A=B9=EC=97=BD=EB=8B=98=20=EC=A0=9C?= =?UTF-8?q?=EB=B3=B4(=3F=3F)?= 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@3299 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/xml/XmlParser.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php index c8d5ca358..ed2b50738 100644 --- a/classes/xml/XmlParser.class.php +++ b/classes/xml/XmlParser.class.php @@ -58,7 +58,7 @@ unset($this->lang); } - $this->oParser = xml_parser_create(); + $this->oParser = xml_parser_create('UTF-8'); xml_set_object($this->oParser, $this); xml_set_element_handler($this->oParser, "_tagOpen", "_tagClosed"); From 1cd5f40274d8ea4b3e9f5c77deaaaa53265babf1 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 11 Dec 2007 06:01:38 +0000 Subject: [PATCH 008/105] =?UTF-8?q?=EC=8A=A4=ED=94=84=EB=A7=81=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C=20=EC=B2=A8?= =?UTF-8?q?=EB=B6=80=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20=EC=A0=9C?= =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8D=98=20=EB=AC=B8=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3300 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/springnote/springnote.model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/springnote/springnote.model.php b/modules/springnote/springnote.model.php index 2de4a644d..581bd267f 100644 --- a/modules/springnote/springnote.model.php +++ b/modules/springnote/springnote.model.php @@ -95,6 +95,9 @@ // source에서 /pages/숫자로 되어 있는 url의 수정 $page->source = preg_replace('/="\/pages\/([0-9]+)"/is','="?mid='.Context::get('mid').'&pageid=\\1"', $page->source); + // 첨부파일의 경로를 변경 + $page->source = preg_replace('/="\/pages\/([0-9]+)\/attachments\/([0-9]+)"/is','="'.$page->uri.'/attachments/\\2"', $page->source); + $uri = preg_replace('/pages(.*)$/i','',$page->uri); $page->css_files = array( sprintf('%sstylesheets/xhtmlContent.css?%d', $uri, time()), From 103b9d3ac9b26256bad015d390dfef6ab7297f09 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 11 Dec 2007 06:16:13 +0000 Subject: [PATCH 009/105] =?UTF-8?q?=EC=9D=BC=EB=B0=98=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=EC=9D=98=20style=20=ED=83=9C=EA=B7=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EA=B8=88=EC=A7=80=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B8=88=EC=A7=80=20=ED=83=9C=EA=B7=B8=EC=97=90=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3301 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/func.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/func.inc.php b/config/func.inc.php index 7e9e6c76e..5ea381720 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -411,6 +411,9 @@ // meta 태그 제거 $content = preg_replace("!!is","",$content); + // style 태그 제거 + $content = preg_replace("!!is","",$content); + return $content; } From 52dc927cd25868ce839c9e3545134b3932f76b14 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 11 Dec 2007 06:48:52 +0000 Subject: [PATCH 010/105] =?UTF-8?q?flvplayer=EB=A5=BC=20=EC=B5=9C=EC=8B=A0?= =?UTF-8?q?=EB=B2=84=EC=A0=84=EC=9C=BC=EB=A1=9C=20=ED=8C=90=EC=98=AC?= =?UTF-8?q?=EB=A6=BC.=20=EA=B4=80=EB=A0=A8=20script=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@3302 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/common.js | 2 +- common/tpl/images/flvplayer.swf | Bin 3443 -> 32164 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/common/js/common.js b/common/js/common.js index d6044a5b6..1a4c07901 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -197,7 +197,7 @@ function displayMultimedia(src, width, height, auto_start) { ""+ "<\/object>"; } else if(/\.flv/i.test(src)) { - html = ""; + html = ""; } else { html = ""; } diff --git a/common/tpl/images/flvplayer.swf b/common/tpl/images/flvplayer.swf index 5b5412a52ebed45f4a70792d3081b13b4e49fb56..59b6083c28a4912c281a742ddf076c04491e37c3 100644 GIT binary patch literal 32164 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 V{3$~N!N_n-{96&h{RiC!l_~1mkm&#b From 36d8a48f9d33eac4d1d0c2fa21eb0ae9a716abaa Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 11 Dec 2007 07:51:53 +0000 Subject: [PATCH 011/105] =?UTF-8?q?lifepod=20=C3=AC=C2=97=C2=B0=C3=AB?= =?UTF-8?q?=C2=8F=C2=99=20=C3=AB=C2=AA=C2=A8=C3=AB=C2=93=C2=88=C3=AC=C2=97?= =?UTF-8?q?=C2=90=C3=AC=C2=84=C2=9C=20=C3=AC=C2=BB=C2=AC=C3=AB=C2=9F=C2=AC?= =?UTF-8?q?=C3=AC=C2=85=C2=8B/=C3=AC=C2=A0=C2=9C=C3=AB=C2=AA=C2=A9=20?= =?UTF-8?q?=C3=AD=C2=91=C2=9C=C3=AC=C2=8B=C2=9C=C3=AA=C2=B0=C2=80=20=C3=AC?= =?UTF-8?q?=C2=A0=C2=95=C3=AC=C2=83=C2=81=C3=AC=C2=A0=C2=81=C3=AC=C2=9C?= =?UTF-8?q?=C2=BC=C3=AB=C2=A1=C2=9C=20=C3=AB=C2=90=C2=98=C3=AB=C2=8F=C2=84?= =?UTF-8?q?=C3=AB=C2=A1=C2=9D=20=C3=AD=C2=95=C2=98=C3=AA=C2=B3=C2=A0=20?= =?UTF-8?q?=C3=AD=C2=95=C2=9C=C3=AA=C2=B5=C2=AD=C3=AC=C2=9D=C2=98=20=C3=AA?= =?UTF-8?q?=C2=B8=C2=B0=C3=AB=C2=85=C2=90=C3=AC=C2=9D=C2=BC=20=C3=AD=C2=91?= =?UTF-8?q?=C2=9C=C3=AC=C2=8B=C2=9C=C3=AB=C2=A5=C2=BC=20=C3=AC=C2=84=C2=A4?= =?UTF-8?q?=C3=AC=C2=A0=C2=95=C3=AD=C2=95=C2=A0=20=C3=AC=C2=88=C2=98=20?= =?UTF-8?q?=C3=AC=C2=9E=C2=88=C3=AB=C2=8F=C2=84=C3=AB=C2=A1=C2=9D=20=C3=AB?= =?UTF-8?q?=C2=B3=C2=80=C3=AA=C2=B2=C2=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@3303 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/lifepod/skins/xe_official/css/common.css | 3 ++- modules/lifepod/skins/xe_official/list.html | 3 +-- modules/lifepod/skins/xe_official/skin.xml | 14 ++++++++++++++ modules/lifepod/tpl/skin_info.html | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/lifepod/skins/xe_official/css/common.css b/modules/lifepod/skins/xe_official/css/common.css index 0946ae080..b6dbe0847 100644 --- a/modules/lifepod/skins/xe_official/css/common.css +++ b/modules/lifepod/skins/xe_official/css/common.css @@ -1,8 +1,9 @@ @charset "utf-8"; /* board Title */ -.boardHeader { border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden; _width:100%;} +.boardHeader { border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden; _width:100%; margin-bottom:10px; } .boardHeader h3 { float:left; font-size:1.2em; padding:1em 2em .7em 1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { border-bottom:3px solid #fe3614; } /* board Information */ .boardInformation { width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;} diff --git a/modules/lifepod/skins/xe_official/list.html b/modules/lifepod/skins/xe_official/list.html index 2340471e8..d1afa643e 100644 --- a/modules/lifepod/skins/xe_official/list.html +++ b/modules/lifepod/skins/xe_official/list.html @@ -1,5 +1,5 @@ - + @@ -13,7 +13,6 @@ xAddEventListener(window, 'load', startLifepod); //]]> - diff --git a/modules/lifepod/skins/xe_official/skin.xml b/modules/lifepod/skins/xe_official/skin.xml index aacfbce4d..02573701a 100644 --- a/modules/lifepod/skins/xe_official/skin.xml +++ b/modules/lifepod/skins/xe_official/skin.xml @@ -8,6 +8,12 @@ 라이프팟 노트 연동 모듈의 기본 스킨 Default Skin of Lifepod Module + + + 하얀색(기본) + White (default) + + 게시판 제목 @@ -15,5 +21,13 @@ 게시판의 제목을 적어주세요. Please input the title of board. + + 한국 기념일 표시 + Display anniversary + 한국의 기념일을 표시합니다. + Display Korean anniversary. + use + notuse + diff --git a/modules/lifepod/tpl/skin_info.html b/modules/lifepod/tpl/skin_info.html index 732a24cb8..8bd328e01 100644 --- a/modules/lifepod/tpl/skin_info.html +++ b/modules/lifepod/tpl/skin_info.html @@ -3,7 +3,7 @@

- + From 548c58b30a345bf3c585a9f98718a49a281c3a5d Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 11 Dec 2007 10:12:30 +0000 Subject: [PATCH 012/105] =?UTF-8?q?#321=20=EC=B2=A8=EB=B6=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=AA=A9=EB=A1=9D=20=ED=91=9C=EC=8B=9C=20=ED=96=A5?= =?UTF-8?q?=EC=83=81=20-=20=EA=B8=80=20=EC=A0=9C=EB=AA=A9=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20-?= =?UTF-8?q?=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EB=A7=88=EB=8B=A4=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EB=AA=85=EC=9D=84=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20=EB=AC=B6=EC=96=B4?= =?UTF-8?q?=EC=84=9C=20=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EC=BD=94=EB=A9=98=ED=8A=B8=EC=97=90?= =?UTF-8?q?=20=EC=B2=A8=EB=B6=80=EB=90=9C=20=ED=8C=8C=EC=9D=BC=EC=9D=98=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20'=EC=9D=B4=EB=8F=99'=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20document=5Fsrl=EC=9D=84=20?= =?UTF-8?q?=EC=B0=BE=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3304 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/file.admin.view.php | 51 ++++++++++++++++++++++++++++++ modules/file/tpl/css/file_list.css | 5 +++ modules/file/tpl/file_list.html | 19 +++++++++-- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 modules/file/tpl/css/file_list.css diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index 47de2c004..91a79ec99 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -54,12 +54,63 @@ } } + // 목록의 loop를 돌면서 document를 구하기 + $file_count = count($output->data); + if($file_count) { + $document_srl_list = array(); + + foreach($output->data as $val) { + $comment_srl = $val->upload_target_srl; + if(!in_array($comment_srl, $document_srl_list)) $document_srl_list[] = $comment_srl; + } + + // comment를 먼저 구해서 document_srl을 구함 + if(count($document_srl_list)) { + $args->comment_srls = implode(',', $document_srl_list); + $comment_output = executeQuery('comment.getComments', $args); + if($comment_output->data && !is_array($comment_output->data)) { + $comment_output->data = array($comment_output->data); + } + + if($comment_output->data) { + for($i = 0; $i < count($comment_output->data); $i++) { + $comment_info = $comment_output->data[$i]; + $comment_list[$comment_info->comment_srl] = $comment_info; + } + + foreach($output->data as $val) { + $val->target_document_srl = $comment_list[$val->upload_target_srl]->document_srl; + } + + foreach($comment_output->data as $val) { + $document_srl = $val->document_srl; + if(!in_array($document_srl, $document_srl_list)) $document_srl_list[] = $document_srl; + } + } + } + + // document를 구함 + if(count($document_srl_list)) { + $args->document_srls = implode(',', $document_srl_list); + $document_output = executeQuery('document.getDocuments', $args); + if($document_output->data && !is_array($document_output->data)) { + $document_output->data = array($document_output->data); + } + + for($i = 0; $i < count($document_output->data); $i++) { + $document_info = $document_output->data[$i]; + $document_list[$document_info->document_srl] = $document_info; + } + } + } + Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); Context::set('page', $output->page); Context::set('file_list', $output->data); Context::set('page_navigation', $output->page_navigation); Context::set('module_list', $module_list); + Context::set('document_list', $document_list); // 템플릿 지정 $this->setTemplatePath($this->module_path.'tpl'); diff --git a/modules/file/tpl/css/file_list.css b/modules/file/tpl/css/file_list.css new file mode 100644 index 000000000..cee8c1a57 --- /dev/null +++ b/modules/file/tpl/css/file_list.css @@ -0,0 +1,5 @@ +@charset "utf-8"; + +.adminTable tr.bg1 td { + background-color: #FAFAFA; +} \ No newline at end of file diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index a37840805..bb3df315e 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -1,5 +1,6 @@ +
@@ -45,11 +46,25 @@ + + + {@ $document_srl = $val->target_document_srl} + {@ $move_uri = './?document_srl='.$document_srl.'#comment_'.$val->upload_target_srl} + + {@ $document_srl = $val->upload_target_srl} + {@ $move_uri = './?document_srl='.$val->upload_target_srl} + + {@ $cur_upload_target_srl = $val->upload_target_srl} + + + {$module_list[$val->module_srl]->browser_title} - {htmlspecialchars($document_list[$document_srl]->title)} + + + {$no} - {$module_list[$val->module_srl]->browser_title}
{htmlspecialchars($val->source_filename)} {$val->file_size} @@ -63,7 +78,7 @@ {$val->download_count} {zdate($val->regdate,"Y-m-d")} {$val->ipaddress} - {$lang->cmd_move} + {$lang->cmd_move} From 190a67301e845f6eacc360b11b735c5c1eb67f11 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 11 Dec 2007 10:59:06 +0000 Subject: [PATCH 013/105] =?UTF-8?q?XmlParser=20class=EB=A1=9C=20=EB=BA=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@3305 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../xml/GeneralXmlParser.class.php | 8 +++++++- modules/lifepod/lifepod.model.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) rename modules/lifepod/me2dayXmlParser.class.php => classes/xml/GeneralXmlParser.class.php (87%) diff --git a/modules/lifepod/me2dayXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php similarity index 87% rename from modules/lifepod/me2dayXmlParser.class.php rename to classes/xml/GeneralXmlParser.class.php index b836701fe..7bcd41a1e 100644 --- a/modules/lifepod/me2dayXmlParser.class.php +++ b/classes/xml/GeneralXmlParser.class.php @@ -1,5 +1,11 @@ getResponseBody(); - $oXmlParser = new Me2DayXmlParser(); + $oXmlParser = new GeneralXmlParser(); $xmldoc = $oXmlParser->parse($body); if(!$xmldoc->childNodes["feed"]->childNodes["entry"]) { From 5587af419aa90f75de07b4bdf8902dba43b12e02 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 11 Dec 2007 11:11:36 +0000 Subject: [PATCH 014/105] =?UTF-8?q?#321=20=EC=9E=90=EB=8F=99=EC=A0=80?= =?UTF-8?q?=EC=9E=A5/=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20=EA=B8=80?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=B2=98=EB=A6=AC=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3306 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/tpl/file_list.html | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index bb3df315e..3523ba379 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -49,15 +49,19 @@ {@ $document_srl = $val->target_document_srl} - {@ $move_uri = './?document_srl='.$document_srl.'#comment_'.$val->upload_target_srl} + {@ $move_uri = './?mid='.$module_list[$val->module_srl]->mid.'&document_srl='.$document_srl.'#comment_'.$val->upload_target_srl} {@ $document_srl = $val->upload_target_srl} - {@ $move_uri = './?document_srl='.$val->upload_target_srl} + {@ $move_uri = './?mid='.$module_list[$val->module_srl]->mid.'&document_srl='.$val->upload_target_srl} {@ $cur_upload_target_srl = $val->upload_target_srl} + + {$lang->cmd_save} + {$module_list[$val->module_srl]->browser_title} - {htmlspecialchars($document_list[$document_srl]->title)} + @@ -78,7 +82,10 @@ {$val->download_count} {zdate($val->regdate,"Y-m-d")} {$val->ipaddress} - {$lang->cmd_move} + + + {$lang->cmd_move} + @@ -95,12 +102,12 @@
- {$lang->first_page} + {$lang->first_page} - {$page_no} + {$page_no} - {$page_no} + {$page_no} {$lang->last_page} From 7e5e83dae1255313640ce58147020c2d25b380c9 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 11 Dec 2007 11:30:15 +0000 Subject: [PATCH 015/105] =?UTF-8?q?=EB=8B=AC=EB=A0=A5=EC=97=90=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=89=EC=9D=84=20=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=9E=88?= =?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@3307 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/lifepod/skins/xe_official/list.html | 5 ++++- modules/lifepod/skins/xe_official/skin.xml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/lifepod/skins/xe_official/list.html b/modules/lifepod/skins/xe_official/list.html index d1afa643e..9af42fd20 100644 --- a/modules/lifepod/skins/xe_official/list.html +++ b/modules/lifepod/skins/xe_official/list.html @@ -3,10 +3,13 @@ + + + - - - - dpScript; - Context::addHtmlFooter($js_code); - } + Context::addHtmlFooter($js_code); + } - Context::addCSSFile($this->component_path.'css/SyntaxHighlighter.css'); + Context::addCSSFile($this->component_path.'css/SyntaxHighlighter.css'); - Context::addJsFile($this->component_path.'script/shCore.js'); - Context::addJsFile($this->component_path.'script/shBrush'.$code_type.'.js'); + Context::addJsFile($this->component_path.'script/shCore.js'); + Context::addJsFile($this->component_path.'script/shBrush'.$code_type.'.js'); - $output = sprintf('
%s
', $code_type, $body); - return $output; - } + $output = null; + if(isset($option_file_path) || isset($option_description)) { + $output .= '
'; + if(isset($option_file_path)) $output .= ''.$option_file_path.''; + if(isset($option_description)) $output .= ''.$option_description.''; + $output .= '
'; + } + $output .= sprintf('
%s
', $code_type.$option, $body); + return $output; + } } ?> \ No newline at end of file diff --git a/modules/editor/components/code_highlighter/css/SyntaxHighlighter.css b/modules/editor/components/code_highlighter/css/SyntaxHighlighter.css index 575a2ecba..1025b0057 100755 --- a/modules/editor/components/code_highlighter/css/SyntaxHighlighter.css +++ b/modules/editor/components/code_highlighter/css/SyntaxHighlighter.css @@ -1,18 +1,17 @@ .dp-highlighter { - font-family: "Consolas", "Courier New", Courier, mono, serif; + font-family: "Consolas", "Courier New", "Courier", "mono", "serif"; font-size: 12px; background-color: #E7E5DC; width: 99%; overflow: auto; - margin: 18px 0 18px 0 !important; padding-top: 1px; /* adds a little border on top when controls are hidden */ } /* clear styles */ .dp-highlighter ol, .dp-highlighter ol li, -.dp-highlighter ol li span +.dp-highlighter ol li span { margin: 0; padding: 0; @@ -281,11 +280,31 @@ .dp-abap .datatypes { color: #2E8B57; font-weight: bold; } -pre[name='CodeHighLighterArea'] { - max-height: 200px; +pre[name='code'] { + max-height: 300px; font-size: 1.1em; border: #666666 dotted 1px; border-left: #22AAEE solid 5px; padding: 5px; overflow: auto; +} + + +.ch_infobox { + padding: 5px 0; + width: 99%; + background-color: #F8F8F8; + border-top: 1px solid #E7E5DC; +} + +.ch_infobox .file_path { + font-size: 0.9em; + font-weight: bold; + margin-left: 10px; +} + +.ch_infobox .description { + color: #AAA; + font-size: 0.9em; + margin-left: 10px; } \ No newline at end of file diff --git a/modules/editor/components/code_highlighter/info.xml b/modules/editor/components/code_highlighter/info.xml index b887fd79a..53fc5a718 100755 --- a/modules/editor/components/code_highlighter/info.xml +++ b/modules/editor/components/code_highlighter/info.xml @@ -1,19 +1,19 @@ - + Code Highlighter コードハイライト - 代码高亮显示 + 代码高亮显示 Code Highlighter Подсветка кода - + BNU BNU - BNU + BNU BNU BNU 코드를 보기 좋게 출력합니다. ソースコードを見やすく表示します。 - 高亮显示所选代码。 + 高亮显示所选代码。 Component serving for code highlighting. Компонент служащий для подсветки кода diff --git a/modules/editor/components/code_highlighter/lang/ko.lang.php b/modules/editor/components/code_highlighter/lang/ko.lang.php index 15c200172..c5acd5f60 100755 --- a/modules/editor/components/code_highlighter/lang/ko.lang.php +++ b/modules/editor/components/code_highlighter/lang/ko.lang.php @@ -9,4 +9,8 @@ $lang->used_collapse = '접기 기능 사용'; $lang->hidden_linenumber = '줄 번호 감추기'; $lang->hidden_controls = '도구바 감추기'; + + $lang->file_path = '파일경로'; + $lang->description = '설명'; + $lang->first_line = '시작 줄 번호'; ?> \ No newline at end of file diff --git a/modules/editor/components/code_highlighter/script/shCore.js b/modules/editor/components/code_highlighter/script/shCore.js index 42101a2c0..df3d26060 100755 --- a/modules/editor/components/code_highlighter/script/shCore.js +++ b/modules/editor/components/code_highlighter/script/shCore.js @@ -74,6 +74,7 @@ dp.sh.Toolbar.Commands = { .replace(/</g,'<') .replace(/>/g,'>') .replace(/&/g,'&') + .replace(/ /g,' ') ; if(window.clipboardData) diff --git a/modules/editor/components/code_highlighter/tpl/popup.html b/modules/editor/components/code_highlighter/tpl/popup.html index 991a79b10..a38736285 100755 --- a/modules/editor/components/code_highlighter/tpl/popup.html +++ b/modules/editor/components/code_highlighter/tpl/popup.html @@ -32,15 +32,28 @@ - {$lang->used_collapse} + {$lang->file_path} - + - {$lang->hidden_linenumber} + {$lang->description} - + + + + + {$lang->first_line} + + + + + + + {$lang->used_collapse} + + diff --git a/modules/editor/components/code_highlighter/tpl/popup.js b/modules/editor/components/code_highlighter/tpl/popup.js index 2505729bb..77b17cf6d 100755 --- a/modules/editor/components/code_highlighter/tpl/popup.js +++ b/modules/editor/components/code_highlighter/tpl/popup.js @@ -13,11 +13,18 @@ function getCode() { selected_node = node; var code_type = node.getAttribute('code_type'); + var file_path = node.getAttribute('file_path'); + var description = node.getAttribute('description'); + var first_line = node.getAttribute('first_line'); var collapse = node.getAttribute('collapse'); var nogutter = node.getAttribute('nogutter'); var nocontrols = node.getAttribute('nocontrols'); xGetElementById('code_type').value = code_type; + xGetElementById('file_path').value = file_path; + xGetElementById('description').value = description; + if(!first_line) xGetElementById('first_line').value = '1'; + else xGetElementById('first_line').value = first_line; if(collapse == 'Y') xGetElementById('collapse').checked = true; if(nogutter == 'Y') xGetElementById('nogutter').checked = true; if(nocontrols == 'Y') xGetElementById('nocontrols').checked = true; @@ -28,6 +35,9 @@ function insertCode() { if(typeof(opener)=='undefined') return; var code_type = xGetElementById('code_type').value; + var file_path = xGetElementById('file_path').value; + var description = xGetElementById('description').value; + var first_line = xGetElementById('first_line').value; var collapse = xGetElementById('collapse').checked; var nogutter = xGetElementById("nogutter").checked; var nocontrols = xGetElementById("nocontrols").checked; @@ -40,25 +50,16 @@ function insertCode() { if(!content) content = " "; - var text = "\n
"+content+"
\n
"; + var text = "\n"+'
'+content+'
'+"\n
"; if(selected_node) { selected_node.setAttribute('code_type', code_type); - if(collapse == true) { - selected_node.setAttribute('collapse', 'Y'); - } else { - selected_node.setAttribute('collapse', 'N'); - } - if(nogutter == true) { - selected_node.setAttribute('nogutter', 'Y'); - } else { - selected_node.setAttribute('nogutter', 'N'); - } - if(nocontrols == true && collapse == false) { - selected_node.setAttribute('nocontrols', 'Y'); - } else { - selected_node.setAttribute('nocontrols', 'N'); - } + selected_node.setAttribute('file_path', file_path); + selected_node.setAttribute('description', description); + selected_node.setAttribute('first_line', first_line); + selected_node.setAttribute("collapse", collapse); + selected_node.setAttribute('nogutter', nogutter); + selected_node.setAttribute('nocontrols', nocontrols); selected_node.setAttribute('style', style); opener.editorFocus(opener.editorPrevSrl); From a7481cbe61941e6387f2e0f0f39caecd9519c4e5 Mon Sep 17 00:00:00 2001 From: mayoojin Date: Sat, 22 Dec 2007 16:39:05 +0000 Subject: [PATCH 077/105] Russian translation add. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3399 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/rainbow_link/conf/info.xml | 6 ++++++ modules/file/file.controller.php | 4 ++-- modules/lifepod/conf/info.xml | 2 ++ modules/lifepod/lang/ru.lang.php | 15 +++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 modules/lifepod/lang/ru.lang.php diff --git a/addons/rainbow_link/conf/info.xml b/addons/rainbow_link/conf/info.xml index 4af527a30..b2fc0b23a 100644 --- a/addons/rainbow_link/conf/info.xml +++ b/addons/rainbow_link/conf/info.xml @@ -5,12 +5,14 @@ Addon for rainbow links Adición Enlace Arco Iris レインボーリンクアドオン + Аддон для радужных ссылок dynamicdrive.com dynamicdrive.com dynamicdrive.com dynamicdrive.com dynamicdrive.com + dynamicdrive.com rainbow.js를 header에 추가하여 링크가 걸린 글의 색을 무지개색으로 나타냅니다. 이 애드온의 rainbow.js는 <a href="http://www.dynamicdrive.com" target="_blank">Dynamicdrive.com</a>에 저작권이 있습니다. @@ -30,5 +32,9 @@ 「rainbow.js」をヘッダーに追加し、リンクされている文字列の色を虹色で表示します。この機能拡張の「 rainbow.js」は「<a href="http://www.dynamicdrive.com" target="_blank">Dynamicdrive.com</a>」に著作権があります。 + + Этот аддон добавляет файл с именем "rainbow.js" в заголовки HTML, и тогда связанный текс приобретает эффект смены цвета, подобно радуге или хамелеону. + "rainbow.js" Copyrightⓒ2007 <a href="http://www.dynamicdrive.com" target="_blank">Dynamicdrive.com</a>. + diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 27f1ec49d..2251ef339 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -162,8 +162,8 @@ } } else { // end of the support... - header("Cache-Control: no-cache"); // originally here it these lines were empty headers like "Cache-Control: ". I don't know why... but it might break the standards. // X-[Vr]bL1s5 - header("Pragma: no-cache"); // here too + header("Cache-Control: no-cache"); + header("Pragma: no-cache"); header("Content-Type: application/octet-stream"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); diff --git a/modules/lifepod/conf/info.xml b/modules/lifepod/conf/info.xml index c28111377..75255bf2c 100644 --- a/modules/lifepod/conf/info.xml +++ b/modules/lifepod/conf/info.xml @@ -3,6 +3,7 @@ 라이프팟 연동 Lifepod Lifepod連動 + Лайфпод haneul haneul @@ -10,5 +11,6 @@ 라이프팟의 calendar를 제로보드XE에서 연동하여 출력하는 기능을 가지고 있는 모듈입니다. This module displays calendar from lifepod. (Openmaru社提供の)LifepodサービスのカレンダーをゼロボードXEに連動して出力するモジュールです。 + Этот модуль отображает календать с lifepod'а. diff --git a/modules/lifepod/lang/ru.lang.php b/modules/lifepod/lang/ru.lang.php new file mode 100644 index 000000000..304985c6e --- /dev/null +++ b/modules/lifepod/lang/ru.lang.php @@ -0,0 +1,15 @@ +lifepod = ""; + + $lang->calendar_address = "XML- "; + $lang->cmd_lifepod_list = ' '; + $lang->cmd_view_info = ' '; + + $lang->about_lifepod = " -- , Openmaru Studio.
Zeroboard XE ."; +?> From 35f745ab32d48adcb05ba8de8feacde6ef4ecdcd Mon Sep 17 00:00:00 2001 From: mayoojin Date: Sat, 22 Dec 2007 16:43:00 +0000 Subject: [PATCH 078/105] RU & EN add for editor. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3400 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/code_highlighter/lang/en.lang.php | 4 ++++ modules/editor/components/code_highlighter/lang/ru.lang.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/editor/components/code_highlighter/lang/en.lang.php b/modules/editor/components/code_highlighter/lang/en.lang.php index bed733d04..99c08f1f2 100644 --- a/modules/editor/components/code_highlighter/lang/en.lang.php +++ b/modules/editor/components/code_highlighter/lang/en.lang.php @@ -9,4 +9,8 @@ $lang->used_collapse = 'Use Folding'; $lang->hidden_linenumber = 'Hide Line Number'; $lang->hidden_controls = 'Hide Toolbar'; + + $lang->file_path = 'File Path'; + $lang->description = 'Description'; + $lang->first_line = 'First Line'; ?> \ No newline at end of file diff --git a/modules/editor/components/code_highlighter/lang/ru.lang.php b/modules/editor/components/code_highlighter/lang/ru.lang.php index 874300834..ee331ac51 100644 --- a/modules/editor/components/code_highlighter/lang/ru.lang.php +++ b/modules/editor/components/code_highlighter/lang/ru.lang.php @@ -9,4 +9,8 @@ $lang->used_collapse = 'Использованное сокращение'; $lang->hidden_linenumber = 'Скрытый номер строки'; $lang->hidden_controls = 'Скрытый контрол'; + + $lang->file_path = 'Путь файла'; + $lang->description = 'Описание'; + $lang->first_line = 'Первая строка'; ?> \ No newline at end of file From 60388d449646d28a3def0c31f48e0c0eae492412 Mon Sep 17 00:00:00 2001 From: bnu Date: Sat, 22 Dec 2007 18:01:23 +0000 Subject: [PATCH 079/105] =?UTF-8?q?addons/google=5Fanalytics=20=EC=83=88?= =?UTF-8?q?=20=EC=B6=94=EC=A0=81=20=EC=BD=94=EB=93=9C(ga.js)=EB=A1=9C=20?= =?UTF-8?q?=EA=B5=90=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/sandbox@3401 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../google_analytics.addon.php | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/addons/google_analytics/google_analytics.addon.php b/addons/google_analytics/google_analytics.addon.php index 387b3891e..733ed9400 100644 --- a/addons/google_analytics/google_analytics.addon.php +++ b/addons/google_analytics/google_analytics.addon.php @@ -8,20 +8,23 @@ **/ // 관리자 모듈이면 패스~ - if(Context::get('module')=='admin') return; + if(Context::get('module')=='admin') return; // 한번만 출력시키기 위해 전역변수에 호출되었음을 체크해 놓음 (called position과 상관없음) - if($GLOBALS['_called_ga_']) return; - $GLOBALS['_called_ga_'] = true; + if($GLOBALS['_called_addon_google_analytics_']) return; + $GLOBALS['_called_addon_google_analytics_'] = true; - $js_code = << + $js_code = << +var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); +document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -EndOfCss; +EndOfGA; Context::addHtmlFooter($js_code); -?> +?> \ No newline at end of file From 0ab19ad142794f42e6c2e274f2a73caa0ae132ad Mon Sep 17 00:00:00 2001 From: supershop Date: Sun, 23 Dec 2007 10:50:38 +0000 Subject: [PATCH 080/105] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD=20=EB=B0=8F=20=EA=B8=B0=EC=A1=B4?= =?UTF-8?q?=20=EB=B2=88=EC=97=AD=EB=AC=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@3402 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/point/lang/en.lang.php | 16 ++++++------ modules/springnote/lang/en.lang.php | 14 +++++----- modules/widget/lang/en.lang.php | 40 ++++++++++++++--------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php index 5810c330c..f8ee8b8e0 100644 --- a/modules/point/lang/en.lang.php +++ b/modules/point/lang/en.lang.php @@ -26,13 +26,13 @@ $lang->disable_download = 'Prohibit Downloads'; $lang->about_disable_download = "This will prohibit downloads when there are not enough points. (Exclude image files)"; - $lang->level_point_calc = '레벨별 포인트 계산'; - $lang->expression = '레벨 변수 i를 사용하여 자바스크립트 수식을 입력하세요. 예: Math.pow(i, 2) * 90'; - $lang->cmd_exp_calc = '계산'; - $lang->cmd_exp_reset = '초기화'; + $lang->level_point_calc = 'Point Calculation per Point'; + $lang->expression = 'Please input Javascript formula by using level variable i. ex) Math.pow(i, 2) * 90'; + $lang->cmd_exp_calc = 'Calculate'; + $lang->cmd_exp_reset = 'Reset'; - $lang->cmd_point_recal = '포인트 재계산'; - $lang->about_cmd_point_recal = '게시글/댓글/첨부파일등을 모두 검사하여 설정된 포인트 설정에 맞게 모든 회원들의 포인트를 재계산합니다'; + $lang->cmd_point_recal = 'Recalculate Point'; + $lang->about_cmd_point_recal = "This will check articles/comments/attached files and reset all members' point to preset point."; $lang->about_module_point = "You can set point for each module and modules which don't have any value will use default point.
All point will be restored on acting reverse."; @@ -53,6 +53,6 @@ $lang->msg_cannot_download = "You don't have enough point to download"; - $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)'; - $lang->point_recal_finished = '포인트 재계산이 모두 완료되었습니다'; + $lang->point_recal_message = 'Adjusting Point. (%d / %d)'; + $lang->point_recal_finished = 'Point recalculation is finished.'; ?> diff --git a/modules/springnote/lang/en.lang.php b/modules/springnote/lang/en.lang.php index a4e4b4403..07321c7f2 100644 --- a/modules/springnote/lang/en.lang.php +++ b/modules/springnote/lang/en.lang.php @@ -1,18 +1,18 @@ springnote = "Springnote"; $lang->springnote_openid = "OpenID"; $lang->springnote_userkey = "User Key"; $lang->springnote_pageid = "Page Number"; - $lang->springnote_pageid_setup = '페이지 번호 설정'; - $lang->springnote_pageid_option_only = '지정된 페이지만 보여주기 (목록 보이지 않음)'; - $lang->springnote_pageid_option_list = '지정된 페이지부터 보이기 (목록 보임)'; - $lang->springnote_domain = "도메인 지정"; + $lang->springnote_pageid_setup = 'Set Page Number'; + $lang->springnote_pageid_option_only = 'Show only Selected Pages (hide list)'; + $lang->springnote_pageid_option_list = 'Show from Selected Pages (show list)'; + $lang->springnote_domain = "Set Domain"; $lang->page_url = "Original URL"; $lang->page_modified = "Last Modification"; @@ -26,5 +26,5 @@ $lang->about_springnote_userkey = 'User Key is needed to enable Springnote module.
Please input generated User Key after entering your OpenID at [Get User Key] .'; $lang->about_springnote_pageid = 'Please input pageid if you want to display specific page first.'; $lang->about_springnote_pageid_setup = '페이지 번호 지정시 해당 페이지만 보이기(목록 비포함), 해당 페이지부터 보이기(목록 포함)등을 지정할 수 있습니다'; - $lang->about_springnote_domain = '자신의 스프링노트가 아닌 다른 도메인의 스프링노트를 입력할 수 있습니다. (http://도메인.springnote.com 에서 도메인값만 입력해주세요)'; + $lang->about_springnote_domain = "You may set other domain's springnote. (Please input only domain from the form of 'http://domain.springnote.com' )"; ?> diff --git a/modules/widget/lang/en.lang.php b/modules/widget/lang/en.lang.php index bf0d72918..b0dc4f598 100644 --- a/modules/widget/lang/en.lang.php +++ b/modules/widget/lang/en.lang.php @@ -41,25 +41,25 @@ $lang->about_widget_code_in_page = 'After entering the required values, click the [Add] button to insert the widget code into the page.'; $lang->about_widget = "A widget is a small free-standing application used in a layout or page module.\n It can be linked with internal module or external open api. Through its configuration setting, wide application is possible. \n You can directly add a widget by using the [Generate Code] function without using the Zeroboard XE page module or layout module."; - $lang->cmd_content_insert = "내용 직접 추가"; - $lang->cmd_box_widget_insert = "상자 위젯 추가"; - $lang->cmd_remove_all_widgets = "내용 모두 지우기"; + $lang->cmd_content_insert = "Insert Content by Yourself"; + $lang->cmd_box_widget_insert = "Insert Box Widget"; + $lang->cmd_remove_all_widgets = "Remove All Widgets"; - $lang->cmd_widget_size = "위젯 크기"; - $lang->cmd_widget_align = "위젯 정렬"; - $lang->cmd_widget_align_left = "왼쪽"; - $lang->cmd_widget_align_right = "오른쪽"; - $lang->cmd_widget_margin = "외부 여백"; - $lang->cmd_widget_padding = "내부 여백"; - $lang->cmd_widget_border = "위젯 테두리"; - $lang->cmd_widget_border_solid = "실선"; - $lang->cmd_widget_border_dotted = "점선"; - $lang->cmd_widget_background_color = "배경색"; - $lang->cmd_widget_background_image_url = "배경 이미지"; - $lang->cmd_widget_background_image_repeat = "반복"; - $lang->cmd_widget_background_image_no_repeat = "고정"; - $lang->cmd_widget_background_image_x_repeat = "가로 반복"; - $lang->cmd_widget_background_image_y_repeat = "세로 반복"; - $lang->cmd_widget_background_image_x = "가로 위치"; - $lang->cmd_widget_background_image_y = "세로 위치"; + $lang->cmd_widget_size = "Widget Size"; + $lang->cmd_widget_align = "Align Widget"; + $lang->cmd_widget_align_left = "Left"; + $lang->cmd_widget_align_right = "Right"; + $lang->cmd_widget_margin = "Margin"; + $lang->cmd_widget_padding = "Padding"; + $lang->cmd_widget_border = "Border"; + $lang->cmd_widget_border_solid = "Solid"; + $lang->cmd_widget_border_dotted = "Dotted"; + $lang->cmd_widget_background_color = "Background Color"; + $lang->cmd_widget_background_image_url = "Background Image"; + $lang->cmd_widget_background_image_repeat = "Repeat"; + $lang->cmd_widget_background_image_no_repeat = "No Repeat"; + $lang->cmd_widget_background_image_x_repeat = "X Repeat"; + $lang->cmd_widget_background_image_y_repeat = "Y Repeat"; + $lang->cmd_widget_background_image_x = "X Position"; + $lang->cmd_widget_background_image_y = "Y Position"; ?> From 024c6c76ce7f34d7ca67c9d5a8dd3b0308012e44 Mon Sep 17 00:00:00 2001 From: risapapa Date: Mon, 24 Dec 2007 01:21:18 +0000 Subject: [PATCH 081/105] Corrected Japanese translation. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3403 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/google_analytics/conf/info.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/google_analytics/conf/info.xml b/addons/google_analytics/conf/info.xml index 12ac24b9c..4a15a9990 100644 --- a/addons/google_analytics/conf/info.xml +++ b/addons/google_analytics/conf/info.xml @@ -1,7 +1,6 @@ Google Analytics - Google Analytics Google Analytics Google Analytics Google Analytics From 6b630d8c1f3dc25beebde648e455eb1a07f376c9 Mon Sep 17 00:00:00 2001 From: risapapa Date: Mon, 24 Dec 2007 01:32:17 +0000 Subject: [PATCH 082/105] Corrected Japanese translation. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3404 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/openid_delegation_id/conf/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/openid_delegation_id/conf/info.xml b/addons/openid_delegation_id/conf/info.xml index 43be02af2..abe71577c 100644 --- a/addons/openid_delegation_id/conf/info.xml +++ b/addons/openid_delegation_id/conf/info.xml @@ -4,7 +4,7 @@ OpenID Addon for delegating domain name to OpenID Delegación ID para OpenID - OpenID + OpenIDアドオン Аддон для делигирования доменного имени к OpenID 제로 From 5d9e0936adf9d5dc1d2fd3574c27cf9854c3d792 Mon Sep 17 00:00:00 2001 From: risapapa Date: Mon, 24 Dec 2007 01:33:21 +0000 Subject: [PATCH 083/105] Corrected Japanese translation. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3405 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/google_analytics/conf/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/google_analytics/conf/info.xml b/addons/google_analytics/conf/info.xml index 4a15a9990..3cea23912 100644 --- a/addons/google_analytics/conf/info.xml +++ b/addons/google_analytics/conf/info.xml @@ -4,7 +4,7 @@ Google Analytics Google Analytics Google Analytics - Google Analytics + Google Analyticsアドオン 제로 Zero From ed153900e6703726e28c9ca61b0144eb877f5f60 Mon Sep 17 00:00:00 2001 From: risapapa Date: Mon, 24 Dec 2007 01:38:32 +0000 Subject: [PATCH 084/105] Corrected Japanese translation. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3406 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/member_extra_info/conf/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/member_extra_info/conf/info.xml b/addons/member_extra_info/conf/info.xml index ebdbc9765..413b804eb 100644 --- a/addons/member_extra_info/conf/info.xml +++ b/addons/member_extra_info/conf/info.xml @@ -1,7 +1,7 @@ 사용자 추가 정보 및 커뮤니케이션 기능 활성화 - 会員情報・コミュニティ + 会員情報・コミュニティアドオン 用户扩展信息 Addon for enabling facilities for providing additional information about users and communicating Addon para activar la función de la Información addcional del usuario y de la comunicación. From 03da0d6115398b770da91fb985dfd31a8a1c68c7 Mon Sep 17 00:00:00 2001 From: risapapa Date: Mon, 24 Dec 2007 01:39:29 +0000 Subject: [PATCH 085/105] Corrected Japanese translation. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3407 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/newest_images/conf/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/newest_images/conf/info.xml b/widgets/newest_images/conf/info.xml index 2f9fa2065..d0e2078b3 100644 --- a/widgets/newest_images/conf/info.xml +++ b/widgets/newest_images/conf/info.xml @@ -68,7 +68,7 @@ 썸네일 생성 방법 - サムネール生成方法 + 生成方法 缩略图生成方式 Thumbnail Type Тип миниатюры From ed9af88ff9bc5e894cb17a30a382973ed11a1c7c Mon Sep 17 00:00:00 2001 From: chinaskyking Date: Mon, 24 Dec 2007 02:26:07 +0000 Subject: [PATCH 086/105] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3408 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/lifepod/lang/zh-CN.lang.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/lifepod/lang/zh-CN.lang.php diff --git a/modules/lifepod/lang/zh-CN.lang.php b/modules/lifepod/lang/zh-CN.lang.php new file mode 100644 index 000000000..0f6ea8797 --- /dev/null +++ b/modules/lifepod/lang/zh-CN.lang.php @@ -0,0 +1,15 @@ +lifepod = "Lifepod"; + + $lang->calendar_address = "日历 xml地址"; + $lang->cmd_lifepod_list = 'Lifepod目录'; + $lang->cmd_view_info = 'Lifepod信息'; + + $lang->about_lifepod = "Lifepod是openmaru提供的日历服务。
Lifepod zerboardXE模块是Lifepod的特定日历显示为内部文件形式的模块。"; +?> From ff1e342ced83f5f123692a5069ed61e47e31ae3b Mon Sep 17 00:00:00 2001 From: chinaskyking Date: Mon, 24 Dec 2007 02:37:46 +0000 Subject: [PATCH 087/105] =?UTF-8?q?referer=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=A4=91=EB=AC=B8=20=ED=8C=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/sandbox@3409 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/referer/lang/zh-CN.php | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 modules/referer/lang/zh-CN.php diff --git a/modules/referer/lang/zh-CN.php b/modules/referer/lang/zh-CN.php new file mode 100644 index 000000000..447c65280 --- /dev/null +++ b/modules/referer/lang/zh-CN.php @@ -0,0 +1,10 @@ + + * @brief Korean language pack + */ + + $lang->referer = "点击来源"; + $lang->ranking = "访问次数"; +?> From 167d2dabed68f63908c0569d7a66aab622bbed95 Mon Sep 17 00:00:00 2001 From: chinaskyking Date: Mon, 24 Dec 2007 02:53:23 +0000 Subject: [PATCH 088/105] =?UTF-8?q?SpringNote=EC=A4=91=EB=AC=B8=20?= =?UTF-8?q?=EC=96=B8=EC=96=B4=ED=8C=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/sandbox@3411 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/springnote/lang/zh-CN.lang.php | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/springnote/lang/zh-CN.lang.php diff --git a/modules/springnote/lang/zh-CN.lang.php b/modules/springnote/lang/zh-CN.lang.php new file mode 100644 index 000000000..1156fd9e4 --- /dev/null +++ b/modules/springnote/lang/zh-CN.lang.php @@ -0,0 +1,30 @@ +springnote = "SpringNote"; + $lang->springnote_openid = "OpenID"; + $lang->springnote_userkey = "Key"; + $lang->springnote_pageid = "编号"; + $lang->springnote_pageid_setup = '设定编号'; + $lang->springnote_pageid_option_only = '显示指定页面(不显示目录)'; + $lang->springnote_pageid_option_list = '显示指定页面 (显示目录)'; + $lang->springnote_domain = "设定域名"; + + $lang->page_url = "原本 URL"; + $lang->page_modified = "最终修改"; + $lang->page_modifier = "最终修改者"; + + $lang->cmd_springnote_list = 'SpringNote目录'; + $lang->cmd_view_info = 'SpringNote信息'; + + $lang->about_springnote = "SpringNote是Openmaru提供的WIKI服务。
SpringNote zeroboardXE模块是特定页面显示成内部文件的模块。"; + $lang->about_springnote_openid = "请输入SpringNote作者的OpenID。"; + $lang->about_springnote_userkey = '请输入连接SpringNote的Key。
点击[生成Key]后输入OpenID生成Key。'; + $lang->about_springnote_pageid = '显示指定SpringNote中的页面时输入编号。'; + $lang->about_springnote_pageid_setup = '设定显示指定页面部包括目录，或者不包括目录。'; + $lang->about_springnote_domain = '设定其他SpringNote. (http://域名.springnote.com 中输入《域名》值。)'; +?> From 87c9e06fec7c9315e259a4011521efcebe1f7d8c Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 24 Dec 2007 13:25:33 +0000 Subject: [PATCH 089/105] =?UTF-8?q?display=EC=8B=9C=EC=97=90=20gzip=20head?= =?UTF-8?q?er=EB=A5=BC=20=EB=B3=B4=EB=82=B4=EC=A7=80=20=EC=95=8A=EB=8D=98?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=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@3414 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/display/DisplayHandler.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 8a0946267..201e6c50c 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -220,10 +220,9 @@ * @brief RequestMethod에 맞춰 헤더 출력 ***/ function _printHeader() { + if($this->gz_enabled) header("Content-Encoding: gzip"); if(Context::getResponseMethod() != 'HTML') return $this->_printXMLHeader(); else return $this->_printHTMLHeader(); - - if($this->gz_enabled) header("Content-Encoding: gzip"); } /** From 13aa12e77f16ee44c788edef1fb5ca042277d66e Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 25 Dec 2007 15:41:13 +0000 Subject: [PATCH 090/105] ticket:347, fixed bug that spring note module does not display template image. git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3415 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/springnote/springnote.model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/springnote/springnote.model.php b/modules/springnote/springnote.model.php index a605e7172..59e1f2d9e 100644 --- a/modules/springnote/springnote.model.php +++ b/modules/springnote/springnote.model.php @@ -100,6 +100,9 @@ // 첨부파일의 경로를 변경 $page->source = preg_replace('/="\/pages\/([0-9]+)\/attachments\/([0-9]+)"/is','="'.$page->uri.'/attachments/\\2"', $page->source); + // Change path of the template images + $page->source = preg_replace('/="\/images\/template\/([^"]+)"/is','="http://zbxe.springnote.com/images/template/\\1"', $page->source); + $uri = preg_replace('/pages(.*)$/i','',$page->uri); $page->css_files = array( sprintf('%sstylesheets/xhtmlContent.css?%d', $uri, time()), From 4f70eaf15eb575a2e71ec6bad225a2e125e1f248 Mon Sep 17 00:00:00 2001 From: chinaskyking Date: Wed, 26 Dec 2007 07:32:04 +0000 Subject: [PATCH 091/105] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=9E=AC?= =?UTF-8?q?=EA=B3=84=EC=82=B0=20=EC=A4=91=EB=AC=B8=20=EB=88=84=EB=9D=BD=20?= =?UTF-8?q?=EB=B2=88=EC=97=AD..?= 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@3416 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/point/lang/zh-CN.lang.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php index 9e3a5e5fc..0a91ebd49 100644 --- a/modules/point/lang/zh-CN.lang.php +++ b/modules/point/lang/zh-CN.lang.php @@ -1,6 +1,6 @@ * @brief 积分 (point) 模块简体中文语言包 **/ @@ -31,8 +31,8 @@ $lang->cmd_exp_calc = '计算'; $lang->cmd_exp_reset = '初始化'; - $lang->cmd_point_recal = '포인트 재계산'; - $lang->about_cmd_point_recal = '게시글/댓글/첨부파일등을 모두 검사하여 설정된 포인트 설정에 맞게 모든 회원들의 포인트를 재계산합니다'; + $lang->cmd_point_recal = '重新计算积分'; + $lang->about_cmd_point_recal = '文章/评论/附件等从新检查后按相应设置从新计算积分。'; $lang->about_module_point = '可以分别对各模块进行积分设置，没有被设置的模块将使用默认值。
所有积分在相反动作下恢复原始值。即：发表新帖后再删除得到的积分为0分。'; @@ -53,6 +53,6 @@ $lang->msg_cannot_download = '积分不足无法下载！'; - $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)'; - $lang->point_recal_finished = '포인트 재계산이 모두 완료되었습니다'; + $lang->point_recal_message = '计算中. (%d / %d)'; + $lang->point_recal_finished = '所有会员积分从新计算完毕。'; ?> From c0532578dc1a7504b880cfeb193e44592789816c Mon Sep 17 00:00:00 2001 From: chinaskyking Date: Wed, 26 Dec 2007 07:39:46 +0000 Subject: [PATCH 092/105] =?UTF-8?q?Importer=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=A4=91=EB=AC=B8=20=EB=88=84=EB=9D=BD=20=EB=B2=88=EC=97=AD.?= 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@3417 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/importer/lang/zh-CN.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/importer/lang/zh-CN.lang.php b/modules/importer/lang/zh-CN.lang.php index 1e354525c..1e289d054 100644 --- a/modules/importer/lang/zh-CN.lang.php +++ b/modules/importer/lang/zh-CN.lang.php @@ -13,7 +13,7 @@ $lang->importer = '数据导入'; $lang->source_type = '导入对象'; $lang->type_member = '会员信息'; - $lang->type_message = '쪽지(메세지) 정보'; + $lang->type_message = '短信息(MemoBox)'; $lang->type_module = '版面信息'; $lang->type_syncmember = '同步会员信息'; $lang->target_module = '模块对象'; @@ -45,7 +45,7 @@ // 说明 $lang->about_type_member = '数据导入对象为会员信息时请选择此项。'; - $lang->about_type_message = '데이터 이전 대상이 쪽지(메세지)일 경우 선택해주세요'; + $lang->about_type_message = '数据导入对象为短信息(MemoBox)时请选择此项。'; $lang->about_type_module = '数据导入对象为版面主题时请选择此项。'; $lang->about_type_syncmember = '导入会员信息和文章信息后需要同步会员信息时请选择此项。'; $lang->about_importer = "不仅可以导入Zeroboard 4，Zb5beta的数据,也可以把其他程序数据导入到Zeroboard XE当中。\n导入数据时请利用 XML Exporter生成XML文件后再上传。"; From fd933bb885906f7f460a0beab3e1da357ebbdb12 Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 26 Dec 2007 09:55:55 +0000 Subject: [PATCH 093/105] =?UTF-8?q?code=5Fhighlighter=20addon=20-=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EA=B2=BD=EB=A1=9C/=EC=84=A4=EB=AA=85=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EC=9D=B4=20=EC=97=86=EC=9D=8C=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=ED=83=9C=EA=B7=B8=EB=A5=BC=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=ED=95=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?&=20PHP=EB=A5=BC=20=EC=B5=9C=EC=83=81=EB=8B=A8=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=8B=A4=EC=8B=9C=20=EC=9D=B4=EB=8F=99?= 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@3418 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../code_highlighter/code_highlighter.class.php | 17 ++++++++--------- .../components/code_highlighter/tpl/popup.html | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/editor/components/code_highlighter/code_highlighter.class.php b/modules/editor/components/code_highlighter/code_highlighter.class.php index 2fdb88607..cfa6ed5ab 100755 --- a/modules/editor/components/code_highlighter/code_highlighter.class.php +++ b/modules/editor/components/code_highlighter/code_highlighter.class.php @@ -50,7 +50,7 @@ class code_highlighter extends EditorHandler { if($option_collapse == 'true') $option = $option.':collapse'; if($option_nogutter == 'true') $option = $option.':nogutter'; if($option_nocontrols == 'true' && $option_collapse != 'true') $option = $option.':nocontrols'; - if($option_first_line) $option = $option.":firstline[$option_first_line]"; + if($option_first_line > 1) $option = $option.":firstline[$option_first_line]"; $body = $xml_obj->body; @@ -58,8 +58,8 @@ class code_highlighter extends EditorHandler { $body = preg_replace('@()(\n)?@i' , "\n", $body); $body = strip_tags($body); - if(!$GLOBALS['_called_code_highlighter_']) { - $GLOBALS['_called_code_highlighter_'] = true; + if(!$GLOBALS['_called_editor_component_code_highlighter_']) { + $GLOBALS['_called_editor_component_code_highlighter_'] = true; $js_code = << dp.SyntaxHighlighter.ClipboardSwf = '{$this->component_path}script/clipboard.swf'; @@ -68,18 +68,17 @@ dp.SyntaxHighlighter.HighlightAll('code'); dpScript; Context::addHtmlFooter($js_code); + Context::addCSSFile($this->component_path.'css/SyntaxHighlighter.css'); + Context::addJsFile($this->component_path.'script/shCore.js'); } - Context::addCSSFile($this->component_path.'css/SyntaxHighlighter.css'); - - Context::addJsFile($this->component_path.'script/shCore.js'); Context::addJsFile($this->component_path.'script/shBrush'.$code_type.'.js'); $output = null; - if(isset($option_file_path) || isset($option_description)) { + if($option_file_path != null || $option_description != null) { $output .= '
'; - if(isset($option_file_path)) $output .= ''.$option_file_path.''; - if(isset($option_description)) $output .= ''.$option_description.''; + if($option_file_path != null) $output .= ''.$option_file_path.''; + if($option_description != null) $output .= ''.$option_description.''; $output .= '
'; } $output .= sprintf('
%s
', $code_type.$option, $body); diff --git a/modules/editor/components/code_highlighter/tpl/popup.html b/modules/editor/components/code_highlighter/tpl/popup.html index a38736285..a519c88c1 100755 --- a/modules/editor/components/code_highlighter/tpl/popup.html +++ b/modules/editor/components/code_highlighter/tpl/popup.html @@ -15,8 +15,8 @@ {$lang->code_type} + + + + diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js index c80f31cb1..4df22c5b5 100644 --- a/modules/importer/tpl/js/importer_admin.js +++ b/modules/importer/tpl/js/importer_admin.js @@ -181,3 +181,65 @@ function completeImportModule(ret_obj, response_tags) { } } +/* TTXML 데이터 import */ +function doImportTTXML(fo_obj) { + var target_module = fo_obj.target_module.options[fo_obj.target_module.selectedIndex].value; + if(!target_module) return false; + + var xml_file = fo_obj.xml_file.value; + if(!xml_file) return false; + + var params = new Array(); + params['xml_file'] = xml_file; + params['target_module'] = target_module; + params['total_count'] = fo_obj.total_count.value; + params['success_count'] = fo_obj.success_count.value; + params['readed_line'] = fo_obj.readed_line.value; + params['user_id'] = fo_obj.user_id.value; + + var response_tags = new Array("error","message", "total_count", "success_count", "readed_line", "is_finished"); + + exec_xml('importer','procImporterAdminTTXMLImport', params, completeImportTTXML, response_tags); + + return false; +} + +function completeImportTTXML(ret_obj, response_tags) { + var total_count = ret_obj['total_count']; + var success_count = ret_obj['success_count']; + var readed_line = ret_obj['readed_line']; + var is_finished = ret_obj['is_finished']; + + if(is_finished == '1') { + var fo_obj = xGetElementById("fo_import"); + fo_obj.target_module.disabled = false; + fo_obj.xml_file.disabled = false; + fo_obj.total_count.value = 0; + fo_obj.success_count.value = 0; + fo_obj.readed_line.value = 0; + + xGetElementById("status").style.display = "none"; + xGetElementById("status_button_prev").style.display = "block"; + xGetElementById("status_button").style.display = "none"; + + + xInnerHtml("status", ret_obj['message']); + + alert(ret_obj['message']); + } else { + var fo_obj = xGetElementById("fo_import"); + fo_obj.target_module.disabled = true; + fo_obj.xml_file.disabled = true; + fo_obj.total_count.value = total_count; + fo_obj.success_count.value = success_count; + fo_obj.readed_line.value = readed_line; + + xGetElementById("status").style.display = "block"; + xGetElementById("status_button_prev").style.display = "none"; + xGetElementById("status_button").style.display = "block"; + + xInnerHtml("status", ret_obj['message']); + + doImportTTXML(fo_obj); + } +} diff --git a/modules/importer/tpl/ttxml.html b/modules/importer/tpl/ttxml.html new file mode 100644 index 000000000..8ee123b82 --- /dev/null +++ b/modules/importer/tpl/ttxml.html @@ -0,0 +1,60 @@ + + + +

{$lang->importer} {$lang->cmd_management}

+ + +
{nl2br($lang->about_importer)}
+ + +
+ + + + + + + + + + +
{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}
+ +
+ + + + + +
+ {$lang->user_id} : +

{$lang->about_ttxml_user_id}

+
+ + + + + + + + + +
{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}
+ +

ex1) ../module.xml

+

ex2) http://...../module.xml

+
+
+ +
+ + + + +
+ From 5399b1301c61d977e67555633ac71e1a4228ddfd Mon Sep 17 00:00:00 2001 From: haneul Date: Fri, 28 Dec 2007 03:25:31 +0000 Subject: [PATCH 099/105] fixed ticket:352 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3425 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/login_info/skins/xe_official/login_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/login_info/skins/xe_official/login_info.html b/widgets/login_info/skins/xe_official/login_info.html index e40d7d1e5..9f37487cb 100644 --- a/widgets/login_info/skins/xe_official/login_info.html +++ b/widgets/login_info/skins/xe_official/login_info.html @@ -19,7 +19,7 @@
    -
  • {Context::getLang($val)}
    • +
  • {Context::getLang($val)}
    • From 30144beae872145d8f4734e0a216034097d2e43d Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 28 Dec 2007 03:37:48 +0000 Subject: [PATCH 100/105] =?UTF-8?q?#349=20=EA=B8=B0=EB=B3=B8=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=9D=98=20=EA=B8=80?= =?UTF-8?q?=EC=93=B0=EA=B8=B0=20=ED=8F=BC=EC=97=90=EC=84=9C=20getTitleText?= =?UTF-8?q?()=EB=A5=BC=20htmlspecialchars()=EB=A5=BC=20=EC=9D=B4=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EB=94=B0=EC=98=B4=ED=91=9C=EB=93=B1?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=ED=83=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=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@3426 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/cozy_board/write_form.html | 2 +- modules/board/skins/xe_board/write_form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/board/skins/cozy_board/write_form.html b/modules/board/skins/cozy_board/write_form.html index 3240fbce7..42a9b3177 100644 --- a/modules/board/skins/cozy_board/write_form.html +++ b/modules/board/skins/cozy_board/write_form.html @@ -36,7 +36,7 @@ - +
diff --git a/modules/board/skins/xe_board/write_form.html b/modules/board/skins/xe_board/write_form.html index a35c15e7e..0dd71ccf9 100644 --- a/modules/board/skins/xe_board/write_form.html +++ b/modules/board/skins/xe_board/write_form.html @@ -36,7 +36,7 @@ - +
From 1b0898f178005a3dab57da280645449d1e198201 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 28 Dec 2007 03:54:16 +0000 Subject: [PATCH 101/105] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=97=90=EB=94=94?= =?UTF-8?q?=ED=84=B0=20=EC=8A=A4=ED=82=A8=EC=9D=84=20=EC=A7=99=EC=9D=80=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=97=90=EC=84=9C=EB=8F=84=20=EC=9E=98=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=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@3427 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/skins/default/css/editor.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/editor/skins/default/css/editor.css b/modules/editor/skins/default/css/editor.css index 70fdcf9ca..179ecf9ae 100644 --- a/modules/editor/skins/default/css/editor.css +++ b/modules/editor/skins/default/css/editor.css @@ -1,40 +1,40 @@ @charset "utf-8"; .xeEditor { } -.xeEditor .optionABC { clear:both; width:100%; border-bottom:1px solid #c2c2c2; overflow:hidden; background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat -3px bottom;} +.xeEditor .optionABC { clear:both; width:100%; overflow:hidden; background:transparent;} .xeEditor .optionABC .selectGroup { white-space:nowrap; display:block; height:21px; margin:0 .5em 0 0; padding-left:1em; float:left;} .xeEditor .optionABC .buttonGroup { white-space:nowrap; position:relative; display:block; margin:0 .5em 0 0; float:left; height:21px; overflow:hidden; padding-left:2px;} .xeEditor .optionABC .buttonGroup img { float:left; display:block; margin-left:-1px; cursor:pointer;} .xeEditor .optionA, .xeEditor .optionB, -.xeEditor .optionC { float:left; background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat left bottom; padding:.5em 0 .5em .7em; overflow:hidden;} +.xeEditor .optionC { float:left; background:transparent; padding:.5em 0 .5em .7em; overflow:hidden;} .xeEditor .optionA *, .xeEditor .optionB *, .xeEditor .optionC * { vertical-align:middle;} .xeEditor .optionA { background-position:-3px bottom; padding-left:0;} .xeEditor .optionA select option { font-size:.9em; } -.xeEditor .optionDE { width:100%; clear:both; overflow:hidden; background:#f8f8f8; border-bottom:1px solid #e1e1e1; height:29px;} +.xeEditor .optionDE { width:100%; clear:both; overflow:hidden; background:transparent;height:29px;} .xeEditor .optionDE .buttonGroup { white-space:nowrap; position:relative; display:block; float:left; height:21px; overflow:hidden; padding-left:2px;} .xeEditor .optionDE img { float:left; display:block; margin-right:.5em; cursor:pointer;} .xeEditor .optionD { padding:.5em 0 .5em .8em; overflow:hidden; float:left; border-right:1px solid #e0e0e0;} -.xeEditor .optionE { padding:4px 0 0 8px; overflow:hidden; border-left:1px solid #ffffff; float:left;} +.xeEditor .optionE { padding:4px 0 0 9px; overflow:hidden; float:left;} -.xeEditor .editorInfo { background:#fbfbfb; padding:.5em; border:1px solid #e1e1dd; color:#999999; position:relative; margin:5px 20px 0 20px;} +.xeEditor .editorInfo { background:transparent; padding:.5em; border:1px solid #e1e1dd; color:#999999; position:relative; margin:5px 20px 0 20px;} .xeEditor .close { cursor:pointer; position:absolute; top:3px; right:3px; _top:3px; _right:25px;} -.xeEditor .editor_iframe_box { clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:5px; margin:10px 20px 10px 20px; } +.xeEditor .editor_iframe_box { clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; margin:3px 10px 5px 10px; } .xeEditor .editor_iframe_textarea { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; margin:0 20px 0 20px; width:100%; font-size:1em; display:none;} .xeEditor .textAreaDragIndicator { text-align:center; background:url(../images/lineTextAreaDrag.gif) repeat-x left center; padding:5px 0 5px 0; } .xeEditor .textAreaDragIndicatorBar { background:url(../images/buttonTextAreaDrag.gif) no-repeat center; cursor:move;height:14px;} -.xeEditor .editor_info { clear:both; padding:10px 20px 5px 20px; overflow:hidden;} +.xeEditor .editor_info { clear:both; padding:5px 20px 0 10px; overflow:hidden;} .xeEditor .editor_info .editor_option { float:left; color:#888888; } .xeEditor .editor_info .editor_autosaved_message { color:#888888; float:right; } .xeEditor .inputTypeTextArea { background:#fbfbfb; padding:1em; width:94%;} .xeEditor #textAreaDrag {} .xeEditor .fileAttach { padding:0 1em .5em 1em;} -.xeEditor .fileAttach .preview { padding:5px; width:110px; height:110px; border:1px solid #e1e1dd; background:#fbfbfb; float:left; margin-right:.5em;} +.xeEditor .fileAttach .preview { padding:5px; width:110px; height:110px; border:1px solid #e1e1dd; background:transparent; float:left; margin-right:.5em;} .xeEditor .fileAttach .preview img { width:110px; height:110px; float:left; display:block;} .xeEditor .fileAttach .fileListArea { float:left; width:50%; margin-right:.7em; padding-bottom:.5em; margin-bottom:1em} .xeEditor .fileAttach .fileListArea .fileList { overflow:auto; width:100%; height:auto; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; margin-bottom:.3em; font-size:11px;} From 48120abcf36dea56ac0d69196b48818fa5fc50c8 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 28 Dec 2007 03:58:22 +0000 Subject: [PATCH 102/105] =?UTF-8?q?=EB=B9=84=EB=B0=80=EA=B8=80=EC=9D=B4?= =?UTF-8?q?=EB=9D=BC=EA=B3=A0=20=ED=95=A0=EC=A7=80=EB=9D=BC=EB=8F=84=20?= =?UTF-8?q?=EC=A0=9C=EB=AA=A9=EC=9D=80=20=EB=B3=B4=EC=9D=B4=EB=8F=84?= =?UTF-8?q?=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@3428 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 1d437b931..222e78e16 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -174,7 +174,7 @@ } function getTitleText($cut_size = 0, $tail='...') { - if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret'); + if(!$this->document_srl) return; if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail); else $title = $this->get('title'); From 16fc3c782089032460e14e79d624ccc2a0afbfb1 Mon Sep 17 00:00:00 2001 From: supershop Date: Fri, 28 Dec 2007 05:03:19 +0000 Subject: [PATCH 103/105] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD?= 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@3429 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/importer/lang/en.lang.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/importer/lang/en.lang.php b/modules/importer/lang/en.lang.php index 57f82d677..cb42af6b2 100644 --- a/modules/importer/lang/en.lang.php +++ b/modules/importer/lang/en.lang.php @@ -10,15 +10,15 @@ $lang->cmd_continue = 'Continue'; // items - $lang->importer = 'Transfer zeroboard datas'; - $lang->source_type = 'Previous target'; - $lang->type_member = 'Member data'; - $lang->type_message = 'Message data'; + $lang->importer = 'Transfer Zeroboard Data'; + $lang->source_type = 'Previous Target'; + $lang->type_member = 'Member Data'; + $lang->type_message = 'Message Data'; $lang->type_ttxml = 'TTXML'; - $lang->type_module = 'Articles data'; - $lang->type_syncmember = 'Synchronize member data'; - $lang->target_module = 'Target module'; - $lang->xml_file = 'XML file'; + $lang->type_module = 'Articles Data'; + $lang->type_syncmember = 'Synchronize Member Data'; + $lang->target_module = 'Target Module'; + $lang->xml_file = 'XML File'; $lang->import_step_title = array( 1 => 'Step 1. Select previous target', @@ -47,8 +47,8 @@ // blah blah.. $lang->about_type_member = 'If you are transfering the member information, select this option'; $lang->about_type_message = 'If you are transfering the message information, select this option'; - $lang->about_type_ttxml = '데이터 이전 대상이 TTXML(textcube계열)일 경우 선택해주세요'; - $lang->about_ttxml_user_id = 'TTXML이전시에 글쓴이로 지정할 사용자 아이디를 입력해주세요. (이미 가입된 아이디여야 합니다)'; + $lang->about_type_ttxml = 'If you are transfering the TTXML(textcube) information, select this option'; + $lang->about_ttxml_user_id = 'Please input user ID to set as author on transfering TTXML. (user ID must be already signed up)'; $lang->about_type_module = 'If you are transfering the board or articles information, select this option'; $lang->about_type_syncmember = 'If you are trying to synchronize the member information after transfering member and article information, select this option'; $lang->about_importer = "You can transfer Zeroboard4, Zeroboard5 Beta or other program's data into ZeroboardXE's data.\nIn order to tranfer, you have to use XML Exporter to convert the data you want into XML File then upload it."; From 17b54d6cdc260e06ab4f1a1d6cd775122acd9491 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 28 Dec 2007 05:53:45 +0000 Subject: [PATCH 104/105] =?UTF-8?q?gagachat=20=EC=9C=84=EC=A0=AF=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3430 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/gagachat/conf/info.xml | 79 +++++++++++ widgets/gagachat/gagachat.class.php | 105 +++++++++++++++ .../skins/default/js/AC_RunActiveContent.js | 126 ++++++++++++++++++ .../gagachat/skins/default/livechat.000.html | 9 ++ widgets/gagachat/skins/default/livechat.html | 12 ++ .../gagachat/skins/default/livechat2.000.html | 9 ++ widgets/gagachat/skins/default/livechat2.html | 12 ++ widgets/gagachat/skins/default/skin.xml | 13 ++ 8 files changed, 365 insertions(+) create mode 100644 widgets/gagachat/conf/info.xml create mode 100644 widgets/gagachat/gagachat.class.php create mode 100644 widgets/gagachat/skins/default/js/AC_RunActiveContent.js create mode 100644 widgets/gagachat/skins/default/livechat.000.html create mode 100644 widgets/gagachat/skins/default/livechat.html create mode 100644 widgets/gagachat/skins/default/livechat2.000.html create mode 100644 widgets/gagachat/skins/default/livechat2.html create mode 100644 widgets/gagachat/skins/default/skin.xml diff --git a/widgets/gagachat/conf/info.xml b/widgets/gagachat/conf/info.xml new file mode 100644 index 000000000..5387ab876 --- /dev/null +++ b/widgets/gagachat/conf/info.xml @@ -0,0 +1,79 @@ + + + 가가 채팅 + + 디지레이브 + 실시간 채팅방을 생성합니다 + + + + 채팅방 이름(필수/영문) + text + 채팅방 이름. + (@, @@, @@@ 로 시작하는 채팅방은 회원 시스템과 연동 가능한 보안 채팅방) + 보안 채팅방은 http://www.gagalive.kr/live/livechatxe 에서 신청하시길 바랍니다. + 회원 시스템과 연동하지 않을 경우 별도의 신청 필요 없이 원하는 채팅방 이름만 입력하면 됩니다. + + + + 채팅방 보안 키(선택사항) + text + 보안 채팅방 사용시에만 필요함. 보안 채팅방을 사용하지 않을 경우에는 빈 칸으로 놔두시길 바랍니다. + + + 채팅방 관리자(선택사항) + text + 보안 채팅방 사용시에만 적용됨. 강제 퇴장 기능 가능함. 아이디, 아이디2, 아이디3 처럼 채팅방 관리자들을 , 로 분리하시길 바랍니다. + + + 채팅방 형태 + select + 세로형/가로형 + + 세로형 + 2 + + + 가로형 + 1 + + + + 채팅방 높이(선택사항) + text + 채팅방 높이(기본값 450) + + + 글씨체(선택사항) + text + Font-family 예) 굴림체 + + + 글씨 색깔(선택사항) + text + 채팅방 글씨 색깔 예) white 또는 #FFFFFF + + + 배경 색깔(선택사항) + text + 채팅방 배경 색깔 예) black 또는 #000000 + + + 큰 글씨체 + select + 글씨체 크기 + + 작은 글씨체 + small + + + 중간 글씨체 + medium + + + 큰 글씨체 + large + + + + diff --git a/widgets/gagachat/gagachat.class.php b/widgets/gagachat/gagachat.class.php new file mode 100644 index 000000000..ec3347299 --- /dev/null +++ b/widgets/gagachat/gagachat.class.php @@ -0,0 +1,105 @@ +widget_path, $args->skin); + Context::set('colorset', $args->colorset); + /* + $name = getenv("HTTP_HOST") . getenv("SCRIPT_NAME"); + $name = preg_replace("/^http:\/\//", "" ,$name); + $name = preg_replace("/(.+)\/.+?$/", "$1" ,$name); + */ + $name = $args->chatroom; + $roomkey = $args->roomkey; + $gposition = $args->gposition; + $gfonttype = $args->gfonttype; + $gfontcolor = $args->gfontcolor; + $gbgcolor = $args->gbgcolor; + + if(strlen($args->gheight) > 2) { + $gheight = $args->gheight; + } + else { + $gheight = 450; + } + $fontlarge = $args->fontlarge; + $gagaadmin = $args->gagaadmin; + $gagaadmin = preg_replace('/\s*,\s*/', ',', $gagaadmin); + $gagaadmins = split(',', $gagaadmin); + + $fixbug = 0; + + $vars = Context::getRequestVars(); + if($vars->act == "dispPageAdminContentModify") { + $fixbug = 15; + } + + Context::set('fixbug', $fixbug); + Context::set('gheight', $gheight); + Context::set('gposition', $gposition); + Context::set('fontlarge', $fontlarge); + Context::set('gfonttype', $gfonttype); + Context::set('gfontcolor', $gfontcolor); + Context::set('gbgcolor', $gbgcolor); + Context::set('name', $name); + + $tpl_file = 'livechat'; + + if(substr($name, 0, 1) == "#" || substr($name, 0, 1) == "@") { + if(Context::get('is_logged')) { + $oModuleModel = &getModel('module'); + $this->member_config = $oModuleModel->getModuleConfig('member'); + $logged_info = Context::get('logged_info'); + //Context::set('member_config', $this->member_config); + Context::set('user', $logged_info->nick_name); + Context::set('userkey', userKey($logged_info->nick_name, $roomkey)); + foreach($gagaadmins as $value) { + if($logged_info->user_id == $value) { + //일반 유저인 경우 + Context::set('userkey', md5(userKey($logged_info->nick_name, $roomkey))); + } //관리자인 경우 + } + $tpl_file = 'livechat2'; + } + } + // 템플릿 파일을 지정 + /* + if(Context::get('is_logged')) $tpl_file = 'login_info'; + else $tpl_file = 'login_form'; + + // 회원 관리 정보를 받음 + $oModuleModel = &getModel('module'); + $this->member_config = $oModuleModel->getModuleConfig('member'); + Context::set('member_config', $this->member_config); + */ + + // 템플릿 컴파일 + $oTemplate = &TemplateHandler::getInstance(); + return $oTemplate->compile($tpl_path, $tpl_file); + } + + + } + + if($GLOBALS['userKeyDefined'] != 1) { + $GLOBALS['userKeyDefined'] = 1; + function userKey($user, $roomKey) { + return md5(md5($user . $roomKey) . $roomKey); + } +} +?> diff --git a/widgets/gagachat/skins/default/js/AC_RunActiveContent.js b/widgets/gagachat/skins/default/js/AC_RunActiveContent.js new file mode 100644 index 000000000..1f9190af3 --- /dev/null +++ b/widgets/gagachat/skins/default/js/AC_RunActiveContent.js @@ -0,0 +1,126 @@ +//v1.0 +//Copyright 2006 Adobe Systems, Inc. All rights reserved. +function AC_AddExtension(src, ext) +{ + if (src.indexOf('?') != -1) + return src.replace(/\?/, ext+'?'); + else + return src + ext; +} + +function AC_Generateobj(objAttrs, params, embedAttrs) +{ + var str = ' '; + str += ' + + + + + +
diff --git a/widgets/gagachat/skins/default/livechat.html b/widgets/gagachat/skins/default/livechat.html new file mode 100644 index 000000000..9f0f51c39 --- /dev/null +++ b/widgets/gagachat/skins/default/livechat.html @@ -0,0 +1,12 @@ + + +
+ +
+
\ No newline at end of file diff --git a/widgets/gagachat/skins/default/livechat2.000.html b/widgets/gagachat/skins/default/livechat2.000.html new file mode 100644 index 000000000..89b55fd4a --- /dev/null +++ b/widgets/gagachat/skins/default/livechat2.000.html @@ -0,0 +1,9 @@ + + + + + + +
\ No newline at end of file diff --git a/widgets/gagachat/skins/default/livechat2.html b/widgets/gagachat/skins/default/livechat2.html new file mode 100644 index 000000000..704398a90 --- /dev/null +++ b/widgets/gagachat/skins/default/livechat2.html @@ -0,0 +1,12 @@ + + +
+ +
+
\ No newline at end of file diff --git a/widgets/gagachat/skins/default/skin.xml b/widgets/gagachat/skins/default/skin.xml new file mode 100644 index 000000000..2ea564dc7 --- /dev/null +++ b/widgets/gagachat/skins/default/skin.xml @@ -0,0 +1,13 @@ + + + 가가 채팅 기본 스킨 + + 디지레이브 + newest_document의 기본 스킨 + + + + 기본 + + + From 4dce0179238fe809e919587c24381bfbcf7e1feb Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 28 Dec 2007 05:54:24 +0000 Subject: [PATCH 105/105] =?UTF-8?q?zbxe=20beta=200.2.8=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=98=AC=EB=A6=BC?= 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@3431 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/tpl/common_layout.html | 2 +- config/config.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 9752cdc73..e8b0015b1 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -2,7 +2,7 @@ - + diff --git a/config/config.inc.php b/config/config.inc.php index 8d3ff21e5..33c7fe0f8 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며 * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '0.2.7'); + define('__ZBXE_VERSION__', '0.2.8'); /** * @brief 디버깅 메세지 출력