nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move error message on top of page.

Browse Source
This commit is contained in:
Michal Čihař
2005-11-23 16:45:13 +00:00
parent 62c6124e26
commit fef607cd64
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -45,6 +45,7 @@ $Source$
* libraries/common.lib.php: Do not complain if config file is not present, * libraries/common.lib.php: Do not complain if config file is not present,
as we can still work in this case (bug #1364647). as we can still work in this case (bug #1364647).
* lang/*: Added missing $strInvalidServerHostname. * lang/*: Added missing $strInvalidServerHostname.
* libraries/auth/cookie.auth.lib.php: Move error message on top of page.
2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* added test/theme.php: for testing themes * added test/theme.php: for testing themes

12
libraries/auth/cookie.auth.lib.php
View File

@@ -140,6 +140,13 @@ echo sprintf( $GLOBALS['strWelcome'],
?> ?>
</h1> </h1>
<?php <?php
// Show error message
if ( !empty($conn_error)) {
echo '<div class="error"><h1>' . $GLOBALS['strError'] . '</h1>' . "\n";
echo $conn_error . '</div>' . "\n";
}
// Displays the languages form // Displays the languages form
if (empty($cfg['Lang'])) { if (empty($cfg['Lang'])) {
echo "\n"; echo "\n";
@@ -161,11 +168,6 @@ echo sprintf( $GLOBALS['strWelcome'],
. '</html>'; . '</html>';
exit(); exit();
} }
if ( !empty($conn_error)) {
echo '<div class="error"><h1>' . $GLOBALS['strError'] . '</h1>' . "\n";
echo $conn_error . '</div>' . "\n";
}
?> ?>
<br /> <br />
<!-- Login form --> <!-- Login form -->