Fixed two PHP warnings, and some issues with how users were being constructed

in init (which makes me wonder) and started trying to figure out why libre.fm broke

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index cfd1b66e..a75264ea 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -2182,7 +2182,7 @@ class Catalog extends database_object {
 		 */
 
 		// Strip the SSID off of the url, we will need to regenerate this every time 
-		$url		= preg_replace("/SSID=.*&/","",$song['url']); 
+		$url		= preg_replace("/ssid=.*&/","",$song['url']); 
 		$title		= Dba::escape($song['title']); 
 		$album 		= self::check_album($song['album'],$song['year'],null,$song['album_mbid']); 
 		$artist		= self::check_artist($song['artist'],$song['artist_mbid']); 
diff --git a/lib/class/scrobbler.class.php b/lib/class/scrobbler.class.php
index e5ab6f4d..37f25112 100644
--- a/lib/class/scrobbler.class.php
+++ b/lib/class/scrobbler.class.php
@@ -146,7 +146,7 @@ class scrobbler {
 				"\n---------\nExpeceted:" . print_r($response,1);
 			return false;
 		}
-
+debug_event('ZZZZZ',print_r($split_response,1),1); 
 		$data['challenge'] = $response[1];
 		return $data;
 
@@ -219,6 +219,10 @@ class scrobbler {
 			return false;
 		}
 
+		// Need to debug this
+		$string = "POST ".$this->submit_url." HTTP/1.0\r\n"."Host: ".$this->submit_host."\r\n"."Accept: */*\r\n"."User-Agent: Ampache/3.6\r\n".
+			"Content-type: application/x-www-form-urlencoded\r\n"."Content-length: ".strlen($query_str)."\r\n\r\n".$query_str."\r\n\r\n";
+		debug_event('SCROBBLER',$string,1); 
 		$action = "POST ".$this->submit_url." HTTP/1.0\r\n";
 		fwrite($as_socket, $action);
 		fwrite($as_socket, "Host: ".$this->submit_host."\r\n");