This update includes a full rewrite of the Localplay code, only update

to this version if you don't care about losing a lot of functionality
while I am still finishing it up. Also the only working localplay
method is currently MPD. UPDATE AT YOUR OWN RISK!

5 files changed, 66 insertions, 44 deletions

diff --git a/modules/init.php b/modules/init.php
index 5e8257b4..63ce2c1d 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -80,9 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.2-Beta3 (Build 002)';
-
-
+$results['version']		= '3.3.2-Beta3 (Build 003)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
@@ -145,33 +143,24 @@ require_once(conf('prefix') . '/lib/search.php');
 require_once(conf('prefix') . '/lib/preferences.php');
 require_once(conf('prefix') . '/lib/rss.php');
 require_once(conf('prefix') . '/lib/log.lib.php');
-require_once(conf('prefix') . '/lib/mpd.php');
+require_once(conf('prefix') . '/lib/localplay.lib.php');
 require_once(conf('prefix') . '/lib/ui.lib.php');
 require_once(conf('prefix') . '/lib/gettext.php');
 require_once(conf('prefix') . '/lib/batch.lib.php');
 require_once(conf('prefix') . '/lib/themes.php');
 require_once(conf('prefix') . '/lib/stream.lib.php');
 require_once(conf('prefix') . '/lib/playlist.lib.php');
+require_once(conf('prefix') . '/lib/upload.php');
 require_once(conf('prefix') . '/modules/lib.php');
 require_once(conf('prefix') . '/modules/admin.php');
 require_once(conf('prefix') . '/modules/catalog.php');
-require_once(conf('prefix') . '/lib/upload.php');
-
-// Modules (These are conditionaly included depending upon config values)
 require_once(conf('prefix') . "/modules/id3/audioinfo.class.php");
 require_once(conf('prefix') . "/modules/amazon/Snoopy.class.php");
 require_once(conf('prefix') . "/modules/amazon/AmazonSearchEngine.class.php");
 require_once(conf('prefix') . "/lib/xmlrpc.php");
 require_once(conf('prefix') . "/modules/xmlrpc/xmlrpc.inc");
 
-if (conf('allow_slim_playback')) { 
-	require_once(conf('prefix') . '/modules/slimserver/slim.class.php');
-}
-
-if (conf('allow_mpd_playback')) { 
-	require_once(conf('prefix') . '/modules/mpd/mpd.class.php');		
-}
-
+// Modules (These are conditionaly included depending upon config values)
 if (conf('ratings')) { 
 	require_once(conf('prefix') . '/lib/class/rating.class.php');
 	require_once(conf('prefix') . '/lib/rating.lib.php');
@@ -229,20 +218,17 @@ if (($gc_divisor / $gc_probability) > 5) {
 /* PHP5 Date problem solved.. ya'll GMT now! */
 putenv("TZ=GMT");
 
-/* END Set PHP Vars */
-
-/* Overwrite them with the DB preferences */
-set_site_preferences();
-
 /* Seed the random number */
 srand((double) microtime() * 1000003);
 
+/**** END Set PHP Vars ****/
+
 // If we don't want a session
 if (!isset($no_session) AND conf('use_auth')) { 
 	if (!vauth_check_session()) { logout(); exit(); }
+	$user = new User($_SESSION['userdata']['username']);
 	init_preferences();
 	set_theme();	
-	$user = new User($_SESSION['userdata']['username']);
 	$user->set_preferences();
 	$user->update_last_seen();
 }
@@ -283,6 +269,8 @@ flip_class(array('odd','even'));
 
 /* Setup the Error Class */
 $error = new Error();
+
+/* Set the Theme */
 $theme = get_theme(conf('theme_name'));
 
 if (! preg_match('/update\.php/', $_SERVER['PHP_SELF'])) {
diff --git a/modules/kajax/ajax.js b/modules/kajax/ajax.js
index 9920f4d4..0ed70087 100755
--- a/modules/kajax/ajax.js
+++ b/modules/kajax/ajax.js
@@ -1,4 +1,3 @@
-<script type="text/javascript">

 	//var xmlDoc = null;

 	var http_request = false;

 	var IE = true;

@@ -38,8 +37,7 @@
     function ajaxPut(url,getTerms,uid) {

 	makeRequest(url,getTerms);

 	

-	data = http_request.responseTXT;

+	data = http_request.responseText;

 	document.getElementById(uid).innerHTML = data;

     }

 

-</script>

diff --git a/modules/kajax/driver.php b/modules/kajax/driver.php
deleted file mode 100755
index 5cb4edbb..00000000
--- a/modules/kajax/driver.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?

-  Copyright 2006 Kevin Riker

-  All Rights Reserved 

-  

-$url = "query.php";

-$get = "search=hello";

-

-require_once('ajax.js');

-

-echo "<script type=\"text/javascript\">

-		javascript:makeRequest(\"$url\",\"$get\");

-</script>";

-?>

diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php
index 160e3e6e..f05447d0 100644
--- a/modules/localplay/mpd.controller.php
+++ b/modules/localplay/mpd.controller.php
@@ -56,12 +56,19 @@ class AmpacheMpd {
 
                 $map = array();
 
+		/* Required Functions */
                 $map['add']             = 'add_songs';
                 $map['delete']          = 'delete_songs';
                 $map['play']            = 'play';
                 $map['stop']            = 'stop';
                 $map['get']             = 'get_songs';
+		$map['status']		= 'get_status';
                 $map['connect']         = 'connect';
+		
+		/* Optional Functions */
+		$map['next']		= 'next';
+		$map['prev']		= 'prev';
+		$map['pause']		= 'pause';
 
                 return $map;
 
@@ -79,9 +86,9 @@ class AmpacheMpd {
 
 		$preferences = array(); 
 
-		$preferences[] = array('name'=>'hostname','default'=>'localhost','type'=>'string');
-		$preferences[] = array('name'=>'port','default'=>'6600','type'=>'integer');
-		$preferences[] = array('name'=>'password','default'=>'','type'=>'string');
+		$preferences[] = array('name'=>'hostname','default'=>'localhost','type'=>'string','description'=>'MPD Hostname');
+		$preferences[] = array('name'=>'port','default'=>'6600','type'=>'integer','description'=>'MPD Port');
+		$preferences[] = array('name'=>'password','default'=>'','type'=>'string','description'=>'MPD Password');
 
 		return $preferences;
 
@@ -164,6 +171,42 @@ class AmpacheMpd {
 
 
 	/**
+	 * next
+	 * This just tells MPD to skip to the next song 
+	 */
+	function next() { 
+
+		if (is_null($this->_mpd->Next())) { return false; } 
+
+		return true;
+
+	} // next
+
+	/**
+	 * prev
+	 * This just tells MPD to skip to the prev song
+	 */
+	function prev() { 
+
+		if (is_null($this->_mpd->Previous())) { return false; } 
+	
+		return true;
+	
+	} // prev
+
+	/**
+	 * pause
+	 * This tells MPD to pause the current song 
+	 */
+	function pause() { 
+		
+		if (is_null($this->_mpd->Pause())) { return false; } 
+
+		return true;
+
+	} // pause 
+
+	/**
 	 * get_songs
 	 * This functions returns an array containing information about
 	 * The songs that MPD currently has in it's playlist. This must be
@@ -174,8 +217,7 @@ class AmpacheMpd {
 		/* Get the Current Playlist */
 		$playlist = $this->_mpd->playlist;
 
-		foreach ($playlist as $key=>$entry) { 
-		
+		foreach ($playlist as $entry) { 
 			$data = array();
 
 			/* Required Elements */
@@ -189,6 +231,8 @@ class AmpacheMpd {
 
 		} // foreach playlist items
 
+		return $results;
+
 	} // get_songs
 
 	/**
@@ -198,8 +242,13 @@ class AmpacheMpd {
 	 */
 	function get_status() { 
 
+		/* Construct the Array */
+		$array['state'] 	= $this->_mpd->state;
+		$array['volume']	= $this->_mpd->volume;
+		$array['repeat']	= $this->_mpd->repeat;
+		$array['random']	= $this->_mpd->random;
 
-
+		return $array;
 
 	} // get_status
 
diff --git a/modules/vauth/session.lib.php b/modules/vauth/session.lib.php
index 18006dc1..9c30e1bc 100644
--- a/modules/vauth/session.lib.php
+++ b/modules/vauth/session.lib.php
@@ -66,7 +66,7 @@ function vauth_sess_close() {
 function vauth_sess_read($key) { 
 
 	$results = vauth_get_session($key);
-	if (!is_array($results)) { 
+	if (isset($results['value']) AND strlen($results['value']) < 1) { 
 		vauth_error('Unable to read session data');
 		return '';
 	}