added config version check, fixed play selected bug reported by chenb and fixed wmp11 now playing issue

3 files changed, 11 insertions, 9 deletions

diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 26c218a7..c7fcd658 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -162,8 +162,7 @@ class Song {
 			preg_match('/\.([A-Za-z0-9]+)$/', $this->file,$results);
 			$this->type = strtolower($results['1']);
 		} 
-
-
+		
 		switch ($this->type) { 
 			case 'spx':
 			case 'ogg':
@@ -201,7 +200,9 @@ class Song {
 			break;
 		}
 
-	} // get_type
+		return true; 
+
+	} // format_type
 	
 	/*!
 		@function get_album_songs
@@ -817,10 +818,10 @@ class Song {
 		}
 
 		/* Account for retarded players */
-		if ($song->type == 'flac') { $type = 'ogg'; } 
+		if ($this->type == 'flac') { $type = 'ogg'; } 
 
 		$this->format();
-		$song_name = rawurlencode($this->f_artist_full . " - " . $this->title . "." . $this->type);
+		$song_name = rawurlencode($this->f_artist_full . " - " . $this->title . "." . $type);
 	
 		$web_path = conf('web_path');
 
@@ -856,7 +857,7 @@ class Song {
 		if (conf($conf_var)) { 
 			$this->_transcode = true; 
 			$this->format_type(conf($conf_type)); 
-			debug_event('auto_transcode','Transcoding to ' . conf($conf_type),'5'); 
+			debug_event('auto_transcode','Transcoding to ' . $this->type,'5'); 
 			return false; 
 		} 
 		
diff --git a/lib/init.php b/lib/init.php
index b0f55d7c..f3c2f109 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -67,7 +67,8 @@ if (!$results = read_config($configfile,0)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3 Build (003)';
+$results['version']		= '3.3.3 Build (004)';
+$results['int_config_version']	= '1'; 
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index 3cdb4ccf..af589273 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -85,12 +85,12 @@ function insert_now_playing($song_id,$uid,$song_length) {
         if (stristr($user_agent,"Windows-Media-Player")) { return false; }
 
 	/* Check for Windows Media Player 11 */
-	if (strstr($user_agent,"WMFSDK/11")) { return false; } 
+	if (strstr($user_agent,'NSPlayer/11') AND !strstr($user_agent,'WMFSDK/11')) { return false; } 
 
         /* Set the Expire Time */
 
         // If they are using Windows media player
-	if (stristr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) { 
+	if (strstr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) { 
                 // WMP does keep the session open so we need to cheat a little here
 		$session_id 	= sql_escape($_REQUEST['sid']); 
         }