diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 8e658c84c..df1a77202 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -71,7 +71,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);
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");
+ }
}
}
}
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index ac966f8b6..1a367bbda 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -249,22 +249,28 @@ 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) {
- // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = editorReplacePath(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');
+ 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;
-
}
});
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');