mirror of https://github.com/BOINC/boinc.git
web: At request of David, consolidate form and action pages into a
single php file
This commit is contained in:
Kevin Reed
parent
059d4e043b
commit
501c9a57f1
|
|
@ -20,25 +20,56 @@ require_once("../inc/util.inc");
|
||||||
require_once("../inc/account.inc");
|
require_once("../inc/account.inc");
|
||||||
require_once("../inc/delete_account.inc");
|
require_once("../inc/delete_account.inc");
|
||||||
require_once("../inc/token.inc");
|
require_once("../inc/token.inc");
|
||||||
|
require_once("../inc/boinc_db.inc");
|
||||||
|
require_once("../inc/user_util.inc");
|
||||||
|
|
||||||
$userid = get_int("id");
|
function delete_account_confirm_form() {
|
||||||
$token = get_str("token");
|
//Make sure the token is still valid
|
||||||
|
$userid = get_int("id");
|
||||||
|
$token = get_str("token");
|
||||||
|
check_delete_account_token($userid, $token);
|
||||||
|
|
||||||
|
page_head(tra("Delete Account"));
|
||||||
|
|
||||||
|
echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
|
||||||
|
."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
|
||||||
|
."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
|
||||||
|
."<br/>";
|
||||||
|
|
||||||
|
form_start(secure_url_base()."delete_account_confirm_action.php", "post");
|
||||||
|
form_input_hidden("token",$token);
|
||||||
|
form_input_hidden("id",$userid);
|
||||||
|
form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
|
||||||
|
form_submit(tra("Delete Account"));
|
||||||
|
form_end();
|
||||||
|
|
||||||
|
page_tail();
|
||||||
|
}
|
||||||
|
|
||||||
check_delete_account_token($userid, $token);
|
function delete_account_confirm_action() {
|
||||||
|
//Make sure the token is still valid
|
||||||
|
$userid = post_int("id");
|
||||||
|
$token = post_str("token");
|
||||||
|
check_delete_account_token($userid, $token);
|
||||||
|
|
||||||
|
//Verify password
|
||||||
|
$user = BoincUser::lookup_id($userid);
|
||||||
|
$passwd = post_str("passwd");
|
||||||
|
check_passwd_ui($user, $passwd);
|
||||||
|
|
||||||
|
//do account delete
|
||||||
|
|
||||||
|
page_head(tra("Account Deleted"));
|
||||||
|
|
||||||
|
echo "<p>".tra("Your account has been deleted. If you want to contribute to ".PROJECT." in the future you will need to create a new account.")."</p>";
|
||||||
|
|
||||||
|
page_tail();
|
||||||
|
}
|
||||||
|
|
||||||
page_head(tra("Delete Account"));
|
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||||
|
delete_account_confirm_action();
|
||||||
|
} else {
|
||||||
|
delete_account_confirm_form();
|
||||||
|
}
|
||||||
|
|
||||||
echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
|
|
||||||
."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
|
|
||||||
."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
|
|
||||||
."<br/>";
|
|
||||||
|
|
||||||
form_start(secure_url_base()."delete_account_confirm_action.php", "post");
|
|
||||||
form_input_hidden("token",$token);
|
|
||||||
form_input_hidden("id",$userid);
|
|
||||||
form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
|
|
||||||
form_submit(tra("Delete Account"));
|
|
||||||
form_end();
|
|
||||||
|
|
||||||
page_tail();
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
<?php
|
|
||||||
// This file is part of BOINC.
|
|
||||||
// https://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2018 University of California
|
|
||||||
//
|
|
||||||
// BOINC is free software; you can redistribute it and/or modify it
|
|
||||||
// under the terms of the GNU Lesser General Public License
|
|
||||||
// as published by the Free Software Foundation,
|
|
||||||
// either version 3 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// BOINC is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Lesser General Public License
|
|
||||||
// along with BOINC. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
require_once("../inc/util.inc");
|
|
||||||
require_once("../inc/account.inc");
|
|
||||||
require_once("../inc/token.inc");
|
|
||||||
require_once("../inc/boinc_db.inc");
|
|
||||||
require_once("../inc/user_util.inc");
|
|
||||||
require_once("../inc/delete_account.inc");
|
|
||||||
|
|
||||||
//Make sure the token is still valid
|
|
||||||
$userid = post_int("id");
|
|
||||||
$token = post_str("token");
|
|
||||||
|
|
||||||
check_delete_account_token($userid, $token);
|
|
||||||
|
|
||||||
//Verify password
|
|
||||||
$user = BoincUser::lookup_id($userid);
|
|
||||||
$passwd = post_str("passwd");
|
|
||||||
|
|
||||||
check_passwd_ui($user, $passwd);
|
|
||||||
|
|
||||||
//do account delete
|
|
||||||
|
|
||||||
page_head(tra("Account Deleted"));
|
|
||||||
|
|
||||||
echo "<p>".tra("Your account has been deleted. If you want to contribute to ".PROJECT." in the future you will need to create a new account.")."</p>";
|
|
||||||
|
|
||||||
page_tail();
|
|
||||||
?>
|
|
||||||
|
|
@ -19,24 +19,45 @@
|
||||||
require_once("../inc/util.inc");
|
require_once("../inc/util.inc");
|
||||||
require_once("../inc/account.inc");
|
require_once("../inc/account.inc");
|
||||||
require_once("../inc/delete_account.inc");
|
require_once("../inc/delete_account.inc");
|
||||||
|
require_once("../inc/user_util.inc");
|
||||||
|
require_once("../inc/email.inc");
|
||||||
|
|
||||||
$user = get_logged_in_user();
|
$user = get_logged_in_user();
|
||||||
|
|
||||||
page_head(tra("Delete Account"));
|
function delete_account_request_form($user) {
|
||||||
|
page_head(tra("Delete Account"));
|
||||||
|
|
||||||
|
echo "<p>".tra("You have the ability to delete your account. Please note that this <b>cannot be undone</b> once it is completed.")."</p>"
|
||||||
|
."<p>".tra("The process works as follows:")."</p>"
|
||||||
|
."<ul>"
|
||||||
|
."<li>".tra("Enter in your password below and click on the \"Send Confirmation Email\" button")."</li>"
|
||||||
|
."<li>".tra("You will receive an email which contains a link. Click on that link")."</li>"
|
||||||
|
."<li>".tra("On the page displayed, you will need to re-enter your password and then click \"Delete Account\"")."</li>"
|
||||||
|
."<li>".tra("Your account will then be immediately deleted")
|
||||||
|
."</ul><br/>";
|
||||||
|
|
||||||
|
form_start(secure_url_base()."delete_account_request.php", "post");
|
||||||
|
form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
|
||||||
|
form_submit(tra("Send Confirmation Email"));
|
||||||
|
form_end();
|
||||||
|
|
||||||
|
page_tail();
|
||||||
|
}
|
||||||
|
|
||||||
echo "<p>".tra("You have the ability to delete your account. Please note that this <b>cannot be undone</b> once it is completed.")."</p>"
|
function delete_account_request_action($user) {
|
||||||
."<p>".tra("The process works as follows:")."</p>"
|
$passwd = post_str("passwd");
|
||||||
."<ul>"
|
check_passwd_ui($user, $passwd);
|
||||||
."<li>".tra("Enter in your password below and click on the \"Send Confirmation Email\" button")."</li>"
|
send_confirm_delete_email($user);
|
||||||
."<li>".tra("You will receive an email which contains a link. Click on that link")."</li>"
|
|
||||||
."<li>".tra("On the page displayed, you will need to re-enter your password and then click \"Delete Account\"")."</li>"
|
page_head(tra("Confirmation Email Sent"));
|
||||||
."<li>".tra("Your account will then be immediately deleted")
|
echo "<p>".tra("The email to confirm your request to delete your account has been sent.")."</p>";
|
||||||
."</ul><br/>";
|
page_tail();
|
||||||
|
}
|
||||||
|
|
||||||
form_start(secure_url_base()."delete_account_request_action.php", "post");
|
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||||
form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
|
delete_account_request_action($user);
|
||||||
form_submit(tra("Send Confirmation Email"));
|
} else {
|
||||||
form_end();
|
delete_account_request_form($user);
|
||||||
|
}
|
||||||
|
|
||||||
page_tail();
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
<?php
|
|
||||||
// This file is part of BOINC.
|
|
||||||
// https://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2018 University of California
|
|
||||||
//
|
|
||||||
// BOINC is free software; you can redistribute it and/or modify it
|
|
||||||
// under the terms of the GNU Lesser General Public License
|
|
||||||
// as published by the Free Software Foundation,
|
|
||||||
// either version 3 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// BOINC is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Lesser General Public License
|
|
||||||
// along with BOINC. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
require_once("../inc/util.inc");
|
|
||||||
require_once("../inc/account.inc");
|
|
||||||
require_once("../inc/user_util.inc");
|
|
||||||
require_once("../inc/email.inc");
|
|
||||||
require_once("../inc/delete_account.inc");
|
|
||||||
|
|
||||||
//Verify password
|
|
||||||
$user = get_logged_in_user();
|
|
||||||
$passwd = post_str("passwd");
|
|
||||||
|
|
||||||
check_passwd_ui($user, $passwd);
|
|
||||||
|
|
||||||
send_confirm_delete_email($user);
|
|
||||||
|
|
||||||
page_head(tra("Confirmation Email Sent"));
|
|
||||||
echo "<p>".tra("The email to confirm your request to delete your account has been sent.")."</p>";
|
|
||||||
page_tail();
|
|
||||||
?>
|
|
||||||
Loading…
Reference in New Issue