From 525d8e3f5ff2a0562fd0d8a4924aa31d5dfdf53b Mon Sep 17 00:00:00 2001 From: ovclas Date: Thu, 23 Jun 2011 06:03:29 +0000 Subject: [PATCH] issue 46 validator apply to member module. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8533 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/template/TemplateHandler.class.php | 2 +- modules/member/conf/module.xml | 14 ++--- modules/member/member.controller.php | 52 +++++++++++++++++-- modules/member/member.view.php | 3 +- modules/member/ruleset/leaveMember.xml | 8 +++ modules/member/ruleset/login.xml | 9 ++++ modules/member/ruleset/modifyInfo.xml | 12 +++++ modules/member/ruleset/modifyPassword.xml | 10 ++++ modules/member/ruleset/openidLogin.xml | 9 ++++ modules/member/ruleset/resendAuthMail.xml | 8 +++ modules/member/ruleset/signup.xml | 15 ++++++ modules/member/skins/default/leave_form.html | 6 +-- modules/member/skins/default/login_form.html | 9 ++-- modules/member/skins/default/modify_info.html | 12 ++--- .../member/skins/default/modify_password.html | 4 +- .../skins/default/resend_auth_mail.html | 5 +- modules/member/skins/default/signup_form.html | 5 +- 17 files changed, 151 insertions(+), 32 deletions(-) create mode 100644 modules/member/ruleset/leaveMember.xml create mode 100644 modules/member/ruleset/login.xml create mode 100644 modules/member/ruleset/modifyInfo.xml create mode 100644 modules/member/ruleset/modifyPassword.xml create mode 100644 modules/member/ruleset/openidLogin.xml create mode 100644 modules/member/ruleset/resendAuthMail.xml create mode 100644 modules/member/ruleset/signup.xml diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 5d3be697d..39d2333e6 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -188,7 +188,7 @@ $buff = preg_replace_callback('!<\!--%load_js_plugin\(\"([^\"]*?)\"\)-->!is', array($this, '_compileLoadJavascriptPlugin'), $buff); // form auto generation - $buff = preg_replace_callback('/(].*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff); + $buff = preg_replace_callback('/(|[^<>]+)*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff); // replace variables $buff = preg_replace_callback('/\{[^@^ ]([^\{\}\n]+)\}/i', array($this, '_compileVarToContext'), $buff); diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index ae1ed04f2..8593bc5b3 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -34,8 +34,8 @@ - - + + @@ -44,10 +44,10 @@ - - - - + + + + @@ -65,7 +65,7 @@ - + diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 64357b688..7d5254f1c 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -481,9 +481,10 @@ if ($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement'); // Extract the necessary information in advance - $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','find_account_question','find_account_answer'); + $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','password1','allow_mailing','find_account_question','find_account_answer'); $args->member_srl = getNextSequence(); $args->list_order = -1 * $args->member_srl; + if($args->password1) $args->password = $args->password1; // Remove some unnecessary variables from all the vars $all_args = Context::getRequestVars(); @@ -528,6 +529,12 @@ // Call a trigger (after) $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config); if(!$trigger_output->toBool()) return $trigger_output; + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + header('location:'.$returnUrl); + return; + } } /** @@ -573,6 +580,11 @@ // Return result $this->add('member_srl', $args->member_srl); $this->setMessage('success_updated'); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); + header('location:'.$returnUrl); + return; + } } /** @@ -582,7 +594,7 @@ if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); // Extract the necessary information in advance $current_password = trim(Context::get('current_password')); - $password = trim(Context::get('password')); + $password = trim(Context::get('password1')); // Get information of logged-in user $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; @@ -605,6 +617,11 @@ $this->add('member_srl', $args->member_srl); $this->setMessage('success_updated'); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); + header('location:'.$returnUrl); + return; + } } /** @@ -635,6 +652,11 @@ $this->destroySessionInfo(); // Return success message $this->setMessage('success_leaved'); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + header('location:'.$returnUrl); + return; + } } /** @@ -677,7 +699,12 @@ $this->insertProfileImage($member_srl, $file['tmp_name']); // Page refresh - $this->setRefreshPage(); + //$this->setRefreshPage(); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + header('location:'.$returnUrl); + return; + } } function insertProfileImage($member_srl, $target_file) { @@ -723,7 +750,12 @@ $this->insertImageName($member_srl, $file['tmp_name']); // Page refresh - $this->setRefreshPage(); + //$this->setRefreshPage(); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + header('location:'.$returnUrl); + return; + } } function insertImageName($member_srl, $target_file) { @@ -812,7 +844,12 @@ $this->insertImageMark($member_srl, $file['tmp_name']); // Page refresh - $this->setRefreshPage(); + //$this->setRefreshPage(); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + header('location:'.$returnUrl); + return; + } } function insertImageMark($member_srl, $target_file) { @@ -1108,6 +1145,11 @@ $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address); $this->setMessage($msg); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + header('location:'.$returnUrl); + return; + } } /** diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 10540763c..ad8aef0f7 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -180,8 +180,9 @@ if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged'); // Get the saved document(module_srl is set to member_srl instead) $logged_info = Context::get('logged_info'); - $args->module_srl = $logged_info->member_srl; + $args->member_srl = $logged_info->member_srl; $args->page = (int)Context::get('page'); + $args->statusList = array('TEMP'); $oDocumentModel = &getModel('document'); $output = $oDocumentModel->getDocumentList($args, true); diff --git a/modules/member/ruleset/leaveMember.xml b/modules/member/ruleset/leaveMember.xml new file mode 100644 index 000000000..332ab7264 --- /dev/null +++ b/modules/member/ruleset/leaveMember.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/login.xml b/modules/member/ruleset/login.xml new file mode 100644 index 000000000..8208d831f --- /dev/null +++ b/modules/member/ruleset/login.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/member/ruleset/modifyInfo.xml b/modules/member/ruleset/modifyInfo.xml new file mode 100644 index 000000000..be2a73867 --- /dev/null +++ b/modules/member/ruleset/modifyInfo.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/modules/member/ruleset/modifyPassword.xml b/modules/member/ruleset/modifyPassword.xml new file mode 100644 index 000000000..ec847a6f1 --- /dev/null +++ b/modules/member/ruleset/modifyPassword.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/member/ruleset/openidLogin.xml b/modules/member/ruleset/openidLogin.xml new file mode 100644 index 000000000..0b2a7ef1b --- /dev/null +++ b/modules/member/ruleset/openidLogin.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/member/ruleset/resendAuthMail.xml b/modules/member/ruleset/resendAuthMail.xml new file mode 100644 index 000000000..108ab2e1f --- /dev/null +++ b/modules/member/ruleset/resendAuthMail.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/signup.xml b/modules/member/ruleset/signup.xml new file mode 100644 index 000000000..74b592132 --- /dev/null +++ b/modules/member/ruleset/signup.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html index 42d7aabbe..bdd878a00 100644 --- a/modules/member/skins/default/leave_form.html +++ b/modules/member/skins/default/leave_form.html @@ -1,9 +1,9 @@ - -

{$member_title = $lang->msg_leave_member}

-
+

{$XE_VALIDATOR_ERROR}

+ + diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index 227b05011..2f14ed2e3 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -1,5 +1,4 @@ - +

{$XE_VALIDATOR_ERROR}

{$lang->cmd_login}
- + +