From bb21aa5ac199aada9d9d83c4816717306107950f Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 19 Feb 2008 17:08:42 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9=20?= =?UTF-8?q?=EB=82=A8=EC=95=84=20=EC=9E=88=EB=8D=98=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=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@3725 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_board/view_document.html | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/board/skins/xe_board/view_document.html b/modules/board/skins/xe_board/view_document.html index 8deaf2c25..944d52ae5 100644 --- a/modules/board/skins/xe_board/view_document.html +++ b/modules/board/skins/xe_board/view_document.html @@ -116,7 +116,6 @@
{$oDocument->getSignature()}
- From 966925b18f36c405232f6a4ee1397b0efd165bde Mon Sep 17 00:00:00 2001 From: supershop Date: Tue, 19 Feb 2008 20:02:59 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=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@3728 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/lang/en.lang.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php index bee0fb9b6..7c5287174 100644 --- a/modules/member/lang/en.lang.php +++ b/modules/member/lang/en.lang.php @@ -46,8 +46,8 @@ $lang->enable_join = 'Allow Member Join'; $lang->limit_day = 'Temporary Limit Date'; $lang->limit_date = 'Limit Date'; - $lang->after_login_url = '로그인 후 이동할 URL'; - $lang->after_logout_url = '로그아웃 후 이동할 URL'; + $lang->after_login_url = 'URL after login'; + $lang->after_logout_url = 'URL after logout'; $lang->redirect_url = 'URL after Join'; $lang->agreement = 'Member Join Agreement'; $lang->accept_agreement = 'Agree'; @@ -62,7 +62,7 @@ $lang->webmaster_name = "Webmaster's Name"; $lang->webmaster_email = "Webmaster's Email"; - $lang->about_keep_signed = '브라우저를 닫더라도 로그인이 게속 유지될 수 있습니다.\n\n로그인 유지시 사용시 다음 접속부터는 로그인을 하실필요가 없습니다.\n\n단, 게임방, 학교등 공공장소에서 이용시 개인정보가 유출될수 있으니 꼭 로그아웃을 해주세요'; + $lang->about_keep_signed = 'Your login session will not be expired even browser is closed.\n\nYou would not have to login manually from next time.\n\nIt is strongly recommended not to use auto-login in PC room, school, or other commons areas where your private information could be stolen.'; $lang->about_webmaster_name = "Please input webmaster's name which will be used for authentication mails or other site administration. (default : webmaster)"; $lang->about_webmaster_email = "Please input webmaster's email address."; @@ -185,8 +185,8 @@ $lang->about_enable_join = 'Allow users to sign up'; $lang->about_limit_day = 'You can limit certification date after sign up'; $lang->about_limit_date = 'User cannot login until assigned date'; - $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.'; - $lang->about_after_logout_url = '로그아웃 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.'; + $lang->about_after_login_url = 'You can set URL after login. Blank means current page.'; + $lang->about_after_logout_url = 'You can set URL after logout. Blank means current page.'; $lang->about_redirect_url = 'Please input URL where users will go after sign up. When this is empty, it will be set as the previous page of sign up page.'; $lang->about_agreement = "Sign up agreement will only be displayed when it's not empty"; From 4c94983b96baff60ce4309d544fae9dd2486fc62 Mon Sep 17 00:00:00 2001 From: sspa3141 Date: Tue, 19 Feb 2008 20:23:51 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=8C=8C=EB=83=90?= =?UTF-8?q?=EC=96=B4(=EC=8A=A4=ED=8E=98=EC=9D=B8=EC=96=B4)=20=EB=B2=88?= =?UTF-8?q?=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@3729 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_guestbook/skin.xml | 2 +- modules/editor/components/colorpicker_bg/info.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/board/skins/xe_guestbook/skin.xml b/modules/board/skins/xe_guestbook/skin.xml index 7680113b4..46d9f2b21 100644 --- a/modules/board/skins/xe_guestbook/skin.xml +++ b/modules/board/skins/xe_guestbook/skin.xml @@ -4,7 +4,7 @@ 留言本默认皮肤 ゲストブックのデフォルトスキン Zeroboard XE Basic Guestbook Skin - + 제로 Zero Zero diff --git a/modules/editor/components/colorpicker_bg/info.xml b/modules/editor/components/colorpicker_bg/info.xml index a920336f5..33851f099 100644 --- a/modules/editor/components/colorpicker_bg/info.xml +++ b/modules/editor/components/colorpicker_bg/info.xml @@ -4,17 +4,20 @@ 文字の背景色変更 背景颜色 Change the background color of article + Cambiar el color de fondo del artículo Изменение цвета фона статьи 제로 Zero zero zero + zero zero 글의 배경색을 변경합니다. 文字の背景色を変更します。 可修改字体背景颜色。 It will change the background color of article. + Se cambiará el color de fondo del artículo. Позволяет изменение цвета фона статьи. From 6b6013fddbb252f938c0e698ccd895cfcd892ce4 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 20 Feb 2008 02:18:59 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=EC=9D=98=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=EB=A5=BC=20window.onload=EA=B0=80?= =?UTF-8?q?=20=EC=95=84=EB=8B=8C=20object=EA=B0=80=20display=EB=90=98?= =?UTF-8?q?=EA=B3=A0=20=EB=82=9C=20=ED=9B=84=EB=A1=9C=20=EC=8B=9C=EC=A0=90?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3730 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../board/skins/xe_board/view_document.html | 1 + modules/editor/skins/default/editor.html | 20 +++++++++---------- modules/editor/skins/msword2007/editor.html | 19 +++++++++--------- modules/editor/skins/textarea/editor.html | 9 ++++----- modules/editor/skins/xquared/editor.html | 19 +++++++++--------- modules/editor/tpl/js/editor.js | 3 --- 6 files changed, 34 insertions(+), 37 deletions(-) diff --git a/modules/board/skins/xe_board/view_document.html b/modules/board/skins/xe_board/view_document.html index 944d52ae5..3fdc141c8 100644 --- a/modules/board/skins/xe_board/view_document.html +++ b/modules/board/skins/xe_board/view_document.html @@ -116,6 +116,7 @@
{$oDocument->getSignature()}
+ diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index 7630c4d5c..986112812 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -5,16 +5,6 @@ - - - @@ -186,3 +176,13 @@ + + + diff --git a/modules/editor/skins/msword2007/editor.html b/modules/editor/skins/msword2007/editor.html index 233d3443c..ff3cf0c45 100644 --- a/modules/editor/skins/msword2007/editor.html +++ b/modules/editor/skins/msword2007/editor.html @@ -6,15 +6,6 @@ - - - @@ -173,3 +164,13 @@ + + + + diff --git a/modules/editor/skins/textarea/editor.html b/modules/editor/skins/textarea/editor.html index ee11e631d..697011c71 100644 --- a/modules/editor/skins/textarea/editor.html +++ b/modules/editor/skins/textarea/editor.html @@ -5,11 +5,6 @@ - - -
@@ -17,3 +12,7 @@
+ + diff --git a/modules/editor/skins/xquared/editor.html b/modules/editor/skins/xquared/editor.html index af43d14ee..04f59715f 100644 --- a/modules/editor/skins/xquared/editor.html +++ b/modules/editor/skins/xquared/editor.html @@ -10,16 +10,6 @@ - - - @@ -92,3 +82,12 @@ + + + diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index abb5cdb9e..b0606a866 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -117,9 +117,6 @@ function editorStart(editor_sequence, primary_key, content_key, editor_height) { var contentHtml = ''+ ''+ ''+ - //''+ - //''+ - //''+ ''+ From aba0dbe5950aa60600b182160e7985275282c527 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 20 Feb 2008 03:24:16 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=EC=BA=90=EC=8B=9C=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=EA=B0=80=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=EB=A5=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=98=EA=B2=8C=20=ED=95=98=EC=97=AC=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=9D=84=20=EC=B0=BE=EC=9D=84=20=EC=88=98=20=EC=97=86?= =?UTF-8?q?=EB=8B=A4=EB=8A=94=20=EB=93=B1=EC=9D=98=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EA=B0=80=20=EB=82=98=ED=83=80=EB=82=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@3731 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/file/FileHandler.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index e6fa27e37..6138ea0b4 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -35,6 +35,10 @@ * @brief $buff의 내용을 파일에 쓰기 **/ function writeFile($file_name, $buff, $mode = "w") { + $pathinfo = pathinfo($file_name); + $path = $pathinfo['dirname']; + if(!is_dir($path)) FileHandler::makeDir($path); + $mode = strtolower($mode); if($mode != "a") $mode = "w"; if(@!$fp = fopen($file_name,$mode)) return false; From 472b39b70cff9d987f03b2a2f298645bd8d26307 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 20 Feb 2008 03:24:47 +0000 Subject: [PATCH 6/6] =?UTF-8?q?Optimizer=20=EC=82=AC=EC=9A=A9=EC=8B=9C=20?= =?UTF-8?q?=ED=8A=B9=EC=A0=95=20=EC=84=9C=EB=B2=84=EB=A7=88=EB=8B=A4=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EB=93=B1?= =?UTF-8?q?=EC=9D=B4=20=EB=82=98=ED=83=80=EB=82=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=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@3732 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 1 + classes/optimizer/Optimizer.class.php | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index debc38151..415d34a23 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -379,6 +379,7 @@ if($val && iconv($charset,$charset,$val)!=$val) $flag = false; } if($flag == true) { + if($charset == 'UTF-8') return $obj; foreach($obj as $key => $val) $obj->{$key} = iconv($charset,'UTF-8',$val); return $obj; } diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php index 6c5c01376..494919487 100644 --- a/classes/optimizer/Optimizer.class.php +++ b/classes/optimizer/Optimizer.class.php @@ -178,11 +178,10 @@ if(!$cached) { **/ function replaceCssPath($file, $str) { // css 파일의 위치를 구함 - $this->tmp_css_path = './'.preg_replace("/^\.\//is","",dirname($file))."/"; + $this->tmp_css_path = preg_replace("/^\.\//is","",dirname($file))."/"; // url() 로 되어 있는 css 파일의 경로를 변경 - $str = preg_replace_callback('!url\(("|\')?([^\)]+)("|\')?\)!is', array($this, '_replaceCssPath'), $str); - $str = preg_replace('!\/([^\/]*)\/\.\.\/!is','/', $str); + $str = preg_replace_callback('/url\(([^\)]*)\)/is', array($this, '_replaceCssPath'), $str); // charset 지정 문구를 제거 $str = preg_replace('!@charset([^;]*?);!is','',$str); @@ -191,8 +190,10 @@ if(!$cached) { } function _replaceCssPath($matches) { - if(preg_match("/^(http|\/|\.\/common\/)/is",$matches[2])) return $matches[0]; - return sprintf('url(%s%s)', $matches[1], $this->tmp_css_path.$matches[2]); + $path = str_replace(array('"',"'"),'',$matches[1]); + if(preg_match('/^http/i', $path) || preg_match('/\.htc$/i',$path) ) return $matches[0]; + + return 'url("../../../../'.$this->tmp_css_path.$path.'")'; } }