fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-13 14:02:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7 from xpressengine/develop

Browse source 
Develop - 140808
This commit is contained in:
sejin7940 2014-08-08 06:16:27 +09:00
commit e38a23fa6f
11 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
classes/template/TemplateHandler.class.php
View file

@ -365,12 +365,34 @@ class TemplateHandler
ob_start();
if(substr($buff, 0, 7) == 'file://')
{
include(substr($buff, 7));
if(__DEBUG__)
{
//load cache file from disk
$eval_str = FileHandler::readFile(substr($buff, 7));
$eval_str_buffed = "?>" . $eval_str;
@eval($eval_str_buffed);
$error_info = error_get_last();
//parse error
if ($error_info['type'] == 4)
{
throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
}
}
else
{
include(substr($buff, 7));
}
}
else
{
$eval_str = "?>" . $buff;
eval($eval_str);
@eval($eval_str);
$error_info = error_get_last();
//parse error
if ($error_info['type'] == 4)
{
throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
}
}
return ob_get_clean();

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.7.5.6');
define('__XE_VERSION__', '1.7.5.7');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

10
modules/board/board.view.php
View file

@ -395,6 +395,16 @@ class boardView extends board
$args->search_target = Context::get('search_target');
$args->search_keyword = Context::get('search_keyword');
$search_option = Context::get('search_option');
if($search_option==FALSE)
{
$search_option = $this->search_option;
}
if(isset($search_option[$args->search_target])==FALSE)
{
$args->search_target = '';
}
// if the category is enabled, then get the category
if($this->module_info->use_category=='Y')
{

2
modules/editor/skins/xpresseditor/js/Xpress_Editor.js
View file

@ -5205,6 +5205,8 @@ xe.XE_XHTMLFormatter = $.Class({
tag = tag.toLowerCase();
attrs = $.trim(attrs || '');
if(replace_tags[tag]!=undefined) tag = replace_tags[tag];
if (!closing) {
if ($.inArray(tag,no_closing_tags) >= 0) {
var len = attrs.length;

2
modules/editor/skins/xpresseditor/js/xpresseditor.js
View file

@ -5210,6 +5210,8 @@ xe.XE_XHTMLFormatter = $.Class({
tag = tag.toLowerCase();
attrs = $.trim(attrs || '');
if(replace_tags[tag]!=undefined) tag = replace_tags[tag];
if (!closing) {
if ($.inArray(tag,no_closing_tags) >= 0) {
var len = attrs.length;

2
modules/editor/skins/xpresseditor/js/xpresseditor.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/js/editor_common.js
View file

@ -208,6 +208,7 @@ function openComponent(component_name, editor_sequence, manual_url) {
var popup_url = request_uri+"?module=editor&act=dispEditorPopup&editor_sequence="+editor_sequence+"&component="+component_name;
if(typeof(manual_url)!="undefined" && manual_url) popup_url += "&manual_url="+escape(manual_url);
if(typeof(current_mid)!="undefined" && current_mid) popup_url += "&mid="+escape(current_mid);
popopen(popup_url, 'editorComponent');
}

2
modules/editor/tpl/js/editor_common.min.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -1109,6 +1109,11 @@ class memberAdminController extends member
if(!$output->toBool()) return $output;
}
if(!isset($args->list_order) || $args->list_order=='')
{
$args->list_order = $args->group_srl;
}
if(!$args->group_srl) $args->group_srl = getNextSequence();
$output = executeQuery('member.insertGroup', $args);
$this->_deleteMemberGroupCache($args->site_srl);

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

@ -230,8 +230,7 @@ class memberController extends member
}
// Check if duplicated
$member_srl = $oMemberModel->getMemberSrlByNickName($value);
$member_srl_by_decode = $oMemberModel->getMemberSrlByNickName(utf8_decode($value));
if(($member_srl && $logged_info->member_srl != $member_srl ) || ($member_srl_by_decode && $logged_info->member_srl != $member_srl_by_decode )) return new Object(0,'msg_exists_nick_name');
if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
break;
case 'email_address' :
@ -1970,8 +1969,7 @@ class memberController extends member
return new Object(-1,'denied_nick_name');
}
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
$member_srl_by_decode = $oMemberModel->getMemberSrlByNickName(utf8_decode($args->nick_name));
if($member_srl || $member_srl_by_decode) return new Object(-1,'msg_exists_nick_name');
if($member_srl) return new Object(-1,'msg_exists_nick_name');
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
if($member_srl) return new Object(-1,'msg_exists_email_address');
@ -2129,8 +2127,7 @@ class memberController extends member
}
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
$member_srl_by_decode = $oMemberModel->getMemberSrlByNickName(utf8_decode($args->nick_name));
if(($member_srl || $member_srl_by_decode) && $orgMemberInfo->nick_name != $args->nick_name) return new Object(-1,'msg_exists_nick_name');
if($member_srl && $orgMemberInfo->nick_name != $args->nick_name) return new Object(-1,'msg_exists_nick_name');
list($args->email_id, $args->email_host) = explode('@', $args->email_address);
// Website, blog, checks the address

2
modules/member/queries/insertGroup.xml
View file

@ -5,7 +5,7 @@
<columns>
<column name="site_srl" var="site_srl" default="0" notnull="notnull" />
<column name="group_srl" var="group_srl" notnull="notnull" />
<column name="list_order" var="group_srl" notnull="notnull" />
<column name="list_order" var="list_order" notnull="notnull" />
<column name="title" var="title" notnull="notnull" />
<column name="is_default" var="is_default" default="N" notnull="notnull" />
<column name="is_admin" var="is_admin" default="N" notnull="notnull" />