fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-23 13:19:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

copy to trunk and tag

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7296 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-02-08 08:16:21 +00:00
commit fb4b21625b
4 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/admin.admin.model.php
View file

@ -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, '<DIR>')) $list[] = substr(strrchr($v,' '),1) . '/';
}
}
$this->add('list', $list);

22
modules/autoinstall/autoinstall.lib.php
View file

@ -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");
}
}
}
}

20
modules/editor/skins/xpresseditor/js/xe_interface.js
View file

@ -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;
}
});

5
modules/member/member.controller.php
View file

@ -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');