dont even try to do handshake if password or username have a strlen of 0

2 files changed, 6 insertions, 2 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 39071b5f..f4b9fb9f 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.4-Beta2 
+	- Fixed LastFM plugin username and password checking to not even try
+		if there is no username or password
 
 --------------------------------------------------------------------------
   v.3.4-Beta1 12/25/2007 
diff --git a/modules/plugins/Lastfm.plugin.php b/modules/plugins/Lastfm.plugin.php
index 0804bb26..6e4b2ab4 100644
--- a/modules/plugins/Lastfm.plugin.php
+++ b/modules/plugins/Lastfm.plugin.php
@@ -172,16 +172,18 @@ class AmpacheLastfm {
 	 */
 	public function load($data,$user_id) { 
 
-		if (isset($data['lastfm_user'])) { 
+		if (strlen($data['lastfm_user'])) { 
 			$this->username = $data['lastfm_user']; 
 		} 
 		else { 
+			debug_event('LastFM','No Username, not scrobbling','3'); 
 			return false; 
 		} 
-		if (isset($data['lastfm_pass'])) { 
+		if (strlen($data['lastfm_pass'])) { 
 			$this->password = $data['lastfm_pass']; 
 		} 
 		else { 
+			debug_event('LastFM','No Password, not scrobbling','3'); 
 			return false; 
 		}