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

5 files changed, 10 insertions, 5 deletions

diff --git a/image.php b/image.php
index 4d5b7752..ac6c001f 100644
--- a/image.php
+++ b/image.php
@@ -45,7 +45,7 @@ if (!vauth::session_exists('interface',$_COOKIE[Config::get('session_name')]) AN
 }
 
 // If we aren't resizing just trash thumb
-if (!Config::get('resize_images')) { unset($_GET['thumb']); } 
+if (!Config::get('resize_images')) { $_GET['thumb'] = null; } 
 
 // FIXME: Legacy stuff - should be removed after a version or so
 if (!isset($_GET['object_type'])) { 
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");
diff --git a/lib/init.php b/lib/init.php
index 045175d1..34821033 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -195,7 +195,7 @@ if (!defined('NO_SESSION') && Config::get('use_auth')) {
 	vauth::check_session();
 
 	/* Create the new user */
-	$GLOBALS['user'] = User::get_from_username($_SESSION['userdata']['username']);
+	$GLOBALS['user'] = new User($_SESSION['userdata']['uid']); 
 
 	/* If the user ID doesn't exist deny them */
 	if (!$GLOBALS['user']->id AND !Config::get('demo_mode')) { vauth::logout(session_id()); exit; }
@@ -243,7 +243,7 @@ else {
 		session_name(Config::get('session_name'));
 		session_id(scrub_in($_REQUEST['sid']));
 		session_start();
-		$GLOBALS['user'] = User::get_from_username($_SESSION['userdata']['username']);
+		$GLOBALS['user'] = new User($_SESSION['userdata']['uid']);
 	}
 	else {
 		$GLOBALS['user'] = new User();
diff --git a/play/index.php b/play/index.php
index 0fe4cf93..a2c10aaa 100644
--- a/play/index.php
+++ b/play/index.php
@@ -322,6 +322,7 @@ if (((Config::get('transcode') == 'always' AND  !$video) ||
 } // end if downsampling
 else {
 	$fp = fopen($media->file, 'rb');
+	$transcoded = false; 
 }
 
 if (!is_resource($fp)) {