From 256647c2d0d82b38363dd65291b09a6b4f34336b Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 15:21:56 +0000 Subject: [PATCH 1/6] #18681045 : fixed a bug that getting list for ftp setting did not work on windows server git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7288 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.admin.model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 8e658c84c..14ba26bad 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -60,6 +60,7 @@ if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){ if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { $_list = $oFtp->ftp_rawlist($this->pwd); + debugPrint($_list); $oFtp->ftp_quit(); } else @@ -71,7 +72,7 @@ if($_list){ foreach($_list as $k => $v){ - if(strpos($v,'d') === 0) $list[] = substr(strrchr($v,' '),1) . '/'; + if(strpos($v,'d') === 0 || strpos($v, '')) $list[] = substr(strrchr($v,' '),1) . '/'; } } $this->add('list', $list); From 4343e0592e7d86126cf7317289f757ce6cb4871e Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 16:01:33 +0000 Subject: [PATCH 2/6] #18681100 : do not chmod for windows server git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7289 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.lib.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 84c0e6eaa..44a8f9944 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -205,17 +205,21 @@ { return new Object(-1, "msg_make_directory_failed"); } - if (function_exists('ftp_chmod')) { - if(!ftp_chmod($connection, 0755, $ftp_path)) - { - return new Object(-1, "msg_permission_adjust_failed"); - } - } - else + + if(!stristr(PHP_OS, 'win')) { - if(!ftp_site($connection, "CHMOD 755 ".$ftp_path)) + if (function_exists('ftp_chmod')) { + if(!ftp_chmod($connection, 0755, $ftp_path)) + { + return new Object(-1, "msg_permission_adjust_failed"); + } + } + else { - return new Object(-1, "msg_permission_adjust_failed"); + if(!ftp_site($connection, "CHMOD 755 ".$ftp_path)) + { + return new Object(-1, "msg_permission_adjust_failed"); + } } } } From 07f67527c46f06dce67eb92a6ffc57555b41f8c3 Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 16:20:05 +0000 Subject: [PATCH 3/6] remove debugPrint git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7291 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.admin.model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 14ba26bad..df1a77202 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -60,7 +60,6 @@ if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){ if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { $_list = $oFtp->ftp_rawlist($this->pwd); - debugPrint($_list); $oFtp->ftp_quit(); } else From f1b917558ed3bea20d9df9d181db4cd02746f756 Mon Sep 17 00:00:00 2001 From: haneul Date: Mon, 8 Feb 2010 02:22:44 +0000 Subject: [PATCH 4/6] #18684132 : fixed openid problem on windows server git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7292 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.controller.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index db9e5cdef..47b64aed9 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -47,6 +47,11 @@ $config = $oModuleModel->getModuleConfig('member'); if($config->enable_openid != 'Y') $this->stop('msg_invalid_request'); + if(!defined('Auth_OpenID_RAND_SOURCE') && !file_exists("/dev/urandom")) + { + define('Auth_OpenID_RAND_SOURCE', null); + } + set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3"); require_once('Auth/OpenID.php'); require_once('Auth/OpenID/Consumer.php'); From 01b7111378350f385164e15832cf8135a0e66808 Mon Sep 17 00:00:00 2001 From: taggon Date: Mon, 8 Feb 2010 07:29:52 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=9D=98=20?= =?UTF-8?q?=EC=A0=88=EB=8C=80=EA=B2=BD=EB=A1=9C(http://~)=EB=A5=BC=20XE=20?= =?UTF-8?q?=EC=83=81=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EA=BE=B8=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EB=B3=B5=EC=9B=90?= 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@7293 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/skins/xpresseditor/js/xe_interface.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js index ac966f8b6..750f68d68 100644 --- a/modules/editor/skins/xpresseditor/js/xe_interface.js +++ b/modules/editor/skins/xpresseditor/js/xe_interface.js @@ -261,10 +261,16 @@ xe.XE_GET_WYSYWYG_CONTENT = jQuery.Class({ }, IR_TO_HTMLSrc : function(content) { - // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경 - content = editorReplacePath(content); + // src, href, url에서 http로 시작하는 full path를 XE 상대경로로 변경 + content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>|\))*/ig, function(m0,m1,m2,m3,m4,m5) { + var uriReg = new RegExp('^'+request_uri.replace('\/','\\/'),'ig'); + if(m1=="url(") { m2=''; m4=')'; } else { if(typeof(m2)=='undefined') m2 = '"'; if(typeof(m4)=='undefined') m4 = '"'; if(typeof(m5)=='undefined') m5 = ''; } + var val = jQuery.trim(m3); + if(uriReg.test(val)) val = val.replace(uriReg,''); + else val = m3; + return m1+m2+val+m4+m5; + }); return content; - } }); From cc2fa97e388ff4b09e22f62a366c0f029cce2ed0 Mon Sep 17 00:00:00 2001 From: taggon Date: Mon, 8 Feb 2010 07:40:29 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=9D=98=20?= =?UTF-8?q?=EC=A0=88=EB=8C=80=EA=B2=BD=EB=A1=9C(http://~)=EB=A5=BC=20XE=20?= =?UTF-8?q?=EC=83=81=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EA=BE=B8=EB=8A=94=20=EC=BD=94=EB=93=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@7294 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/skins/xpresseditor/js/xe_interface.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js index 750f68d68..1a367bbda 100644 --- a/modules/editor/skins/xpresseditor/js/xe_interface.js +++ b/modules/editor/skins/xpresseditor/js/xe_interface.js @@ -249,18 +249,18 @@ xe.XE_GET_WYSYWYG_CONTENT = jQuery.Class({ name : "XE_GET_WYSYWYG_CONTENT", $ON_MSG_APP_READY : function() { - this.oApp.addConverter("IR_TO_WYSIWYG", this.TO_WYSIWYG_SET); - this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO_HTMLSrc); + this.oApp.addConverter("IR_TO_WYSIWYG", this.replaceXE2HTTP); + this.oApp.addConverter("WYSIWYG_TO_IR", this.replaceHTTP2XE); }, - TO_WYSIWYG_SET : function(content) { + replaceXE2HTTP : function(content) { // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경 content = editorReplacePath(content); return content; }, - IR_TO_HTMLSrc : function(content) { + replaceHTTP2XE : function(content) { // src, href, url에서 http로 시작하는 full path를 XE 상대경로로 변경 content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>|\))*/ig, function(m0,m1,m2,m3,m4,m5) { var uriReg = new RegExp('^'+request_uri.replace('\/','\\/'),'ig');