aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin.php2
-rw-r--r--functions/init.inc.php2
-rw-r--r--includes/login.php11
3 files changed, 9 insertions, 6 deletions
diff --git a/admin.php b/admin.php
index 0ec2f1a..21272af 100644
--- a/admin.php
+++ b/admin.php
@@ -89,7 +89,7 @@ include (BASE.'includes/header.inc.php');
// If User is Not Logged In, Display The Login Page
if ($is_loged_in == FALSE) {
- if (isset($username)) {
+ if (isset($username) && $username !='') {
$login_error = "<font color=\"red\">$invalid_login_lang</font>";
} else {
$login_error = '';
diff --git a/functions/init.inc.php b/functions/init.inc.php
index a3972f8..d78d734 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -6,7 +6,7 @@
//chmod(BASE.'calendars/School.ics',0666);
// uncomment when developing, comment for shipping version
-// error_reporting (E_ERROR | E_WARNING);
+error_reporting (E_ERROR | E_WARNING);
// Older versions of PHP do not define $_SERVER. Define it here instead.
if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
diff --git a/includes/login.php b/includes/login.php
index 06b7381..5df5d01 100644
--- a/includes/login.php
+++ b/includes/login.php
@@ -16,28 +16,31 @@
}
echo '<input type="hidden" name="'.$key.'" value="'.$HTTP_GET_VARS[$key].'">';
}
+
+ // For Wesley
+ $login_message = ($user_passed == TRUE) ? $invalid_login_lang : $login_lang;
echo <<<END
<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
<tr>
- <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">Login</div></td>
+ <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_message}</div></td>
</tr>
<tr>
<td align="left" class="G10B">
<div style="padding: 5px;">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td width="5%">Username:</td>
+ <td width="5%">{$username_lang}:</td>
<td width="95%"><input class="login_style" type="text" size="8" name="username"></td>
</tr>
<tr>
<td>Password:</td>
- <td><input class="login_style" type="password" size="8" name="password"></td>
+ <td><input class="login_style" type="{$password_lang}" size="8" name="password"></td>
</tr>
<tr>
<td>&nbsp;</td>
- <td><input class="login_style" type="submit" value="Login"></td>
+ <td><input class="login_style" type="submit" value="{$login_lang}"></td>
</tr>
</table>
</div>

© 2014-2024 Faster IT GmbH | imprint | privacy policy