Commit ce06f4c2 authored by pedro_morgan's avatar pedro_morgan
Browse files

Minor tweaks to login

parent 05e71c79
...@@ -47,7 +47,7 @@ class db ...@@ -47,7 +47,7 @@ class db
private $autoCommit = 1; // Autocommit Transactions private $autoCommit = 1; // Autocommit Transactions
private $currentRow; // current row number private $currentRow; // current row number
private $errorNumber = 0; // last error number private $errorNumber = 0; // last error number
private $errorMessage = ''; // last error message public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location private $errorLocation = '';// last error location
private $show_error_messages = false; private $show_error_messages = false;
......
<?php <?php
// Globale Error Messages //* Global Error Messages
$wb[301] = 'Module not permitted for the current user.'; $wb[301] = 'Module not permitted for the current user.';
$wb[302] = 'Module invalid.'; $wb[302] = 'Module invalid.';
$wb[1001] = 'The username and password must not be empty!'; $wb[1001] = 'The username and password cannot be empty !';
$wb[1002] = 'The username and/or password are not correct!'; $wb[1002] = 'The username and/or password are not correct !';
$wb[1003] = 'The username is deactivated!'; $wb[1003] = 'The username is deactivated!';
$wb['delete_confirmation'] = 'Do you really want to delete this record?'; $wb['delete_confirmation'] = 'Do you really want to delete this record?';
......
...@@ -69,6 +69,7 @@ public function render() { ...@@ -69,6 +69,7 @@ public function render() {
$_SESSION['s']['module'] = $module; $_SESSION['s']['module'] = $module;
} }
// TODO: What is all this - pedro
//$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'"); //$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
//$_SESSION["s"]["site"] = $site; //$_SESSION["s"]["site"] = $site;
...@@ -89,19 +90,19 @@ public function render() { ...@@ -89,19 +90,19 @@ public function render() {
$error = $app->lng(1003); $error = $app->lng(1003);
} }
} else { } else {
// Username oder Passwort falsch //* Incorrect login - Username and password incorrect
$error = $app->lng(1002); $error = $app->lng(1002);
if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != ''; if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
} }
} else { } else {
// Username oder Passwort leer //* Username or password empty
$error = $app->lng(1001); $error = $app->lng(1001);
} }
} }
if($error != ''){ if($error != ''){
$error = '<table width="100%" border="0" cellspacing="0" cellpadding="2"> $error = '<table class="error">
<tr> <tr>
<td class="error"><b>Error:</b><br>'.$error.'</td> <td><strong>Error:</strong><br>'.$error.'</td>
</tr> </tr>
</table>'; </table>';
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment