bunch of minor fixes and a db change

3 files changed, 29 insertions, 29 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index eef579ac..1ceaf9ce 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1021,8 +1021,8 @@ class Catalog {
 		}
 
 		show_box_top(); 
-		echo "\n<br />" . _("Catalog Update Finished") . "... " . _("Total Time") . " [" . date("i:s",$time_diff) . "] " .
-			_("Total Songs") . " [" . $this->count . "] " . _("Songs Per Seconds") . " [" . $song_per_sec . "]<br /><br />";
+		echo "\n<br />" . _('Catalog Update Finished') . "... " . _('Total Time') . " [" . date("i:s",$time_diff) . "] " .
+			_('Total Songs') . " [" . $this->count . "] " . _('Songs Per Seconds') . " [" . $song_per_sec . "]<br /><br />";
 		show_box_bottom(); 
 
 	} // add_to_catalog
@@ -1594,7 +1594,7 @@ class Catalog {
 
 		/* Ohh no the artist has lost it's mojo! */
 		if (!$artist) {
-			$artist = "Unknown (Orphaned)";
+			$artist = _('Unknown (Orphaned)');
 		}
 
 		// Remove the prefix so we can sort it correctly
@@ -1671,7 +1671,8 @@ class Catalog {
 
 		/* Ohh no the album has lost it's mojo */
 		if (!$album) {
-			$album = "Unknown (Orphaned)";
+			$album = _('Unknown (Orphaned)');
+			unset($album_year); 
 		}
 
 		// Remove the prefix so we can sort it correctly
@@ -1751,7 +1752,7 @@ class Catalog {
 	
 		/* If a genre isn't specified force one */
 		if (strlen(trim($genre)) < 1) {
-			$genre = "Unknown (Orphaned)";
+			$genre = _('Unknown (Orphaned)');
 		}
 
 		if ($this->genres[$genre]) {
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 79556491..067a3753 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -199,7 +199,10 @@ class Update {
 
 		$update_string = '- Alter the Session.id to be VARCHAR(64) to account for all potential configs.<br />' . 
 				'- Added new user_shout table for Sticky objects / shoutbox.<br />' . 
-				'- Added new playlist preferences, and new preference catagory of playlist.<br />';
+				'- Added new playlist preferences, and new preference catagory of playlist.<br />' . 
+				'- Tweaked Now Playing Table.<br />'; 
+
+		$version[] = array('version' => '340004','description' => $update_string); 
 
 		return $version;
 
@@ -685,6 +688,12 @@ class Update {
 		$sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; 
 		$db_results = Dba::query($sql); 
 
+		$sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; 
+		$db_results = Dba::query($sql); 
+
+		$sql = "OPTIMIZE TABLE `album`"; 
+		$db_results = Dba::query($sql); 
+
 		// Update our database version now that we are all done
 		self::set_version('db_version','340004'); 
 
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index ec404077..3955403e 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -32,11 +32,11 @@ function delete_now_playing($insert_id) {
         $user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 	// Account for WMP and the Flash Player
-	if (stristr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) { 
+//	if (stristr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) { 
                 // Commented out until I can figure out the
                 // trick to making this work
-                return true;
-        }
+//                return true;
+//        }
 
         // Remove the song from the now_playing table
         $sql = "DELETE FROM `now_playing` WHERE `id` = '$insert_id'";
@@ -54,16 +54,15 @@ function delete_now_playing($insert_id) {
 function gc_now_playing() { 
 
 	/* Account for WMP11's Initial Streaming */
-	if (strstr($_SERVER['HTTP_USER_AGENT'],"WMFSDK/11")) { return false; } 
+	//if (strstr($_SERVER['HTTP_USER_AGENT'],"WMFSDK/11")) { return false; } 
 
         $time 		= time();
-        $expire 	= $time - 3200;  // 86400 seconds = 1 day
 	$session_id	= Dba::escape($_REQUEST['sid']);
 	if (strlen($session_id)) { 
 		$session_sql = " OR session = '$session_id'";
 	}	
 
-        $sql = "DELETE FROM now_playing WHERE start_time < $expire" . $session_sql;
+        $sql = "DELETE FROM `now_playing` WHERE `expire` < '$time'" . $session_sql;
         $db_result = Dba::query($sql);
         
 } // gc_now_playing
@@ -73,33 +72,24 @@ function gc_now_playing() {
  * This function takes care of inserting the now playing data
  * we use this function because we need to do thing differently
  * depending upon which play is actually streaming
- * @package General
- * @catagory Now Playing
  */
 function insert_now_playing($song_id,$uid,$song_length) {
 
         $user_agent = $_SERVER['HTTP_USER_AGENT'];
-        $time = time();
+        $time = time()+$song_length;
+	$session_id = Dba::escape($_REQUEST['sid']); 
 
         /* Windows Media Player is evil and it makes multiple requests per song */
-        if (stristr($user_agent,"Windows-Media-Player")) { return false; }
+        if (stristr($user_agent,"Windows-Media-Player") || strstr($user_agent,"Audacious")) { $session_id = ' '; }
 
 	/* Check for Windows Media Player 11 */
-	if (strstr($user_agent,'NSPlayer/11') AND !strstr($user_agent,'WMFSDK/11')) { return false; } 
-
-        /* Set the Expire Time */
+	if (strstr($user_agent,'NSPlayer/11') AND !strstr($user_agent,'WMFSDK/11')) { $session_id = ' '; } 
 
         // If they are using Windows media player
-	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 	= Dba::escape($_REQUEST['sid']); 
-        }
-
-	/* Set expire time for worst case clean up */
-	$expire = $time;
+	if (strstr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) { $session_id = ' '; }
 
-        $sql = "INSERT INTO now_playing (`song_id`, `user`, `start_time`,`session`)" .
-                " VALUES ('$song_id', '$uid', '$expire','$session_id')";
+        $sql = "INSERT INTO now_playing (`song_id`, `user`, `expire`,`session`)" .
+                " VALUES ('$song_id', '$uid', '$time','$session_id')";
 
         $db_result = Dba::query($sql);
 
@@ -210,7 +200,7 @@ function start_downsample($song,$now_playing_id=0,$song_name=0) {
 	}
 
 
-	header("Content-Length: " . $sample_ratio*$song->size);
+	header("Content-Length: " . intval($sample_ratio*$song->size));
         $browser->downloadHeaders($song_name, $song->mime, false,$sample_ratio*$song->size);
 
         /* Get Offset */