moved search to upper right, removed the playlists from the left menubar, fixed a potential uncaught exception on id3 tags

8 files changed, 41 insertions, 91 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 7d257840..c854af74 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,9 @@
 
 --------------------------------------------------------------------------
   v.3.4-Alpha2 
+	- Moved Quick search to the top, right appears on every page
+	- Fixed an issue with reading id3tags causing a uncaught exception
+		due to direct reference to getid3() 
   	- Added check on clean to see if Root path is readable, if not
 		stop clean (mount point failures) 
   	- Fixed now playing, hopefully once and for all
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 02da0a10..b72633e3 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -326,7 +326,10 @@ class Album {
 			$song = new Song($song_id); 
 			// If we find a good one, stop looking
 		        $getID3 = new getID3();
-		        $id3 = $getID3->analyze($song->file);
+			try { $id3 = $getID3->analyze($song->file); } 
+			catch (Exception $error) { 
+				debug_event('getid3',$error->message,'1'); 
+			} 
 
 			if ($id3['format_name'] == "WMA") { 
 				$image = $id3['asf']['extended_content_description_object']['content_descriptors']['13'];
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index c7197054..7e3904c0 100755
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -98,7 +98,7 @@ class vainfo {
 		/* Figure out what type of file we are dealing with */
 		$this->type = $this->_get_type();
 
-		/* This is very important, figure out th encoding of the
+		/* This is very important, figure out the encoding of the
 		 * file 
 		 */
 		$this->_set_encoding();
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 2b802178..844ff186 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -67,7 +67,7 @@ if (Config::get('use_rss')) { ?>
 		<div id="topbarright">
 			<?php show_box_top(); ?>
 			<b><?php echo _('You are currently logged in as') . " " . $GLOBALS['user']->fullname; ?></b>
-			<div id="topbar-playlist"><?php require_once Config::get('prefix') . '/templates/show_playlist_bar.inc.php'; ?></div>
+			<?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?>
 			<?php show_box_bottom(); ?>
 		</div> <!-- End topbarright -->
 	</div><!-- End topbar -->
diff --git a/templates/show_playlist_bar.inc.php b/templates/show_playlist_bar.inc.php
deleted file mode 100644
index b2eac864..00000000
--- a/templates/show_playlist_bar.inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2007 Ampache.org
- All rights reserved.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License v2
- as published by the Free Software Foundation. 
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// Get the count of the number of items in their playlist
-?>
-<div>
-	<?php echo __('There are currently %count% items in your playlist','%count%',$GLOBALS['user']->playlist->count_items()); ?>
-</div>
diff --git a/templates/show_search_bar.inc b/templates/show_search_bar.inc
deleted file mode 100644
index 0e82f0a7..00000000
--- a/templates/show_search_bar.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2006 Ampache.org
- All rights reserved.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-?>
-<form name="search" method="post" action="<?php echo conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
-<table class="tabledata" cellspacing="0" cellpadding="3" border="0" style="clear:both;" width="100%">
-<tr class="table-header">
-	<td colspan="4"><b><?php echo  _('Search Ampache'); ?>...</b></td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><input type="text" name="search_string" value="<?php echo  scrub_out($_REQUEST['search_string']); ?>" /></td>
-	<td>
-		<input class="button" type="submit" value="<?php echo  _('Search'); ; ?>" />&nbsp;&nbsp;
-		<input type="hidden" name="action" value="quick_search" />
-		<input type="hidden" name="method" value="fuzzy" />
-		<input type="hidden" name="object_type" value="song" />
-		<input type="hidden" name="search_object[]" value="all" />
-	</td>
-</tr>
-</table>
-</form>
-<script language="JavaScript" type="text/javascript"> document.search.search_string.focus(); </script>
diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php
new file mode 100644
index 00000000..b9b2c94c
--- /dev/null
+++ b/templates/show_search_bar.inc.php
@@ -0,0 +1,32 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2007 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; version 2
+ of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+<div id="sb_Subsearch">
+        <form name="search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline">
+        <input type="text" name="search_string" value="" size="5" />
+        <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" />
+        <input type="hidden" name="action" value="quick_search" />
+        <input type="hidden" name="method" value="fuzzy" />
+        <input type="hidden" name="object_type" value="song" />
+        </form>
+</div>
+
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 338b5cb2..a79bda37 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -5,16 +5,6 @@
 <li id="sb_Info_AddStationRadio"><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></li>
 </ul>
 <hr />
-<div id="sb_Subsearch">
-	<form name="search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline">
-        <input type="text" name="search_string" value="" size="5" />
-        <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" />
-        <input type="hidden" name="action" value="quick_search" />
-        <input type="hidden" name="method" value="fuzzy" />
-        <input type="hidden" name="object_type" value="song" />
-        </form>
-</div>
-<hr />
 <?php /*
 <!-- RANDOM, Hidden for now cause its broken
 <h4><?php echo _('Random'); ?></h4>
@@ -49,16 +39,3 @@
 <h4><?php echo _('Playlists'); ?></h4>
 <a id="sb_ViewAll" href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a>
 <hr />
-<div style="left-padding:5px;">
-<?php 
-	$playlists = Playlist::get_users($GLOBALS['user']->id); 
-	foreach ($playlists as $playlist_id) { 
-		$playlist = new Playlist($playlist_id); 
-		$playlist->format(); 
-?>
-<span>
-	<?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist_id,'all',_('Play This Playlist'),'leftbar_playlist_' . $playlist_id); ?>
-	<?php echo $playlist->f_link; ?>
-</span>
-<?php } // end foreach playlist ?>
-</div>