summaryrefslogtreecommitdiffstats
path: root/web/html
diff options
context:
space:
mode:
Diffstat (limited to 'web/html')
-rw-r--r--web/html/account.php3
-rw-r--r--web/html/login.php2
-rw-r--r--web/html/passreset.php6
-rw-r--r--web/html/register.php4
4 files changed, 10 insertions, 5 deletions
diff --git a/web/html/account.php b/web/html/account.php
index ff9aba5b..c05d136d 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -33,6 +33,7 @@ if ($action == "UpdateAccount") {
in_request("T"),
in_request("S"),
in_request("E"),
+ in_request("BE"),
in_request("H"),
in_request("P"),
in_request("C"),
@@ -97,6 +98,7 @@ if (isset($_COOKIE["AURSID"])) {
$row["AccountTypeID"],
$row["Suspended"],
$row["Email"],
+ $row["BackupEmail"],
$row["HideEmail"],
"",
"",
@@ -159,6 +161,7 @@ if (isset($_COOKIE["AURSID"])) {
in_request("T"),
in_request("S"),
in_request("E"),
+ in_request("BE"),
in_request("H"),
in_request("P"),
in_request("C"),
diff --git a/web/html/login.php b/web/html/login.php
index df517055..01454414 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -26,7 +26,7 @@ html_header('AUR ' . __("Login"));
<ul class="errorlist"><li><?= $login_error ?></li></ul>
<?php endif; ?>
<p>
- <label for="id_username"><?= __('User name or email address') . ':'; ?></label>
+ <label for="id_username"><?= __('User name or primary email address') . ':'; ?></label>
<input id="id_username" type="text" name="user" size="30" maxlength="<?= max(config_get_int('options', 'username_max_len'), 254); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" />
</p>
<p>
diff --git a/web/html/passreset.php b/web/html/passreset.php
index b3c8bd29..26b9bbbb 100644
--- a/web/html/passreset.php
+++ b/web/html/passreset.php
@@ -65,7 +65,7 @@ html_header(__("Password Reset"));
<form action="" method="post">
<table>
<tr>
- <td><?= __("Confirm your e-mail address:"); ?></td>
+ <td><?= __("Confirm your user name or primary e-mail address:"); ?></td>
<td><input type="text" name="user" size="30" maxlength="64" /></td>
</tr>
<tr>
@@ -81,14 +81,14 @@ html_header(__("Password Reset"));
<input type="submit" class="button" value="<?= __('Continue') ?>" />
</form>
<?php else: ?>
- <p><?= __('If you have forgotten the e-mail address you used to register, please send a message to the %saur-general%s mailing list.',
+ <p><?= __('If you have forgotten the user name and the primary e-mail address you used to register, please send a message to the %saur-general%s mailing list.',
'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">',
'</a>'); ?></p>
<?php if ($error): ?>
<ul class="errorlist"><li><?= $error ?></li></ul>
<?php endif; ?>
<form action="" method="post">
- <p><?= __("Enter your user name or your e-mail address:"); ?>
+ <p><?= __("Enter your user name or your primary e-mail address:"); ?>
<input type="text" name="user" size="30" maxlength="64" /></p>
<input type="submit" class="button" value="<?= __('Continue') ?>" />
</form>
diff --git a/web/html/register.php b/web/html/register.php
index 610befc4..fee0a68f 100644
--- a/web/html/register.php
+++ b/web/html/register.php
@@ -23,6 +23,7 @@ if (in_request("Action") == "NewAccount") {
1,
0,
in_request("E"),
+ in_request("BE"),
in_request("H"),
'',
'',
@@ -52,6 +53,7 @@ if (in_request("Action") == "NewAccount") {
1,
0,
in_request("E"),
+ in_request("BE"),
in_request("H"),
'',
'',
@@ -75,7 +77,7 @@ if (in_request("Action") == "NewAccount") {
}
} else {
print '<p>' . __("Use this form to create an account.") . '</p>';
- display_account_form("NewAccount", "", "", "", "", "", "", "", "", $LANG);
+ display_account_form("NewAccount", "", "", "", "", "", "", "", "", "", $LANG);
}
echo '</div>';