summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--web/lang/en/aur_po.inc2
-rw-r--r--web/lib/aur.inc4
-rw-r--r--web/template/header.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/web/lang/en/aur_po.inc b/web/lang/en/aur_po.inc
index feab23a1..67cf6ee7 100644
--- a/web/lang/en/aur_po.inc
+++ b/web/lang/en/aur_po.inc
@@ -27,6 +27,6 @@ $_t["en"]["Discussion"] = "Discussion";
$_t["en"]["Bugs"] = "Bugs";
-$_t["en"]["Trusted User"] = "TU";
+$_t["en"]["Trusted User"] = "Trusted User";
?>
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index cfe4a96f..5dec6e3c 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -345,10 +345,10 @@ function html_header($title="") {
if (isset($_POST["user"]) || isset($_POST["pass"])) {
# Attempting to log in
#
- if (!isset($_POST["user"])) {
+ if (!isset($_POST["user"]) || $_POST['user'] === "") {
$login_error = __("You must supply a username.");
}
- if (!isset($_POST["pass"])) {
+ if ((!isset($_POST["pass"]) || $_POST['pass'] === "") && empty($login_error)) {
$login_error = __("You must supply a password.");
}
if (!$login_error) {
diff --git a/web/template/header.php b/web/template/header.php
index aaccfa2c..6e114fdd 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -93,7 +93,7 @@ if (isset($_COOKIE["AURSID"])) {
} ?>
<form method='post'>
<?php print __("Username:"); ?>
- <input type='text' name='user' size='30' maxlength='64'>
+ <input type='text' name='user' size='30' maxlength='64' value='<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>'>
<?php print __("Password:"); ?>
<input type='password' name='pass' size='30' maxlength='32'>
<input type='submit' class='button' value='<?php print __("Login"); ?>'>