fixed a problem with preferences showing disabled localplay modules, included sajax library

8 files changed, 541 insertions, 150 deletions

diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 65f020c4..58317c59 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -140,8 +140,8 @@ tag_order	= "file"
 
 # Use auth?
 # If this is set to "Yes" ampache will require a valid
-# Username and password. If this is set to no then ampache
-# will not ask you for a username and password. No is only
+# Username and password. If this is set to false then ampache
+# will not ask you for a username and password. false is only
 # recommended for internal only instances
 # DEFAULT true
 use_auth	= "yes"
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index f33ff67c..fd540d0f 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.3.3-Alpha1
+	- Fixed display of disabled localplay methods, Preferences wil
+		now only display active ones. 
 	- Fixed MPD Controller to attempt to find files based on filename
 		if they were added outside of ampache
 	- Tweaked Now Playing to prevent wrapping of Album Art.
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 488714ea..b9f0d8cc 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -73,6 +73,8 @@ class Localplay {
 	 */
 	function _load_player() { 
 
+		if (!$this->type) { return false; } 
+
 		$filename = conf('prefix') . '/modules/localplay/' . $this->type . '.controller.php';
 		$include = require_once ($filename);
 		
@@ -173,9 +175,13 @@ class Localplay {
 	 */
 	function connect() { 
 
-		
 		$function = $this->_function_map['connect'];
-		
+	
+		/* This is very bad, that means they don't even 
+		 * have a connection function defined
+		 */
+		if (!$function) { return false; } 
+	
 		if (!$this->_player->$function()) { 
 			debug_event('localplay','Error Unable to connect, check ' . $this->type . ' controller','1');
 			return false;
diff --git a/lib/init.php b/lib/init.php
index f76f3eb6..c07df1a8 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -158,6 +158,7 @@ require_once(conf('prefix') . "/modules/id3/getid3/getid3.php");
 require_once(conf('prefix') . '/modules/id3/vainfo.class.php');
 require_once(conf('prefix') . '/modules/amazon/Snoopy.class.php');
 require_once(conf('prefix') . '/modules/amazon/AmazonSearchEngine.class.php');
+require_once(conf('prefix') . '/modules/sajax/Sajax.php');
 require_once(conf('prefix') . '/lib/xmlrpc.php');
 require_once(conf('prefix') . '/modules/xmlrpc/xmlrpc.inc');
 
diff --git a/lib/localplay.lib.php b/lib/localplay.lib.php
index 523a5548..bd73853b 100644
--- a/lib/localplay.lib.php
+++ b/lib/localplay.lib.php
@@ -160,7 +160,10 @@ function get_localplay_controllers() {
 		if (!is_dir($file)) { 
 			/* Get the base name, then get everything before .controller.php */
 			$filename = basename($file,'.controller.php');
-			$results[] = $filename;
+			/* Make sure that it's currently enabled */
+			if (verify_localplay_preferences($filename)) { 
+				$results[] = $filename;
+			} 
 		}
 	} // end while
 
diff --git a/lib/preferences.php b/lib/preferences.php
index 48430632..ba28affb 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -305,6 +305,7 @@ function create_preference_input($name,$value) {
 				if ($value == $controller) { $is_selected = 'selected="selected"'; } 
 				echo "\t<option value=\"" . $controller . "\" $is_selected>" . ucfirst($controller) . "</option>\n";
 			} // end foreach
+			echo "\t<option value=\"\">" . _('None') . "</option>\n";
 			echo "</select>\n";
 		break;
 		case 'localplay_level':
diff --git a/modules/sajax/Sajax.php b/modules/sajax/Sajax.php
new file mode 100644
index 00000000..a74a4aff
--- /dev/null
+++ b/modules/sajax/Sajax.php
@@ -0,0 +1,373 @@
+<?php	
+/*
+ SAJAX PHP BACKEND
+ -----------------
+
+ Contributed and copyighted by Thomas Lackner and ModernMethod
+ (http://www.modernmethod.com/).
+
+ Licence: GNU/GPL
+
+*/
+
+
+if (!isset($SAJAX_INCLUDED)) {
+
+	/*  
+	 * GLOBALS AND DEFAULTS
+	 *
+	 */ 
+	$GLOBALS['sajax_version'] = '0.12';	
+	$GLOBALS['sajax_debug_mode'] = 0;
+	$GLOBALS['sajax_export_list'] = array();
+	$GLOBALS['sajax_request_type'] = 'GET';
+	$GLOBALS['sajax_remote_uri'] = '';
+	$GLOBALS['sajax_failure_redirect'] = '';
+	
+	/*
+	 * CODE
+	 *
+	 */ 
+	 
+	//
+	// Initialize the Sajax library.
+	//
+	function sajax_init() {
+	}
+	
+	//
+	// Helper function to return the script's own URI. 
+	// 
+	function sajax_get_my_uri() {
+		return $_SERVER["REQUEST_URI"];
+	}
+	$sajax_remote_uri = sajax_get_my_uri();
+	
+	//
+	// Helper function to return an eval()-usable representation
+	// of an object in JavaScript.
+	// 
+	function sajax_get_js_repr($value) {
+		$type = gettype($value);
+		
+		if ($type == "boolean") {
+			return ($value) ? "Boolean(true)" : "Boolean(false)";
+		} 
+		elseif ($type == "integer") {
+			return "parseInt($value)";
+		} 
+		elseif ($type == "double") {
+			return "parseFloat($value)";
+		} 
+		elseif ($type == "array" || $type == "object" ) {
+			//
+			// XXX Arrays with non-numeric indices are not
+			// permitted according to ECMAScript, yet everyone
+			// uses them.. We'll use an object.
+			// 
+			$s = "{ ";
+			if ($type == "object") {
+				$value = get_object_vars($value);
+			} 
+			foreach ($value as $k=>$v) {
+				$esc_key = sajax_esc($k);
+				if (is_numeric($k)) 
+					$s .= "$k: " . sajax_get_js_repr($v) . ", ";
+				else
+					$s .= "\"$esc_key\": " . sajax_get_js_repr($v) . ", ";
+			}
+			if (count($value))
+				$s = substr($s, 0, -2);
+			return $s . " }";
+		} 
+		else {
+			$esc_val = sajax_esc($value);
+			$s = "'$esc_val'";
+			return $s;
+		}
+	}
+
+	function sajax_handle_client_request() {
+		global $sajax_export_list;
+		
+		$mode = "";
+		
+		if (! empty($_GET["rs"])) 
+			$mode = "get";
+		
+		if (!empty($_POST["rs"]))
+			$mode = "post";
+			
+		if (empty($mode)) 
+			return;
+
+		$target = "";
+		
+		if ($mode == "get") {
+			// Bust cache in the head
+			header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
+			header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			// always modified
+			header ("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
+			header ("Pragma: no-cache");                          // HTTP/1.0
+			$func_name = $_GET["rs"];
+			if (! empty($_GET["rsargs"])) 
+				$args = $_GET["rsargs"];
+			else
+				$args = array();
+		}
+		else {
+			$func_name = $_POST["rs"];
+			if (! empty($_POST["rsargs"])) 
+				$args = $_POST["rsargs"];
+			else
+				$args = array();
+		}
+		
+		if (! in_array($func_name, $sajax_export_list))
+			echo "-:$func_name not callable";
+		else {
+			echo "+:";
+			$result = call_user_func_array($func_name, $args);
+			echo "var res = " . trim(sajax_get_js_repr($result)) . "; res;";
+		}
+		exit;
+	}
+	
+	function sajax_get_common_js() {
+		global $sajax_debug_mode;
+		global $sajax_request_type;
+		global $sajax_remote_uri;
+		global $sajax_failure_redirect;
+		
+		$t = strtoupper($sajax_request_type);
+		if ($t != "" && $t != "GET" && $t != "POST") 
+			return "// Invalid type: $t.. \n\n";
+		
+		ob_start();
+		?>
+		
+		// remote scripting library
+		// (c) copyright 2005 modernmethod, inc
+		var sajax_debug_mode = <?php echo $sajax_debug_mode ? "true" : "false"; ?>;
+		var sajax_request_type = "<?php echo $t; ?>";
+		var sajax_target_id = "";
+		var sajax_failure_redirect = "<?php echo $sajax_failure_redirect; ?>";
+		
+		function sajax_debug(text) {
+			if (sajax_debug_mode)
+				alert(text);
+		}
+		
+ 		function sajax_init_object() {
+ 			sajax_debug("sajax_init_object() called..")
+ 			
+ 			var A;
+ 			
+ 			var msxmlhttp = new Array(
+				'Msxml2.XMLHTTP.5.0',
+				'Msxml2.XMLHTTP.4.0',
+				'Msxml2.XMLHTTP.3.0',
+				'Msxml2.XMLHTTP',
+				'Microsoft.XMLHTTP');
+			for (var i = 0; i < msxmlhttp.length; i++) {
+				try {
+					A = new ActiveXObject(msxmlhttp[i]);
+				} catch (e) {
+					A = null;
+				}
+			}
+ 			
+			if(!A && typeof XMLHttpRequest != "undefined")
+				A = new XMLHttpRequest();
+			if (!A)
+				sajax_debug("Could not create connection object.");
+			return A;
+		}
+		
+		var sajax_requests = new Array();
+		
+		function sajax_cancel() {
+			for (var i = 0; i < sajax_requests.length; i++) 
+				sajax_requests[i].abort();
+		}
+		
+		function sajax_do_call(func_name, args) {
+			var i, x, n;
+			var uri;
+			var post_data;
+			var target_id;
+			
+			sajax_debug("in sajax_do_call().." + sajax_request_type + "/" + sajax_target_id);
+			target_id = sajax_target_id;
+			if (typeof(sajax_request_type) == "undefined" || sajax_request_type == "") 
+				sajax_request_type = "GET";
+			
+			uri = "<?php echo $sajax_remote_uri; ?>";
+			if (sajax_request_type == "GET") {
+			
+				if (uri.indexOf("?") == -1) 
+					uri += "?rs=" + escape(func_name);
+				else
+					uri += "&rs=" + escape(func_name);
+				uri += "&rst=" + escape(sajax_target_id);
+				uri += "&rsrnd=" + new Date().getTime();
+				
+				for (i = 0; i < args.length-1; i++) 
+					uri += "&rsargs[]=" + escape(args[i]);
+
+				post_data = null;
+			} 
+			else if (sajax_request_type == "POST") {
+				post_data = "rs=" + escape(func_name);
+				post_data += "&rst=" + escape(sajax_target_id);
+				post_data += "&rsrnd=" + new Date().getTime();
+				
+				for (i = 0; i < args.length-1; i++) 
+					post_data = post_data + "&rsargs[]=" + escape(args[i]);
+			}
+			else {
+				alert("Illegal request type: " + sajax_request_type);
+			}
+			
+			x = sajax_init_object();
+			if (x == null) {
+				if (sajax_failure_redirect != "") {
+					location.href = sajax_failure_redirect;
+					return false;
+				} else {
+					sajax_debug("NULL sajax object for user agent:\n" + navigator.userAgent);
+					return false;
+				}
+			} else {
+				x.open(sajax_request_type, uri, true);
+				// window.open(uri);
+				
+				sajax_requests[sajax_requests.length] = x;
+				
+				if (sajax_request_type == "POST") {
+					x.setRequestHeader("Method", "POST " + uri + " HTTP/1.1");
+					x.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+				}
+			
+				x.onreadystatechange = function() {
+					if (x.readyState != 4) 
+						return;
+
+					sajax_debug("received " + x.responseText);
+				
+					var status;
+					var data;
+					var txt = x.responseText.replace(/^\s*|\s*$/g,"");
+					status = txt.charAt(0);
+					data = txt.substring(2);
+
+					if (status == "") {
+						// let's just assume this is a pre-response bailout and let it slide for now
+					} else if (status == "-") 
+						alert("Error: " + data);
+					else {
+						if (target_id != "") 
+							document.getElementById(target_id).innerHTML = eval(data);
+						else {
+							try {
+								var callback;
+								var extra_data = false;
+								if (typeof args[args.length-1] == "object") {
+									callback = args[args.length-1].callback;
+									extra_data = args[args.length-1].extra_data;
+								} else {
+									callback = args[args.length-1];
+								}
+								callback(eval(data), extra_data);
+							} catch (e) {
+								sajax_debug("Caught error " + e + ": Could not eval " + data );
+							}
+						}
+					}
+				}
+			}
+			
+			sajax_debug(func_name + " uri = " + uri + "/post = " + post_data);
+			x.send(post_data);
+			sajax_debug(func_name + " waiting..");
+			delete x;
+			return true;
+		}
+		
+		<?php
+		$html = ob_get_contents();
+		ob_end_clean();
+		return $html;
+	}
+	
+	function sajax_show_common_js() {
+		echo sajax_get_common_js();
+	}
+	
+	// javascript escape a value
+	function sajax_esc($val)
+	{
+		$val = str_replace("\\", "\\\\", $val);
+		$val = str_replace("\r", "\\r", $val);
+		$val = str_replace("\n", "\\n", $val);
+		$val = str_replace("'", "\\'", $val);
+		return str_replace('"', '\\"', $val);
+	}
+
+	function sajax_get_one_stub($func_name) {
+		ob_start();	
+		?>
+		
+		// wrapper for <?php echo $func_name; ?>
+		
+		function x_<?php echo $func_name; ?>() {
+			sajax_do_call("<?php echo $func_name; ?>",
+				x_<?php echo $func_name; ?>.arguments);
+		}
+		
+		<?php
+		$html = ob_get_contents();
+		ob_end_clean();
+		return $html;
+	}
+	
+	function sajax_show_one_stub($func_name) {
+		echo sajax_get_one_stub($func_name);
+	}
+	
+	function sajax_export() {
+		global $sajax_export_list;
+		
+		$n = func_num_args();
+		for ($i = 0; $i < $n; $i++) {
+			$sajax_export_list[] = func_get_arg($i);
+		}
+	}
+	
+	$sajax_js_has_been_shown = 0;
+	function sajax_get_javascript()
+	{
+		global $sajax_js_has_been_shown;
+		global $sajax_export_list;
+		
+		$html = "";
+		if (! $sajax_js_has_been_shown) {
+			$html .= sajax_get_common_js();
+			$sajax_js_has_been_shown = 1;
+		}
+		foreach ($sajax_export_list as $func) {
+			$html .= sajax_get_one_stub($func);
+		}
+		return $html;
+	}
+	
+	function sajax_show_javascript()
+	{
+		echo sajax_get_javascript();
+	}
+
+	
+	$SAJAX_INCLUDED = 1;
+}
+?>
diff --git a/modules/slimserver/slim.class.php b/modules/slimserver/slim.class.php
index 4ac568b7..6b88f9f5 100755
--- a/modules/slimserver/slim.class.php
+++ b/modules/slimserver/slim.class.php
@@ -1,163 +1,168 @@
 <?php

+/**

+*

+* Slimp3-Class

+* for querying the slimp3 and the squeezebox players

+*

+* feel free to modify and use it whereever you want.

+* would be nice if you could send me your changes,

+*

+* Homepage:

+* http://trendwhores.de/slimclass.php

+*

+* Tobias Schlottke <tschlottke chr(64) virtualminds chr(46) de>

+* http://www.trendwhores.de

+*

+* Modifications by Andreas <php  chr(64) simply  chr(46) nu>

+* + Added more options to slimp3()

+* + Added playlist() /w related options

+* + Modified display() to get strings with spaces instead of +'s provided by urlencode

+* + Modified _parse() to handle new options. Quick'n'dirty hack, could probably be prettier!

+*

+* Updated by Vollmer (vollmer@ampache.org)

+* + Added timeout on fsockopen and error information

+* + Added comments and cleaned up code to fix ampache coding standards

+* License: GPL

+*

+*/

+ 

+class Slimserver {

      

-    /**

-    *

-    * Slimp3-Class

-    * for querying the slimp3 and the squeezebox players

-    *

-    * feel free to modify and use it whereever you want.

-    * would be nice if you could send me your changes,

-    *

-    * Homepage:

-    * http://trendwhores.de/slimclass.php

-    *

-    * Tobias Schlottke <tschlottke chr(64) virtualminds chr(46) de>

-    * http://www.trendwhores.de

-    *

-    * Modifications by Andreas <php  chr(64) simply  chr(46) nu>

-    * + Added more options to slimp3()

-    * + Added playlist() /w related options

-    * + Modified display() to get strings with spaces instead of +'s provided by urlencode

-    * + Modified _parse() to handle new options. Quick'n'dirty hack, could probably be prettier!

-    *

-    * License: GPL

-    *

-    */

+	var $host = 'localhost';

+	var $port = 9090;

      

-    class slim {

-         

-        var $host = "localhost";

-        var $port = 9090;

-         

-        var $_connection;

-         

-        var $playerindex;

-        var $playercount;

-         

-         

-        function slim($host = NULL, $port = 9090) {

-             

-            if ($host && $port) {

-                $this->host = $host;

-                $this->port = $port;

-            }

-             

-            if (!$this->_connection = fsockopen($this->host, $this->port)) {

-                return false;

-            }

-             

-            $this->playercount = $this->_psend("player count ?");

-            for($i = 0; $i < $this->playercount; $i++) {

-                $this->playerindex[$i]['name'] = $this->_psend("player name $i ?");

-                $this->playerindex[$i]['ip'] = $this->_psend("player ip $i ?");

-                $this->playerindex[$i]['address'] = $this->_psend("player address $i ?");

-                # Added some more options /andreas

-                $this->playerindex[$i]['mode'] = $this->_psend($this->playerindex[$i]["address"] . " mode ?");

-                $this->playerindex[$i]['power'] = $this->_psend($this->playerindex[$i]["address"] . " power ?");

-                $this->playerindex[$i]['volume'] = $this->_psend($this->playerindex[$i]["address"] . " mixer volume ?");

-                $this->playerindex[$i]['treble'] = $this->_psend($this->playerindex[$i]["address"] . " mixer treble ?");

-                $this->playerindex[$i]['bass'] = $this->_psend($this->playerindex[$i]["address"] . " mixer bass ?");

-                $this->playerindex[$i]['tracks'] = $this->_psend($this->playerindex[$i]["address"] . " info total songs ?");

-                $this->playerindex[$i]['albums'] = $this->_psend($this->playerindex[$i]["address"] . " info total albums ?");

-                $this->playerindex[$i]['artists'] = $this->_psend($this->playerindex[$i]["address"] . " info total artists ?");

-                $this->playerindex[$i]['genres'] = $this->_psend($this->playerindex[$i]["address"] . " info total genres ?");

-                 

-            }

-             

-            return true;

-        }

+	var $_connection;

+     

+	var $playerindex;

+	var $playercount;

+     

+	function Slimserver($host = NULL, $port = 9090) {

          

-        function nowplaying($player = 0) {

-            $song = array(

-                "artist" => $this->_psend("artist $player ?"),

-                "title" => $this->_psend("title $player ?"),

-                "path" => $this->_psend("path $player ?"),

-                "duration" => $this->_psend("duration $player ?"),

-                "genre" => $this->_psend("genre $player ?"),

-                "album" => $this->_psend("album $player ?")

-            );

-            return $song;

-        }

+		if ($host && $port) {

+			$this->host = $host;

+   			$this->port = $port;

+		}

+        

+		/* Attempt to establish connection */ 

+		if (!$this->_connection = fsockopen($this->host, $this->port,$errno,$errstr,'.5')) {

+			debug_event('slimserver','Error: Unable to open socket,' . $errno . ' - ' . $errstr,1);

+			return false;

+		}

          

-        # Added playlist() for related options /andreas

-        function playlist($player = 0) {

-            #Information related to playlist!

-            $index = $this->_psend("playlist index ?");

-            $index++;

-            $song = array(

-                "index" => $index,

-                "total" => $this->_psend("playlist tracks ?"),

-                # Spaces added to the end of the two first below, quick'n'dirty fix for parsing error... ;)

-                "nextartist" => $this->_psend("playlist artist " . $index . " "),

-                "nexttitle" => $this->_psend("playlist title " . $index . " "),

-                "shuffle" => $this->_psend("playlist shuffle ?"),

-                "repeat" => $this->_psend("playlist repeat ?")

-            );

-            return $song;

-        }

+		$this->playercount = $this->_psend("player count ?");

+

+		for($i = 0; $i < $this->playercount; $i++) {

+			$this->playerindex[$i]['name'] = $this->_psend("player name $i ?");

+			$this->playerindex[$i]['ip'] = $this->_psend("player ip $i ?");

+			$this->playerindex[$i]['address'] = $this->_psend("player address $i ?");

+

+			# Added some more options /andreas

+			$this->playerindex[$i]['mode'] = $this->_psend($this->playerindex[$i]["address"] . " mode ?");

+			$this->playerindex[$i]['power'] = $this->_psend($this->playerindex[$i]["address"] . " power ?");

+			$this->playerindex[$i]['volume'] = $this->_psend($this->playerindex[$i]["address"] . " mixer volume ?");

+			$this->playerindex[$i]['treble'] = $this->_psend($this->playerindex[$i]["address"] . " mixer treble ?");

+			$this->playerindex[$i]['bass'] = $this->_psend($this->playerindex[$i]["address"] . " mixer bass ?");

+ 			$this->playerindex[$i]['tracks'] = $this->_psend($this->playerindex[$i]["address"] . " info total songs ?");

+			$this->playerindex[$i]['albums'] = $this->_psend($this->playerindex[$i]["address"] . " info total albums ?");

+			$this->playerindex[$i]['artists'] = $this->_psend($this->playerindex[$i]["address"] . " info total artists ?");

+			$this->playerindex[$i]['genres'] = $this->_psend($this->playerindex[$i]["address"] . " info total genres ?"); 

+		}

          

+        	return true;

+

+	} // end constructor

+     

+    function nowplaying($player = 0) {

+        $song = array(

+            "artist" => $this->_psend("artist $player ?"),

+            "title" => $this->_psend("title $player ?"),

+            "path" => $this->_psend("path $player ?"),

+            "duration" => $this->_psend("duration $player ?"),

+            "genre" => $this->_psend("genre $player ?"),

+            "album" => $this->_psend("album $player ?")

+        );

+        return $song;

+    }

+     

+    # Added playlist() for related options /andreas

+    function playlist($player = 0) {

+        #Information related to playlist!

+        $index = $this->_psend("playlist index ?");

+        $index++;

+        $song = array(

+            "index" => $index,

+            "total" => $this->_psend("playlist tracks ?"),

+            # Spaces added to the end of the two first below, quick'n'dirty fix for parsing error... ;)

+            "nextartist" => $this->_psend("playlist artist " . $index . " "),

+            "nexttitle" => $this->_psend("playlist title " . $index . " "),

+            "shuffle" => $this->_psend("playlist shuffle ?"),

+            "repeat" => $this->_psend("playlist repeat ?")

+        );

+        return $song;

+    }

+     

+     

+    function display($l1, $l2, $duration = 5, $player = 0) {

+        #$this->_send("display ".urlencode($l1)." ".urlencode($l2)." ".$duration);

+        # above code gave me urlencoded strings on my displat, ie "Hello%20World", below did not... /andreas (php  chr(64)  simply  chr(46) nu)

+        $l1 = str_replace(" ", "%20", $l1);

+        $l2 = str_replace(" ", "%20", $l2);

+        $this->_send("display ".$l1." ".$l2." ".$duration);

+    }

+     

+    function cdisplay() {

+        return urldecode($this->_send("display ? ?"));

+    }

+     

+    function close() {

+        $this->_send("exit");

+        return true;

+    }

+    # Modified by andreas (php  chr(64) simply  chr(46) nu)

+    # Don't ask why I did stuff here, don't remember ;)

+    function _parse($string, $cmd = NULL) {

          

-        function display($l1, $l2, $duration = 5, $player = 0) {

-            #$this->_send("display ".urlencode($l1)." ".urlencode($l2)." ".$duration);

-            # above code gave me urlencoded strings on my displat, ie "Hello%20World", below did not... /andreas (php  chr(64)  simply  chr(46) nu)

-            $l1 = str_replace(" ", "%20", $l1);

-            $l2 = str_replace(" ", "%20", $l2);

-            $this->_send("display ".$l1." ".$l2." ".$duration);

-        }

+        if (!$cmd);

+        $cmd = $this->_lastcmd;

          

-        function cdisplay() {

-            return urldecode($this->_send("display ? ?"));

-        }

+        $quoted = preg_quote(substr($cmd, 0, -1), "\\");

          

-        function close() {

-            $this->_send("exit");

-            return true;

-        }

-        # Modified by andreas (php  chr(64) simply  chr(46) nu)

-        # Don't ask why I did stuff here, don't remember ;)

-        function _parse($string, $cmd = NULL) {

-             

-            if (!$cmd);

-            $cmd = $this->_lastcmd;

-             

-            $quoted = preg_quote(substr($cmd, 0, -1), "\\");

-             

-            if (preg_match("/^".$quoted."(.*)/i", $string, $matches)) {

-                $dec = urldecode(trim($matches[1]));

+        if (preg_match("/^".$quoted."(.*)/i", $string, $matches)) {

+            $dec = urldecode(trim($matches[1]));

+            return $dec;

+        } elseif(preg_match("/^".substr($quoted, 0, -2)."(.*)/i", $string, $matches)) {

+            $dec = urldecode(trim($matches[1]));

+            if (substr($dec, -1, 1) == '?')

+            return substr($dec, 0, -1);

+            else

                 return $dec;

-            } elseif(preg_match("/^".substr($quoted, 0, -2)."(.*)/i", $string, $matches)) {

-                $dec = urldecode(trim($matches[1]));

-                if (substr($dec, -1, 1) == '?')

-                return substr($dec, 0, -1);

-                else

-                    return $dec;

-                 

-                # extra parsing for cmd's where MAC address is involved. Me not good at regexps so... ;)

-            } elseif(preg_match("/^".$quoted."(.*)/i", urldecode(trim($string)), $matches)) {

-                $dec = trim($matches[1]);

-                if ($dec == "0")

-                    return "play";

-                else

-                    return $dec;

-            } else {

-                return "unable to parse reply: ".$string."<br>(cmd was: $cmd)";

-            }

-        }

-         

-        function _send($string) {

              

-            $this->_lastcmd = $string;

-             

-            if (fputs($this->_connection, $string."\n"))

-            return fgets($this->_connection);

+            # extra parsing for cmd's where MAC address is involved. Me not good at regexps so... ;)

+        } elseif(preg_match("/^".$quoted."(.*)/i", urldecode(trim($string)), $matches)) {

+            $dec = trim($matches[1]);

+            if ($dec == "0")

+                return "play";

             else

-                return false;

+                return $dec;

+        } else {

+            return "unable to parse reply: ".$string."<br>(cmd was: $cmd)";

         }

+    }

+     

+    function _send($string) {

          

-        function _psend($string) {

-            return $this->_parse($this->_send($string));

-        }

+        $this->_lastcmd = $string;

          

+        if (fputs($this->_connection, $string."\n"))

+        return fgets($this->_connection);

+        else

+            return false;

+    }

+     

+    function _psend($string) {

+        return $this->_parse($this->_send($string));

     }

      

+}

+ 

 ?>