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

Merge branch 'develop' into release/1.8.5

Browse source 
Conflicts:
	modules/member/member.controller.php
This commit is contained in:
bnu 2015-07-09 03:05:01 +09:00
commit 8321149a84
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,13 +80,12 @@ class memberAdminController extends member
} }
// remove whitespace // remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address'); $checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
foreach($checkInfos as $val) foreach($checkInfos as $val)
{ {
if(isset($args->{$val})) if(isset($args->{$val}))
{ {
$args->{$val} = str_replace($replaceStr, '', $args->{$val}); $args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
} }
} }

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

@ -331,7 +331,7 @@ class memberController extends member
{ {
if(isset($args->{$val})) if(isset($args->{$val}))
{ {
$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val}); $args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
} }
} }
$output = $this->insertMember($args); $output = $this->insertMember($args);
@ -543,7 +543,7 @@ class memberController extends member
{ {
if(isset($args->{$val})) if(isset($args->{$val}))
{ {
$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val}); $args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
} }
} }
@ -2137,14 +2137,19 @@ class memberController extends member
if($config->identifier == 'email_address') if($config->identifier == 'email_address')
{ {
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address'); if($member_srl && $args->member_srl != $member_srl)
{
return new Object(-1,'msg_exists_email_address');
}
$args->email_address = $orgMemberInfo->email_address; $args->email_address = $orgMemberInfo->email_address;
} }
else else
{ {
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_user_id'); if($member_srl && $args->member_srl != $member_srl)
{
return new Object(-1,'msg_exists_user_id');
}
$args->user_id = $orgMemberInfo->user_id; $args->user_id = $orgMemberInfo->user_id;
} }
@ -2159,7 +2164,7 @@ class memberController extends member
if($args->user_id) if($args->user_id)
{ {
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl && $orgMemberInfo->user_id != $args->user_id) if($member_srl && $args->member_srl != $member_srl)
{ {
return new Object(-1,'msg_exists_user_id'); return new Object(-1,'msg_exists_user_id');
} }
@ -2173,7 +2178,7 @@ class memberController extends member
// Check if nickname is duplicate // Check if nickname is duplicate
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
if($member_srl && $orgMemberInfo->nick_name != $args->nick_name) if($member_srl && $args->member_srl != $member_srl)
{ {
return new Object(-1,'msg_exists_nick_name'); return new Object(-1,'msg_exists_nick_name');
} }