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

Prohibit use of reserved word as member extra field #763

Browse source
This commit is contained in:
Kijin Sung 2017-03-23 19:48:08 +09:00
parent 97047d1279
commit 16cb56d8dc
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/member/lang/en.php
View file

@ -140,6 +140,7 @@ $lang->msg_group_is_null = 'There is no group.';
$lang->msg_not_delete_default = 'Default items cannot be deleted';
$lang->msg_not_exists_member = 'Invalid member';
$lang->msg_cannot_delete_admin = 'Admin ID cannot be deleted. Please remove the ID from administration and try again.';
$lang->msg_column_id_not_available = 'The ID already exists or is not usable.';
$lang->msg_exists_user_id = 'This ID already exists. Please try another one.';
$lang->msg_exists_email_address = 'This email address already exists. Please try another one.';
$lang->msg_exists_nick_name = 'This nickname already exists. Please try another one.';

1
modules/member/lang/ko.php
View file

@ -149,6 +149,7 @@ $lang->msg_group_is_null = '등록된 그룹이 없습니다.';
$lang->msg_not_delete_default = '기본 항목을 삭제할 수 없습니다.';
$lang->msg_not_exists_member = '존재하지 않는 회원입니다.';
$lang->msg_cannot_delete_admin = '관리자 아이디는 삭제할 수 없습니다. 관리자 해제 후 다시 삭제시도해주세요.';
$lang->msg_column_id_not_available = '이미 존재하거나 사용할 수 없는 ID입니다.';
$lang->msg_exists_user_id = '이미 존재하는 아이디입니다. 다른 아이디를 입력해주세요.';
$lang->msg_exists_email_address = '이미 존재하는 메일 주소입니다. 다른 메일 주소를 입력해주세요.';
$lang->msg_exists_nick_name = '이미 존재하는 닉네임입니다. 다른 닉네임을 입력해주세요.';

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

@ -737,6 +737,10 @@ class memberAdminController extends member
}
// Check ID duplicated
if (Context::isReservedWord($args->column_name))
{
return new Object(-1, 'msg_column_id_not_available');
}
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
foreach($config->signupForm as $item)
@ -744,7 +748,7 @@ class memberAdminController extends member
if($item->name == $args->column_name)
{
if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
return new Object(-1,'msg_exists_user_id');
return new Object(-1,'msg_column_id_not_available');
}
}
// Fix if member_join_form_srl exists. Add if not exists.