updates, ajax kind of broken right now its late

2 files changed, 48 insertions, 1 deletions

diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index b9f0d8cc..48097882 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -534,7 +534,7 @@ class Localplay {
 	 * of the current player state
 	 */
 	function get_user_state($state) { 
-	
+		
 		switch ($state) { 
 			case 'play':
 				return _('Now Playing');
@@ -552,6 +552,29 @@ class Localplay {
 
 	} // get_user_state
 
+	/**
+	 * get_user_playing
+	 * This attempts to return a nice user friendly
+	 * currently playing string
+	 */
+	function get_user_playing() { 
+
+		$status = $this->status();
+		
+		/* Format the track name */
+		$track_name = $status['track_artist'] . ' - ' . $status['track_album'] . ' - ' . $status['track_title'];
+
+		/* This is a cheezball fix for when we were unable to find a
+		 * artist/album (or one wasn't provided)
+		 */
+		$track_name = ltrim(ltrim($track_name,' - '),' - ');
+
+		$track_name = "[" . $status['track'] . "] - " . $track_name;
+
+		return $track_name;
+	
+	} // get_user_playing
+
 
 } //end localplay class
 ?>
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index e30db5ec..7b93b37e 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -1334,5 +1334,29 @@ function get_user_icon($name) {
 
 } // show_icon
 
+/**
+ * xml_from_array
+ * This takes a one dimensional array and 
+ * creates a XML document form it for use 
+ * primarly by the ajax mojo
+ */
+function xml_from_array($array) { 
+
+	$escape_array = array ('<','&');
+	$replace_array = array('&lt;','&amp;');
+
+	$string = "<root>\n";
+	foreach ($array as $key=>$value) { 
+		/* We need to escape the value */
+		$value = str_replace($escape_array,$replace_array,$value);
+		$string .= "\t<$key>$value</$key>\n";
+	}
+	$string .= "</root>\n";
+
+	return $string;
+
+} // xml_from_array
+
+
 
 ?>