Skip to content

Commit ce06f4c

Browse files
author
pedro_morgan
committed
Minor tweaks to login
1 parent 05e71c7 commit ce06f4c

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

interface/lib/classes/db_mysql.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class db
4747
private $autoCommit = 1; // Autocommit Transactions
4848
private $currentRow; // current row number
4949
private $errorNumber = 0; // last error number
50-
private $errorMessage = ''; // last error message
50+
public $errorMessage = ''; // last error message
5151
private $errorLocation = '';// last error location
5252
private $show_error_messages = false;
5353

interface/lib/lang/en.lng

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
// Globale Error Messages
3+
//* Global Error Messages
44
$wb[301] = 'Module not permitted for the current user.';
55
$wb[302] = 'Module invalid.';
66

7-
$wb[1001] = 'The username and password must not be empty!';
8-
$wb[1002] = 'The username and/or password are not correct!';
7+
$wb[1001] = 'The username and password cannot be empty !';
8+
$wb[1002] = 'The username and/or password are not correct !';
99
$wb[1003] = 'The username is deactivated!';
1010

1111
$wb['delete_confirmation'] = 'Do you really want to delete this record?';

interface/web/login/index.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public function render() {
6969
$_SESSION['s']['module'] = $module;
7070
}
7171

72+
// TODO: What is all this - pedro
7273
//$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
7374
//$_SESSION["s"]["site"] = $site;
7475

@@ -89,19 +90,19 @@ public function render() {
8990
$error = $app->lng(1003);
9091
}
9192
} else {
92-
// Username oder Passwort falsch
93+
//* Incorrect login - Username and password incorrect
9394
$error = $app->lng(1002);
9495
if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
9596
}
9697
} else {
97-
// Username oder Passwort leer
98+
//* Username or password empty
9899
$error = $app->lng(1001);
99100
}
100101
}
101102
if($error != ''){
102-
$error = '<table width="100%" border="0" cellspacing="0" cellpadding="2">
103+
$error = '<table class="error">
103104
<tr>
104-
<td class="error"><b>Error:</b><br>'.$error.'</td>
105+
<td><strong>Error:</strong><br>'.$error.'</td>
105106
</tr>
106107
</table>';
107108
}

0 commit comments

Comments
 (0)