From ce06f4c25a6d3ecc34a57452ad30aea7f080588c Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 00:43:52 -0400
Subject: [PATCH] Minor tweaks to login
---
interface/lib/lang/en.lng | 6 +++---
interface/web/login/index.php | 9 +++++----
interface/lib/classes/db_mysql.inc.php | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 09297c7..564b7b6 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -47,7 +47,7 @@
private $autoCommit = 1; // Autocommit Transactions
private $currentRow; // current row number
private $errorNumber = 0; // last error number
- private $errorMessage = ''; // last error message
+ public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
private $show_error_messages = false;
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index b862b60..3c28119 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -1,11 +1,11 @@
<?php
-// Globale Error Messages
+//* Global Error Messages
$wb[301] = 'Module not permitted for the current user.';
$wb[302] = 'Module invalid.';
-$wb[1001] = 'The username and password must not be empty!';
-$wb[1002] = 'The username and/or password are not correct!';
+$wb[1001] = 'The username and password cannot be empty !';
+$wb[1002] = 'The username and/or password are not correct !';
$wb[1003] = 'The username is deactivated!';
$wb['delete_confirmation'] = 'Do you really want to delete this record?';
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 79a2ba0..1ed9158 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -69,6 +69,7 @@
$_SESSION['s']['module'] = $module;
}
+ // TODO: What is all this - pedro
//$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
//$_SESSION["s"]["site"] = $site;
@@ -89,19 +90,19 @@
$error = $app->lng(1003);
}
} else {
- // Username oder Passwort falsch
+ //* Incorrect login - Username and password incorrect
$error = $app->lng(1002);
if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
}
} else {
- // Username oder Passwort leer
+ //* Username or password empty
$error = $app->lng(1001);
}
}
if($error != ''){
- $error = '<table width="100%" border="0" cellspacing="0" cellpadding="2">
+ $error = '<table class="error">
<tr>
- <td class="error"><b>Error:</b><br>'.$error.'</td>
+ <td><strong>Error:</strong><br>'.$error.'</td>
</tr>
</table>';
}
--
Gitblit v1.9.1