From 52a770e7e7c9a1701e96aa3c66f25d810394aeaf Mon Sep 17 00:00:00 2001 From: Callan Barrett Date: Thu, 17 Jan 2008 17:04:00 +0900 Subject: Fix login error and translation bug Fixes a login error where entering nothing would result in the login message "Incorrect password for username, ." and changes the translation "TU" to "Trusted User" so the menu bar on the accounts page doesn't bug up (we need a new translation system :((() Signed-off-by: Callan Barrett Signed-off-by: Simo Leone --- web/lang/en/aur_po.inc | 2 +- web/lib/aur.inc | 4 ++-- web/template/header.php | 2 +- 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"])) { } ?>
- + '> -- cgit v1.2.3-24-g4f1b