diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index dced1ca9e..134d98ae3 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -6,7 +6,6 @@ - diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php index 53475f3ac..8fe5637e0 100644 --- a/modules/member/lang/ko.php +++ b/modules/member/lang/ko.php @@ -251,7 +251,7 @@ $lang->find_account_question_items['9'] = '가장 좋아하는 음식은?'; $lang->temp_password = '임시 비밀번호'; $lang->cmd_get_temp_password = '임시 비밀번호 발급'; $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.'; -$lang->msg_question_not_allowed = '질문/답변을 통한 비밀번호 찾기는 허용되지 않습니다.'; +$lang->msg_question_not_allowed = '질문/답변을 통한 비밀번호 찾기 기능은 이 사이트에서 사용할 수 없습니다.'; $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.'; $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.'; $lang->change_password_date = '비밀번호 갱신주기'; diff --git a/modules/member/m.skins/default/find_member_account.html b/modules/member/m.skins/default/find_member_account.html index 9bd513476..986ba58f2 100644 --- a/modules/member/m.skins/default/find_member_account.html +++ b/modules/member/m.skins/default/find_member_account.html @@ -21,43 +21,3 @@ - -

{$lang->cmd_find_member_account_with_email_question}

-

{$lang->about_find_account_question}

- -
-

{$XE_VALIDATOR_MESSAGE}

-
- -
- - - - - - - -
    -
  • - - -
    • -
  • - - -
    • -
  • - - - -
    • -
-
- -
-
- diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 43b7d1f63..09c8ccba1 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -179,7 +179,6 @@ class memberAdminController extends member $args = Context::gets( 'enable_join', 'enable_confirm', - 'enable_find_account_question', 'password_strength', 'password_hashing_algorithm', 'password_hashing_work_factor', @@ -303,7 +302,7 @@ class memberAdminController extends member // signupForm global $lang; $signupForm = array(); - $items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark', 'profile_image_max_width', 'profile_image_max_height', 'image_name_max_width', 'image_name_max_height', 'image_mark_max_width', 'image_mark_max_height'); + $items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark', 'profile_image_max_width', 'profile_image_max_height', 'image_name_max_width', 'image_name_max_height', 'image_mark_max_width', 'image_mark_max_height'); $mustRequireds = array('email_address', 'nick_name', 'password'); $extendItems = $oMemberModel->getJoinFormList(); foreach($list_order as $key) @@ -356,7 +355,6 @@ class memberAdminController extends member // create Ruleset $this->_createSignupRuleset($signupForm, $args->agreement); $this->_createLoginRuleset($args->identifier); - $this->_createFindAccountByQuestion($args->identifier); // check agreement value exist if($args->agreement) @@ -457,7 +455,7 @@ class memberAdminController extends member // Get join form list which is additionally set $extendItems = $oMemberModel->getJoinFormList(); - $items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark'); + $items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark'); $mustRequireds = array('email_address', 'nick_name', 'password'); $orgRequireds = array('email_address', 'password', 'user_id', 'nick_name', 'user_name'); $orgUse = array('email_address', 'password', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday'); @@ -475,7 +473,7 @@ class memberAdminController extends member $signupItem->required = in_array($key, $orgRequireds); $signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse); $signupItem->isPublic = ($signupItem->isUse) ? 'Y' : 'N'; - if($key == 'find_account_question' || $key == 'password') + if($key == 'password') { $signupItem->isPublic = 'N'; } @@ -626,28 +624,7 @@ class memberAdminController extends member */ function _createFindAccountByQuestion($identifier) { - $xml_file = './files/ruleset/find_member_account_by_question.xml'; - $buff = ''. - ''. - ''. - ''. - '%s'. - ''; - - $fields = array(); - if($identifier == 'user_id') - $fields[] = ''; - - $fields[] = ''; - $fields[] = ''; - $fields[] = ''; - - $xml_buff = sprintf($buff, implode('', $fields)); - Filehandler::writeFile($xml_file, $xml_buff); - - $validator = new Validator($xml_file); - $validator->setCacheDir('files/cache'); - $validator->getJsPath(); + } /** diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index f3e228510..0bc1a8af9 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -522,45 +522,7 @@ class memberAdminView extends member } else if($formInfo->name == 'find_account_question') { - if($memberInfo['member_srl'] && $memberInfo['member_srl'] !== $logged_info->member_srl) - { - continue; - } - - $optionTag = array(); - foreach($lang->find_account_question_items as $key => $val) - { - $selected = ($key == $memberInfo['find_account_question']) ? 'selected="selected"' : ''; - $optionTag[] = sprintf('', $key, $selected, $val); - } - $is_answer = $memberInfo['find_account_answer'] ? '**********' : ''; - $disabled = $memberInfo['member_srl'] ? 'disabled="disabled"' : ''; - - $formTag->type = 'select'; - $inputTag = sprintf('', $disabled, implode('', $optionTag)); - $inputTag .= sprintf('', $lang->find_account_answer, $is_answer, $disabled); - - if($disabled) - { - $inputTag .= <<< script - - -script; - } + continue; } else if($formInfo->name == 'email_address') { diff --git a/modules/member/member.class.php b/modules/member/member.class.php index a318adb59..421ec3f6f 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -28,7 +28,7 @@ class member extends ModuleObject { // Set to use SSL upon actions related member join/information/password and so on. 2013.02.15 if(!Context::isExistsSSLAction('dispMemberModifyPassword') && Context::getSslStatus() == 'optional') { - $ssl_actions = array('dispMemberModifyPassword', 'dispMemberSignUpForm', 'dispMemberModifyInfo', 'dispMemberModifyEmailAddress', 'dispMemberGetTempPassword', 'dispMemberResendAuthMail', 'dispMemberLoginForm', 'dispMemberFindAccount', 'dispMemberLeave', 'procMemberLogin', 'procMemberModifyPassword', 'procMemberInsert', 'procMemberModifyInfo', 'procMemberFindAccount', 'procMemberModifyEmailAddress', 'procMemberResendAuthMail', 'procMemberLeave'/*, 'getMemberMenu'*/, 'procMemberFindAccountByQuestion'); + $ssl_actions = array('dispMemberModifyPassword', 'dispMemberSignUpForm', 'dispMemberModifyInfo', 'dispMemberModifyEmailAddress', 'dispMemberResendAuthMail', 'dispMemberLoginForm', 'dispMemberFindAccount', 'dispMemberLeave', 'procMemberLogin', 'procMemberModifyPassword', 'procMemberInsert', 'procMemberModifyInfo', 'procMemberFindAccount', 'procMemberModifyEmailAddress', 'procMemberResendAuthMail', 'procMemberLeave'/*, 'getMemberMenu'*/, 'procMemberFindAccountByQuestion'); Context::addSSLActions($ssl_actions); } } @@ -100,7 +100,6 @@ class member extends ModuleObject { FileHandler::makeDir('./files/ruleset'); $oMemberAdminController->_createSignupRuleset($config->signupForm); $oMemberAdminController->_createLoginRuleset($config->identifier); - $oMemberAdminController->_createFindAccountByQuestion($config->identifier); } $oModuleController->insertModuleConfig('member',$config); @@ -237,7 +236,6 @@ class member extends ModuleObject { if(!is_readable('./files/ruleset/insertMember.xml')) return true; if(!is_readable('./files/ruleset/login.xml')) return true; - if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true; // 2013. 11. 22 add menu when popup document menu called if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true; @@ -389,8 +387,6 @@ class member extends ModuleObject { $oMemberAdminController->_createSignupRuleset($config->signupForm); if(!is_readable('./files/ruleset/login.xml')) $oMemberAdminController->_createLoginRuleset($config->identifier); - if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) - $oMemberAdminController->_createFindAccountByQuestion($config->identifier); // 2013. 11. 22 add menu when popup document menu called if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 289acca05..30c264de9 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1410,82 +1410,7 @@ class memberController extends member */ function procMemberFindAccountByQuestion() { - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); - if($config->enable_find_account_question != 'Y') - { - return new Object(-1, 'msg_question_not_allowed'); - } - - $email_address = Context::get('email_address'); - $user_id = Context::get('user_id'); - $find_account_question = trim(Context::get('find_account_question')); - $find_account_answer = trim(Context::get('find_account_answer')); - if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) - { - return new Object(-1, 'msg_invalid_request'); - } - - $oModuleModel = getModel('module'); - // Check if a member having the same email address exists - $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); - if(!$member_srl) return new Object(-1, 'msg_email_not_exists'); - - // Get information of the member - $columnList = array('member_srl', 'find_account_question', 'find_account_answer'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); - - // Display a message if no answer is entered - if(!$member_info->find_account_question || !$member_info->find_account_answer) - { - return new Object(-1, 'msg_question_not_exists'); - } - - // Check question - if(trim($member_info->find_account_question) != $find_account_question) - { - return new Object(-1, 'msg_answer_not_matches'); - } - - // Check answer - if(Rhymix\Framework\Password::checkAlgorithm($member_info->find_account_answer)) - { - if(!Rhymix\Framework\Password::checkPassword($find_account_answer, $member_info->find_account_answer)) - { - return new Object(-1, 'msg_answer_not_matches'); - } - } - else - { - if($member_info->find_account_answer != $find_account_answer) - { - return new Object(-1, 'msg_answer_not_matches'); - } - - // update to encrypted answer - $this->updateFindAccountAnswer($member_srl, $find_account_answer); - } - - if($config->identifier == 'email_address') - { - $user_id = $email_address; - } - - // Update to a temporary password and set change_password_date to 1 - $temp_password = Rhymix\Framework\Password::getRandomPassword(8); - - $args = new stdClass(); - $args->member_srl = $member_srl; - $args->password = $temp_password; - $args->change_password_date = '1'; - $output = $this->updateMemberPassword($args); - if(!$output->toBool()) return $output; - - $_SESSION['xe_temp_password_' . $user_id] = $temp_password; - $this->add('user_id', $user_id); - - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - $this->setRedirectUrl($returnUrl.'&user_id='.$user_id); + return new Object(-1, 'msg_question_not_allowed'); } /** diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 0372be448..3ad39ba01 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -648,29 +648,11 @@ class memberView extends member $config = $this->member_config; Context::set('identifier', $config->identifier); - Context::set('enable_find_account_question', $config->enable_find_account_question); + Context::set('enable_find_account_question', 'N'); $this->setTemplateFile('find_member_account'); } - /** - * @brief Generate a temporary password - */ - function dispMemberGetTempPassword() - { - if(Context::get('is_logged')) return $this->stop('already_logged'); - - $user_id = Context::get('user_id'); - $temp_password = $_SESSION['xe_temp_password_'.$user_id]; - unset($_SESSION['xe_temp_password_'.$user_id]); - - if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request'); - - Context::set('temp_password', $temp_password); - - $this->setTemplateFile('find_temp_password'); - } - /** * @brief Page of re-sending an authentication mail */ diff --git a/modules/member/skins/default/filter/find_member_account_by_question.xml b/modules/member/skins/default/filter/find_member_account_by_question.xml deleted file mode 100644 index 5ee5c194d..000000000 --- a/modules/member/skins/default/filter/find_member_account_by_question.xml +++ /dev/null @@ -1,14 +0,0 @@ - -
- - - - - - - - - - - -
 diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html index 90ce9814a..e4cd57bd1 100644 --- a/modules/member/skins/default/find_member_account.html +++ b/modules/member/skins/default/find_member_account.html @@ -19,41 +19,6 @@ -
-
-

{$lang->cmd_find_member_account_with_email_question}

-

{$lang->about_find_account_question}

-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - - - - - -
- -
-
- -
-
- -
-
- -
- {$captcha}
 - -
-

{$lang->cmd_resend_auth_mail}

diff --git a/modules/member/skins/default/find_temp_password.html b/modules/member/skins/default/find_temp_password.html deleted file mode 100644 index 2da972460..000000000 --- a/modules/member/skins/default/find_temp_password.html +++ /dev/null @@ -1,6 +0,0 @@ - -

{$lang->cmd_find_member_account}

-

{$lang->about_temp_password}

-

{$lang->user_id}: {$user_id}

-

{$lang->temp_password}: {$temp_password}

- diff --git a/modules/member/skins/simple_world/find_member_account.html b/modules/member/skins/simple_world/find_member_account.html index ac9a774cd..9bfd4aa01 100644 --- a/modules/member/skins/simple_world/find_member_account.html +++ b/modules/member/skins/simple_world/find_member_account.html @@ -23,49 +23,6 @@
-
-

{$lang->cmd_find_member_account_with_email_question}

-
-

{$XE_VALIDATOR_MESSAGE}

-
-

- {lang('member.about_find_account_question')} -

-
- - - - - - - -
- - - - - - -
-
- -
-
- {$captcha}
 - -
-
-

{lang('member.cmd_resend_auth_mail')}

diff --git a/modules/member/skins/simple_world/find_temp_password.html b/modules/member/skins/simple_world/find_temp_password.html deleted file mode 100644 index 0ccba497f..000000000 --- a/modules/member/skins/simple_world/find_temp_password.html +++ /dev/null @@ -1,12 +0,0 @@ - -
-

{lang('member.cmd_find_member_account')}

-
{lang('member.about_temp_password')}
-
-
{lang('common.user_id')}
-
{$user_id}
-
{lang('member.temp_password')}
-
{$temp_password}
-
-
- diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html index dac819578..7c9225254 100644 --- a/modules/member/tpl/default_config.html +++ b/modules/member/tpl/default_config.html @@ -36,14 +36,6 @@

{$lang->about_update_nickname_log}

-
-
{$lang->enable_find_account_question}
-
- - -

{$lang->about_enable_find_account_question}

-
-
{$lang->cmd_config_password_strength}
diff --git a/modules/member/tpl/signup_config.html b/modules/member/tpl/signup_config.html index 318d7845b..6851913a8 100644 --- a/modules/member/tpl/signup_config.html +++ b/modules/member/tpl/signup_config.html @@ -108,9 +108,11 @@ - {@$fixed_public_list = array('nick_name', 'find_account_question', 'password')} + {@ $disabled_list = array('find_account_question')} + {@ $fixed_public_list = array('nick_name', 'password')} - + +