two fixes for invalid artist ids in album xml and parse error on image.php

2 files changed, 8 insertions, 8 deletions

diff --git a/image.php b/image.php
index 415bcb76..8ea39ecd 100644
--- a/image.php
+++ b/image.php
@@ -27,14 +27,14 @@
 
 // This file is a little weird it needs to allow API session
 // this needs to be done a little better, but for now... eah
-if ($_REQUEST['auth']) { 
-	if (Access::session_exists(array(),$_REQUEST['auth'],'api')) { 
-		define('NO_SESSION','1'); 
-	}
-} // extra layer of auth 
-
+define('NO_SESSION','1'); 
 require 'lib/init.php';
 
+// Check their session manually
+if (!session_exists(session_id()) && !Access::session_exists(array(),$_REQUEST['auth'],'api')) { 
+	exit; 
+} 
+
 /* Decide what size this image is */
 switch ($_REQUEST['thumb']) { 
 	case '1':
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php
index 129c2240..ddce5228 100644
--- a/lib/class/xmldata.class.php
+++ b/lib/class/xmldata.class.php
@@ -116,13 +116,13 @@ class xmlData {
 				$string .= "\t<artist id=\"0\"><![CDATA[Various]]></artist>\n"; 
 			} 
 			else { 
-				$string .= "\t<artist id=\"$album->artist_id\"><![CDATA[$album->artist_name]]></artist>\n"; 
+				$string .= "\t<artist id=\"$album->artist\"><![CDATA[$album->artist_name]]></artist>\n"; 
 			} 
 
 			$string .= "\t<year>$album->year</year>\n" . 
 					"\t<tracks>$album->song_count</tracks>\n" . 
 					"\t<disk>$album->disk</disk>\n" . 
-					"\t<art>$art_url</art>\n" . 
+					"\t<art><![CDATA[$art_url]]></art>\n" . 
 					"</album>\n"; 
 		} // end foreach