git-svn-id: http://xe-core.googlecode.com/svn/trunk@1040 201d5d3c-b55e-5fd7-737f-ddc643e51545

This commit is contained in:
zero 2007-04-09 04:02:56 +00:00
parent b935f9d274
commit 37af2d027c
10 changed files with 96 additions and 14 deletions

View file

@ -16,6 +16,13 @@
$lang->invalid_password = '잘못된 비밀번호입니다';
$lang->allow_mailing = '메일링 가입';
$lang->allow_message = '쪽지 수신 허용';
$lang->allow_message_type = array(
'N' => '전체 수신',
'Y' => '거부',
'F' => '친구만 허용',
);
$lang->denied = '사용중지';
$lang->is_admin = '최고관리 권한';
$lang->group = '소속 그룹';
@ -111,6 +118,7 @@
$lang->about_blog = '운영하는 블로그가 있을 경우 입력해주세요';
$lang->about_birthday = '생년월일을 입력해주세요';
$lang->about_allow_mailing = '메일링 가입이 체크되지 않으면 단체메일 발송시 메일을 받지 않습니다';
$lang->about_allow_message = '쪽시 수신 여부를 결정할 수 있습니다';
$lang->about_denied = '체크시 아이디를 사용할 수 없도록 합니다';
$lang->about_is_admin = '체크시 최고 관리자 권한을 가지게 됩니다';
$lang->about_description = '회원에 대한 관리자 메모입니다';

View file

@ -65,6 +65,9 @@
$receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
if($receiver_member_info->member_srl != $receiver_srl) return new Object(-1, 'msg_not_exists_member');
$oDB = &DB::getInstance();
$oDB->begin();
// 발송하는 회원의 쪽지함에 넣을 쪽지
$sender_args->message_srl = getNextSequence();
$sender_args->related_srl = getNextSequence();
@ -77,7 +80,10 @@
$sender_args->readed = 'N';
$sender_args->regdate = date("YmdHis");
$output = executeQuery('member.sendMessage', $sender_args);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 받는 회원의 쪽지함에 넣을 쪽지
$receiver_args->message_srl = $sender_args->related_srl;
@ -91,7 +97,10 @@
$receiver_args->readed = 'N';
$receiver_args->regdate = date("YmdHis");
$output = executeQuery('member.sendMessage', $receiver_args);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 받는 회원의 쪽지 발송 플래그 생성 (파일로 생성)
$flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($receiver_srl);
@ -99,6 +108,8 @@
$flag_file = sprintf('%s%s', $flag_path, $receiver_srl);
FileHandler::writeFile($flag_file,'1');
$oDB->commit();
$this->setMessage('success_sended');
}
@ -375,7 +386,7 @@
**/
function procMemberAdminInsert() {
// 필수 정보들을 미리 추출
$args = Context::gets('member_srl','user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','denied','is_admin','description','group_srl_list');
$args = Context::gets('member_srl','user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message','denied','is_admin','description','group_srl_list');
// 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
$all_args = Context::getRequestVars();
@ -595,7 +606,7 @@
if($config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
// 필수 정보들을 미리 추출
$args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing');
$args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message');
$args->member_srl = getNextSequence();
// 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
@ -629,7 +640,7 @@
if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
// 필수 정보들을 미리 추출
$args = Context::gets('nick_name','homepage','blog','birthday','email_address','allow_mailing');
$args = Context::gets('nick_name','homepage','blog','birthday','email_address','allow_mailing','allow_message');
// 로그인 정보
$logged_info = Context::get('logged_info');
@ -862,6 +873,7 @@
// 필수 변수들의 조절
if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_mailing = 'Y';
if($args->denied!='Y') $args->denied = 'N';
if($args->is_admin!='Y') $args->is_admin = 'N';
list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@ -886,13 +898,19 @@
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
if($member_srl) return new Object(-1,'msg_exists_email_address');
$oDB = &DB::getInstance();
$oDB->begin();
// DB에 입력
$args->member_srl = getNextSequence();
if($args->password) $args->password = md5($args->password);
else unset($args->password);
$output = executeQuery('member.insertMember', $args);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 입력된 그룹 값이 없으면 기본 그룹의 값을 등록
if(!$args->group_srl_list) {
@ -900,7 +918,10 @@
// 기본 그룹에 추가
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 입력된 그룹 값이 있으면 해당 그룹의 값을 등록
} else {
@ -908,9 +929,14 @@
for($i=0;$i<count($group_srl_list);$i++) {
$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
}
}
$oDB->commit();
$output->add('member_srl', $args->member_srl);
return $output;
@ -928,6 +954,7 @@
// 필수 변수들의 조절
if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_mailing = 'Y';
if(!$args->denied) unset($args->denied);
if(!$args->is_admin) unset($args->is_admin);
list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@ -946,13 +973,19 @@
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
$oDB = &DB::getInstance();
$oDB->begin();
// DB에 update
if($args->password) $args->password = md5($args->password);
else $args->password = $member_info->password;
if(!$args->user_name) $args->user_name = $member_info->user_name;
$output = executeQuery('member.updateMember', $args);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 그룹 정보가 있으면 그룹 정보를 변경
if($args->group_srl_list) {
@ -960,14 +993,22 @@
// 일단 해당 회원의 모든 그룹 정보를 삭제
$output = executeQuery('member.deleteMemberGroupMember', $args);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
// 하나 하나 루프를 돌면서 입력
for($i=0;$i<count($group_srl_list);$i++) {
$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
if(!$output->toBool()) return $output;
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
}
}
$oDB->commit();
$output->add('member_srl', $args->member_srl);
return $output;

View file

@ -15,7 +15,7 @@
<column name="blog" var="blog" />
<column name="birthday" var="birthday" />
<column name="allow_mailing" var="allow_mailing" default="Y" />
<column name="unread_message" var="unread_message" default="0" />
<column name="allow_message" var="allow_message" default="Y" />
<column name="denied" var="denied" default="N" />
<column name="regdate" var="regdate" default="curdate()" />
<column name="last_login" var="last_login" />

View file

@ -13,6 +13,7 @@
<column name="blog" var="blog" />
<column name="birthday" var="birthday" />
<column name="allow_mailing" var="allow_mailing" default="Y" />
<column name="allow_message" var="allow_message" default="Y" />
<column name="denied" var="denied" />
<column name="is_admin" var="is_admin" />
<column name="description" var="description" />

View file

@ -10,8 +10,8 @@
<column name="homepage" type="varchar" size="250" />
<column name="blog" type="varchar" size="250" />
<column name="birthday" type="char" size="8" />
<column name="allow_mailing" type="char" size="1" default="Y" idx="idx_allow_mailing" />
<column name="unread_message" type="number" size="11" default="0" />
<column name="allow_mailing" type="char" size="1" default="Y" notnull="notnull" index="idx_allow_mailing" />
<column name="allow_message" type="char" size="1" default="Y" notnull="notnull" />
<column name="denied" type="char" size="1" default="N" index="idx_is_denied" />
<column name="regdate" type="date" index="idx_regdate" />
<column name="last_login" type="date" index="idx_last_login" />

View file

@ -10,6 +10,7 @@
<param name="blog" target="blog" />
<param name="birthday" target="birthday" />
<param name="allow_mailing" target="allow_mailing" />
<param name="allow_message" target="allow_message" />
<param name="email_address" target="email_address" />
<param name="signature" target="content" />
</parameter>

View file

@ -111,6 +111,19 @@
<tr>
<td>{$lang->about_allow_mailing}</td>
</tr>
<tr>
<th rowspan="2">{$lang->allow_message}</th>
<td>
<select name="allow_message">
<!--@foreach($lang->allow_message_type as $key => $val)-->
<option value="{$key}" <!--@if($member_info->allow_message == $key)-->selected="true"<!--@end-->>{$val}</option>
<!--@end-->
</select>
</td>
</tr>
<tr>
<td>{$lang->about_allow_message}</td>
</tr>
<tr>
<th>{$lang->signature}</th>
<td>{$editor}</td>

View file

@ -17,6 +17,7 @@
<param name="birthday" target="birthday" />
<param name="email_address" target="email_address" />
<param name="allow_mailing" target="allow_mailing" />
<param name="allow_message" target="allow_message" />
<param name="denied" target="denied" />
<param name="is_admin" target="is_admin" />
<param name="description" target="description" />

View file

@ -98,6 +98,19 @@
<tr>
<td>{$lang->about_allow_mailing}</td>
</tr>
<tr>
<th rowspan="2">{$lang->allow_message}</th>
<td>
<select name="allow_message">
<!--@foreach($lang->allow_message_type as $key => $val)-->
<option value="{$key}" <!--@if($member_info->allow_message == $key)-->selected="true"<!--@end-->>{$val}</option>
<!--@end-->
</select>
</td>
</tr>
<tr>
<td>{$lang->about_allow_message}</td>
</tr>
<!--@if($member_srl && $editor)-->
<tr>
<th>{$lang->signature}</th>

View file

@ -80,6 +80,10 @@
<th>{$lang->allow_mailing}</th>
<td>{$member_info->allow_mailing}</td>
</tr>
<tr>
<th>{$lang->allow_message}</th>
<td>{$lang->allow_message_type[$member_info->allow_message]}</td>
</tr>
<tr>
<th>{$lang->signature}</th>
<td>{$member_info->signature}</td>