* Added echo of pattern on print tags

* Tweaked headers on ajax page
* Fixed quick search box issues on browse by song
* Reverted to text for browse by albums
* Fixed some bad error handling on localplay

9 files changed, 38 insertions, 17 deletions

diff --git a/bin/print_tags.php.inc b/bin/print_tags.php.inc
index f6c03195..bba74bac 100644
--- a/bin/print_tags.php.inc
+++ b/bin/print_tags.php.inc
@@ -38,6 +38,7 @@ $results = mysql_fetch_assoc($db_results);
 $catalog = new Catalog($results['id']);
 
 $info = new vainfo($filename,'',$catalog->sort_pattern,$catalog->rename_pattern);
+echo "Using: $catalog->sort_pattern AND $catalog->rename_pattern for file pattern matching\n";
 $info->get_info();
 $results = $info->tags;
 $results['file'] = $filename;
diff --git a/browse.php b/browse.php
index 6309e2f6..d3602c94 100644
--- a/browse.php
+++ b/browse.php
@@ -120,7 +120,7 @@ switch($action) {
 	        show_alphabet_list('song_title','browse.php',$match,'song_title');
                 /* Detect if it's Browse, and if so don't fill it in */
                 if ($match == 'Browse') { $match = ''; }
-                show_alphabet_form($match,_('Show Titles Starting With'),"browse.php?action=song_title&match=$match");
+                show_alphabet_form($match,_('Show Titles Starting With'),"browse.php");
 		require (conf('prefix') . '/templates/show_box_bottom.inc.php');
 	
 		$sql = $song->get_sql_from_match($_REQUEST['match']);
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 662c0d4d..042e46ac 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,12 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.3.3-Beta3 
+  v.3.3.3-Beta3 01/04/2007 
+	- Fixed a few more unhandled mis-configurations of Localplay which
+		could cause PHP errors
+	- Fixed an issue with the Quick Jump box on Browse by Songs
+		(Thx Jru)
+	- Tweaked Headers passed for AJAX in an attempt to 'help' IE. 
   	- Last Database update before Stable
   	- Fixed a view issue introduced when sorting of the albums under
 		single artist view was added 
@@ -22,7 +27,7 @@
 	- Added potential fix for FastCGI installations
 	- Updated Snoopy to 1.2.3 (from manually patched 1.2.1) 
 	- Fixed sorting of Themes, now sorted by Alpha of theme name
-	- Fixed long standing Now Playing display in Classic Theme
+	- Fixed long standing Now Playing display issue in Classic Theme
 	- Fixed Now Playing to account for Windows Media Player 11s 
 		3 HTTP Requests per song stupidity
 	- Added ability to mass tag using play selected functionality
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index ba5c3c2a..8729b2df 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -80,7 +80,8 @@ class Localplay {
 		
 		if (!$include) { 
 			/* Throw Error Here */
-
+			debug_event('localplay','Unable to load ' . $this->type . ' controller','2');
+			return false; 
 		} // include
 		else { 
 			$class_name = "Ampache" . $this->type;
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 1f6f3fb5..c505b380 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -315,8 +315,18 @@ class Stream {
 	 */
 	function create_localplay() { 
 
-		$localplay = init_localplay();
-		$localplay->connect(); 
+		if (!$localplay = init_localplay()) { 
+			debug_event('localplay','Player failed to init on song add','3');
+			echo "Error: Localplay Init Failed check config";
+			return false; 
+		} 
+
+		if (!$localplay->connect()) { 
+			debug_event('localplay','Localplay Player Connect failed','3'); 
+			echo "Error: Localplay connect failed check config";
+			return false; 
+		} 
+
 		$localplay->add($this->songs);
 
 		/* Check for Support */ 
diff --git a/lib/init.php b/lib/init.php
index 5e96e204..ba0c06d9 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -67,7 +67,7 @@ if (!$results = read_config($configfile,0)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3-Beta3 (Build 003)';
+$results['version']		= '3.3.3-Beta3';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/server/ajax.server.php b/server/ajax.server.php
index caf8d55b..d0f19e99 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -35,7 +35,10 @@ $action = scrub_in($_REQUEST['action']);
 /* Set the correct headers */
 header("Content-type: text/xml; charset=" . conf('site_charset'));
 header("Content-Disposition: attachment; filename=ajax.xml");
-header("Cache-Control: no-cache");
+header("Expires Sun, 19 Nov 1978 05:00:00 GMT"); 
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Pragma: no-cache"); 
 
 switch ($action) { 
 	/* Controls Localplay */
diff --git a/templates/show_albums.inc b/templates/show_albums.inc
index 5787af2f..fa2b63ec 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc
@@ -57,21 +57,22 @@ foreach ($albums as $album) {
 			<td><?php echo $album->songs; ?></td>
 			<td><?php echo $album->year; ?></td>
 			<td nowrap="nowrap"> 
+			<?php echo _('Play'); ?>:
 			<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo get_user_icon('all'); ?>
-			</a> 
+				<?php echo _('All'); ?>
+			</a> |  
 			<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo get_user_icon('random'); ?>
-			</a> 
+				<?php echo _('Random'); ?>
+			</a> |
 			<?php if (batch_ok()) { ?>
 				<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>">
-				<?php echo get_user_icon('download'); ?>
-				</a>
+				<?php echo _('Download'); ?>
+				</a> |
 			<?php } ?>
 			<?php if ($GLOBALS['user']->has_access('50')) { ?>
 				<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_album&amp;album_id=<?php echo $album->id; ?>">
-				<?php echo get_user_icon('edit'); ?>
-				</a>
+				<?php echo _('Edit'); ?>
+				</a> | 
 			<?php } ?>
 			</td>
 	</tr>
diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php
index f7476bee..e8b149de 100644
--- a/templates/show_alphabet_form.inc.php
+++ b/templates/show_alphabet_form.inc.php
@@ -23,5 +23,5 @@
 <form style="display:inline;" name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data">
 	<label for="match" accesskey="S"><?php echo $text; ?></label> 
 	<input type="text" size="1" id="match" name="match" value="<?php echo $match; ?>" />
-	<input type="hidden" name="action" value="match" />
+	<input type="hidden" name="action" value="<?php echo scrub_out($_REQUEST['action']); ?>">
 </form>