From 0237890676fd9556db8d8505e0b84a652eaff33d Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Wed, 25 Jan 2006 08:16:53 +0000
Subject: hopefully fixed mysql5 problems with vauth as well as the remember me
 mojo for rubin

---
 templates/show_login_form.inc | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'templates')

diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc
index ea692d7d..148cd541 100644
--- a/templates/show_login_form.inc
+++ b/templates/show_login_form.inc
@@ -30,15 +30,18 @@ if (preg_match($subject,$_SERVER['HTTP_HOST'])) {
 ?>
 <br /><br />
 <p align="center">
-	<a href="http://www.ampache.org"><img src="<?php echo  conf('web_path');
-	 ?><?php echo conf('theme_path'); ?>/images/ampache.gif" title="<?php echo conf('site_title'); ?>" border="0" alt="Ampache" />
+	<a href="http://www.ampache.org"><img src="<?php echo  conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache.gif" title="<?php echo conf('site_title'); ?>" border="0" alt="Ampache" />
 	</a>
 </p>
 <form name="login" method="post" enctype="multipart/form-data" action="<?php echo  conf('web_path'); ; ?>/login.php" style="Display:inline">
 <table class="login" bgcolor="<?php echo conf('base_color2'); ?>" border="0" align="center">
 <tr>
-	<td align="center" colspan="2"><?php echo  conf('login_message'); ; ?>&nbsp;</td>
-</tr>
+	<td align="center" colspan="2">
+	<?php echo  conf('login_message'); ; ?>&nbsp;
+	<?php $GLOBALS['error']->print_error('general'); ?>
+	</td>
+
+	</tr>
 <tr>
 	<td><?php echo  _("Login"); ; ?>:</td>
 	<td><input type="text" name="username" value="<?php echo  $_REQUEST['username']; ; ?>" /></td>
@@ -75,9 +78,4 @@ if ($show_copyright == 1) { ?>
 			All Rights Reserved, Copyright &copy; 2006<br />
 		</font>
 	</p>
-<?php } // end if ($show_copyright == 1)
-if (isset($auth['error'])) { ?>
-	<p align="center">
-		<font color="red"><?php echo trim($auth['error']); ?></font>
-	</p>
-<?php } // end if (isset($auth['error'])) ?>
+<?php } // end if ($show_copyright == 1) ?>
-- 
cgit