From 67fd06887b1659569a6c2b61f2c700560bb71cd5 Mon Sep 17 00:00:00 2001
From: xgizzmo <xgizzmo@ampache>
Date: Wed, 1 Aug 2007 03:33:40 +0000
Subject: Replace references to old code with new code

---
 albums.php                          | 6 +++---
 lib/class/ajax.class.php            | 4 ++--
 templates/show_album_art.inc.php    | 5 +++--
 templates/show_artist.inc.php       | 4 ++--
 templates/show_get_albumart.inc.php | 4 +---
 templates/show_song_row.inc.php     | 2 +-
 templates/sidebar_home.inc.php      | 3 ++-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/albums.php b/albums.php
index ef5b0aa5..b3c43ca0 100644
--- a/albums.php
+++ b/albums.php
@@ -49,7 +49,7 @@ switch ($_REQUEST['action']) {
 		// If we got something back insert it
 		if ($image_data) { 
 			$album->insert_art($image_data,$_FILES['file']['type']);
-			show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $album->id);
+			show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&amp;album=" . $album->id);
 		} 
 		// Else it failed
 		else { 
@@ -77,7 +77,7 @@ switch ($_REQUEST['action']) {
 
 			if ($image_data) { 
 				$album->insert_art($image_data,$upload['0']['mime']); 
-				show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $_REQUEST['album_id']);
+				show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&amp;album=" . $_REQUEST['album_id']);
 				break;
 
 			} // if image data
@@ -152,7 +152,7 @@ switch ($_REQUEST['action']) {
 		$album->insert_art($image,$mime);
 
 
-		show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&album=$album_id");
+		show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&amp;album=$album_id");
 	break;
 	case 'update_from_tags':
 		// Make sure they are a 'power' user at least
diff --git a/lib/class/ajax.class.php b/lib/class/ajax.class.php
index cb734edf..b3d35f07 100644
--- a/lib/class/ajax.class.php
+++ b/lib/class/ajax.class.php
@@ -42,9 +42,9 @@ class Ajax {
 	 */
 	public static function observe($source,$method,$action) { 
 
-                $observe	= "<script type=\"text/javascript\">\n";
+                $observe	= "<script type=\"text/javascript\"><!--\n";
                 $observe	.= "\tEvent.observe('$source','$method',function(){" . $action . ";});\n";
-                $observe	.= "</script>\n";
+                $observe	.= "--></script>\n";
 
 		return $observe; 
 
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index 49e92809..dc7afc47 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -38,7 +38,7 @@ while ($i <= $rows) {
 ?>
 			<td align="center">
 				<a href="<?php echo $image_url; ?>" target="_blank">
-				<img src="<?php echo $image_url; ?>" border="0" height="175" width="175" /><br />
+				<img src="<?php echo $image_url; ?>" alt="Album Art" border="0" height="175" width="175" /><br />
 				</a>
 				<p align="center">
 				[<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
@@ -48,7 +48,8 @@ while ($i <= $rows) {
 		} // end else
 		$j++;
 	} // end while cells
-	echo "</tr>\n<tr>";
+	if($i < $rows) { echo "</tr>\n<tr>"; }
+        else { echo "</tr>"; }
 	$i++;
 } // end while
 ?>
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index 6756ae05..17558b42 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -42,10 +42,10 @@ foreach ($albums as $album_id) {
 <tr class="<?php echo flip_class(); ?>">
 	<td align="center">
                 <span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=album&amp;id=<?php echo $album->id; ?>');return true;" >
-        	        <?php echo get_user_icon('add','',_('Add')); ?>
+        	        <?php echo get_user_icon('add',_('Add')); ?>
                 </span>
                 <span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=album_random&amp;id=<?php echo $album->id; ?>');return true;" >
-	                <?php echo get_user_icon('random','',_('Random')); ?>
+	                <?php echo get_user_icon('random',_('Random')); ?>
 	        </span>
 	</td>
 	<td height="87">
diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php
index 7d2bd475..67335e14 100644
--- a/templates/show_get_albumart.inc.php
+++ b/templates/show_get_albumart.inc.php
@@ -21,10 +21,8 @@
 */
 ?>
 <?php show_box_top(_('Customize Search')); ?>
-<form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>&artist_name=<?php echo $_REQUEST['artist_name'];?>&album_name=<?php echo $_REQUEST['album_name']; ?>&cover=<?php echo scrub_out($_REQUEST['cover']); ?>" style="Display:inline;">
+<form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>&amp;artist_name=<?php echo $_REQUEST['artist_name'];?>&amp;album_name=<?php echo $_REQUEST['album_name']; ?>&amp;cover=<?php echo scrub_out($_REQUEST['cover']); ?>" style="Display:inline;">
 <table>
-<tr>
-</tr>
 <tr>
 	<td>
 		<?php echo _('Artist'); ?>&nbsp;
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index cc6668ec..350e0874 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -20,7 +20,7 @@
 */
 ?>
 <td>
-	<?php echo Ajax::button('?action=basket&atype=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?>
+	<?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?>
 </td>
 <td><?php echo $song->f_link; ?></td>
 <td><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 694fdc3c..24b0f0c0 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -13,6 +13,7 @@
         </form>
 </div>
 <hr />
+<?php /*
 <!-- RANDOM, Hidden for now cause its broken
 <h4><?php echo _('Random'); ?></h4>
 	<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/song.php?action=random&amp;method=stream" style="Display:inline">
@@ -42,7 +43,7 @@
         <input class="smallbutton" type="submit" value="<?php echo _('Enqueue'); ?>" />
 	</form>
 <hr />
--->
+--> */ ?>
 <h4><?php echo _('Playlists'); ?></h4>
 <span><a href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a></span>
 <hr />
-- 
cgit