diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index 57e4cdb72..6a56e4a54 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -79,6 +79,7 @@ $module = $xml_obj->filter->attrs->module; $act = $xml_obj->filter->attrs->act; $extend_filter = $xml_obj->filter->attrs->extend_filter; + debugPrint($extend_filter); $field_node = $xml_obj->filter->form->node; if($field_node && !is_array($field_node)) $field_node = array($field_node); diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index a4f0020e0..463aeaf73 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -41,12 +41,14 @@ if($member_info->member_srl != $args->member_srl) unset($args->member_srl); } + $oMemberController = &getController('member'); + // member_srl의 값에 따라 insert/update if(!$args->member_srl) { - $output = $this->insertMember($args); + $output = $oMemberController->insertMember($args); $msg_code = 'success_registed'; } else { - $output = $this->updateMember($args); + $output = $oMemberController->updateMember($args); $msg_code = 'success_updated'; } @@ -54,7 +56,7 @@ // 서명 저장 $signature = Context::get('signature'); - $this->putSignature($args->member_srl, $signature); + $oMemberController->putSignature($args->member_srl, $signature); // 결과 리턴 $this->add('member_srl', $args->member_srl); @@ -68,7 +70,8 @@ // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 $member_srl = Context::get('member_srl'); - $output = $this->deleteMember($member_srl); + $oMemberController = &getController('member'); + $output = $oMemberController->deleteMember($member_srl); if(!$output->toBool()) return $output; $this->add('page',Context::get('page')); @@ -202,8 +205,7 @@ $user_id = Context::get('user_id'); $description = Context::get('description'); - $oMemberController = &getController('member'); - $output = $oMemberController->insertDeniedID($user_id, $description); + $output = $this->insertDeniedID($user_id, $description); if(!$output->toBool()) return $output; $this->add('group_srl',''); @@ -218,11 +220,9 @@ $user_id = Context::get('user_id'); $mode = Context::get('mode'); - $oMemberController = &getController('member'); - switch($mode) { case 'delete' : - $output = $oMemberController->deleteDeniedID($user_id); + $output = $this->deleteDeniedID($user_id); if(!$output->toBool()) return $output; $msg_code = 'success_deleted'; break; @@ -247,17 +247,6 @@ return $this->insertMember($args); } - /** - * @brief member_srl에 group_srl을 추가 - **/ - function addMemberToGroup($member_srl,$group_srl) { - $args->member_srl = $member_srl; - $args->group_srl = $group_srl; - - // 추가 - return executeQuery('member.addMemberToGroup',$args); - } - /** * @brief 회원의 그룹값을 변경 **/ diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 873bf5447..10dd3884f 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -394,8 +394,13 @@ function procMemberInsert() { $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); + + // 관리자가 회원가입을 허락하였는지 검사 if($config->enable_join != 'Y') return $this->stop('msg_signup_disabled'); + // 약관에 동의하였는지 검사 (약관이 있을 경우만) + if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement'); + // 필수 정보들을 미리 추출 $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message'); $args->member_srl = getNextSequence(); @@ -624,6 +629,17 @@ @unlink($filename); } + /** + * @brief member_srl에 group_srl을 추가 + **/ + function addMemberToGroup($member_srl,$group_srl) { + $args->member_srl = $member_srl; + $args->group_srl = $group_srl; + + // 추가 + return executeQuery('member.addMemberToGroup',$args); + } + /** * @brief 로그인 시킴 **/ @@ -697,9 +713,6 @@ // 멤버 설정 정보에서 가입약관 부분을 재확인 $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); - if($config->agreement && Context::get('accept_agreement')!='Y') { - return new Object(-1, 'msg_accept_agreement'); - } // 임시 제한 일자가 있을 경우 제한 일자에 내용 추가 if($config->limit_day) $args->limit_date = date("YmdHis", time()+$config->limit_day*60*60*24);