fixed some bugs introduced by the ldap patch

3 files changed, 3 insertions, 3 deletions

diff --git a/login.php b/login.php
index 85bcd367..fab78422 100644
--- a/login.php
+++ b/login.php
@@ -78,7 +78,7 @@ if ($_POST['username'] && $_POST['password']) {
                                 $auth['error'] = _('User Disabled please contact Admin');
                 } // if user disabled
                 
-		elseif (!$user->username) { 
+		elseif (!$user->username AND $auth['success']) { 
 			/* This is run if we want to auto_create users who don't exist (usefull for non mysql auth) */                
 			if (conf('auto_create')) {
 				if (!$access = conf('auto_user')) { $access = '5'; } 
diff --git a/modules/vauth/auth.lib.php b/modules/vauth/auth.lib.php
index c170e7f7..ff0ca5e8 100644
--- a/modules/vauth/auth.lib.php
+++ b/modules/vauth/auth.lib.php
@@ -129,7 +129,7 @@ function vauth_ldap_auth($username, $password) {
 		ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, 3);
 
         	// bind using our auth, if we need to, for initial search for username
-          	if (!ldap_bind($ldap_link, $ldap_dn, $ldap_password)) {
+          	if (!ldap_bind($ldap_link, $ldap_username, $ldap_password)) {
                 	$results['success'] = false;
                 	$results['error'] = "Could not bind to LDAP server.";
                 	return $results;
diff --git a/templates/show_album.inc b/templates/show_album.inc
index 17ca48c5..ae8d8b97 100644
--- a/templates/show_album.inc
+++ b/templates/show_album.inc
@@ -47,7 +47,7 @@ $title		= scrub_out($album->name) . ' -- ' . $album->f_artist;
 	<div style="display:table-cell;vertical-align:top;">
 		<?php
 		if (conf('ratings')) {	
-			echo "<span style=\"display:inline;\" id=\"rating_" . $album->id . "_album\">";
+			echo "<span style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">";
 			show_rating($album->id, 'album');} // end if ratings
 			echo "</span>";
 		echo "<br />\n";