From: skodak Date: Tue, 5 Dec 2006 09:30:18 +0000 (+0000) Subject: added cancel button to forms in login/ directory MDL-7778 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5d2b6c1c42eabc0177b725d81881b39393cd2c21;p=moodle.git added cancel button to forms in login/ directory MDL-7778 --- diff --git a/login/change_password.php b/login/change_password.php index 8045551adc..cc4c7c2570 100644 --- a/login/change_password.php +++ b/login/change_password.php @@ -31,7 +31,9 @@ $mform = new change_password_form('change_password.php'); $mform->set_defaults(array('id'=>$course->id, 'username'=>$USER->username)); - if ($data = $mform->data_submitted()) { + if ($mform->is_cancelled()) { + redirect($CFG->wwwroot.'/user/view.php?id='.$USER->id.'&course='.$course->id); + } else if ($data = $mform->data_submitted()) { if (!has_capability('moodle/user:update', $sitecontext)) { //ignore submitted username - the same is done in form validation @@ -86,7 +88,7 @@ print_header($strpasswordchanged, $strpasswordchanged, $navstr); - if (empty($SESSION->wantsurl)) { + if (empty($SESSION->wantsurl) or $SESSION->wantsurl == $CFG->httpswwwroot.'/login/change_password.php') { $returnto = "$CFG->wwwroot/user/view.php?id=$USER->id&course=$id"; } else { $returnto = $SESSION->wantsurl; diff --git a/login/change_password_form.php b/login/change_password_form.php index 93c185ac30..0f9d6b3f07 100644 --- a/login/change_password_form.php +++ b/login/change_password_form.php @@ -46,9 +46,15 @@ class change_password_form extends moodleform { $mform->setType('id', PARAM_INT); // buttons - $mform->addelement('submit', 'submitbutton', get_string('changepassword')); - - $renderer->addStopFieldsetElements('submitbutton'); + if (empty($USER->preference['auth_forcepasswordchange'])) { + $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); + $buttonarray[] = &$mform->createElement('cancel'); + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $renderer->addStopFieldsetElements('buttonar'); + } else { + $mform->addElement('submit', 'submitbutton', get_string('savechanges')); + $renderer->addStopFieldsetElements('submitbutton'); + } } /// perform extra password change validation diff --git a/login/forgot_password.php b/login/forgot_password.php index e1ba047bc7..aed4706735 100644 --- a/login/forgot_password.php +++ b/login/forgot_password.php @@ -58,6 +58,10 @@ if (!empty($CFG->changepassword)) { $mform = new forgot_password_form('forgot_password.php'); +if ($mform->is_cancelled()) { + redirect($CFG->httpswwwroot.'/login/index.php'); +} + if ($action == 'find' and $param = $mform->data_submitted()) { ///===================== /// find the user in the database and mail info diff --git a/login/forgot_password_form.php b/login/forgot_password_form.php index 5ad355296d..31038629cc 100644 --- a/login/forgot_password_form.php +++ b/login/forgot_password_form.php @@ -21,9 +21,11 @@ class forgot_password_form extends moodleform { $mform->setType('action', PARAM_ALPHA); // buttons - $mform->addelement('submit', 'submitbutton', get_string('ok')); + $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('ok')); + $buttonarray[] = &$mform->createElement('cancel'); + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $renderer->addStopFieldsetElements('submitbutton'); + $renderer->addStopFieldsetElements('buttonar'); } } diff --git a/login/signup.php b/login/signup.php index 71dab6d594..2f0a1e9cc0 100644 --- a/login/signup.php +++ b/login/signup.php @@ -7,13 +7,15 @@ //HTTPS is potentially required in this page httpsrequired(); - $mform_signup = new login_signup_form('signup.php'); - if ($CFG->auth != 'email' and (empty($CFG->auth_user_create) or !(function_exists('auth_user_create'))) ) { error("Sorry, you may not use this page."); } - if ($user = $mform_signup->data_submitted()) { + $mform_signup = new login_signup_form('signup.php'); + + if ($mform_signup->is_cancelled()) { + redirect($CFG->httpswwwroot.'/login/index.php'); + } else if ($user = $mform_signup->data_submitted()) { $plainpass = $user->password; $user->password = hash_internal_user_password($plainpass); diff --git a/login/signup_form.php b/login/signup_form.php index 0d6cc97114..6e76e1bff8 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -49,9 +49,12 @@ class login_signup_form extends moodleform { $mform->addRule('country', get_string('missingcountry'), 'required', null, 'client'); $mform->setDefault('country', ''); - $mform->addElement('submit', 'submitbutton', get_string('createaccount')); + // buttons + $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('createaccount')); + $buttonarray[] = &$mform->createElement('cancel'); + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $renderer->addStopFieldsetElements('submitbutton'); + $renderer->addStopFieldsetElements('buttonar'); } function definition_after_data(){