Added classes to show_localplay_status.inc and updated all themes for compatibility.

Added show_object_rating_static.inc (supplied by andy90) and modified rating.lib for this to work
Removed obsolete patches from cleandy themes.
Fixed a tiny css bug in StoneBlue theme.
Fixed horizontal menu in Burgundy theme (explicit height in #sidebar li)

38 files changed, 225 insertions, 718 deletions

diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php
deleted file mode 100644
index 4d319f97..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php
+++ /dev/null
@@ -1,84 +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 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.
-
-*/
-
-$web_path = conf('web_path');
-show_duplicate_searchbox($search_type);
-
-if (count($flags)) { ?>
-	<?php show_box_top(_('Duplicate Songs')); ?>
-	<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable">
-	<table class="tabledata">
-	<tr class="table-header">
-		<td><?php echo _('Disable'); ?></td>
-		<td><?php echo _('Song'); ?></td>
-		<td><?php echo _('Artist'); ?></td>
-		<td><?php echo _('Album'); ?></td>
-		<td><?php echo _('Length'); ?></td>
-		<td><?php echo _('Bitrate'); ?></td>
-		<td><?php echo _('Size'); ?></td>
-		<td><?php echo _('Filename'); ?></td>
-	</tr>
-	<?php 
-	foreach ($flags as $flag) {
-		/* Build the Song */
-		$song = new Song($flag['song']);
-		$song->format_song();
-
-		// Set some extra vars
-		$alt_title = $song->title;
-		$formated_title = $song->f_title;
-		$artist = $song->f_artist;
-		$alt_artist = $song->f_full_artist;
-
-		// Gather the duplicates
-		$dinfolist = get_duplicate_info($song,$search_type,$_REQUEST['auto']);
-
-		// Set the current class, only changes once per set of duplicates
-		$current_class = flip_class(); 
-
-		foreach ($dinfolist as $key=>$dinfo) {
-			$check_txt = '';
-			if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } 
-			echo "<tr class=\"".$current_class."\">".
-			"<td><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>".
-			"<td><a href=\"$web_path/song.php?action=single_song&amp;song_id=$song->id\">".scrub_out($formated_title)."</a> </td>".
-			"<td><a href=\"$web_path/artists.php?action=show&amp;artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>".
-			"<td><a href=\"$web_path/albums.php?action=show&amp;album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>".
-			"<td>".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>".
-			"<td>".intval($dinfo['bitrate']/1000)."</td>".
-			"<td>".sprintf("%.2f", ($dinfo['size']/1048576))."MB</td>".
-			"<td><a href=\"file:////".$dinfo['file']."\">".$dinfo['file']."</a> </td>";
-//			"<td>".$dinfo['file']."</td>"; // original
-			echo "</tr>\n";
-		} // end foreach ($dinfolist as $dinfo)
-		
-	} // end foreach ($flags as $flag)
-	?>
-	<tr>
-		<td colspan="8" class="<?php echo flip_class(); ?>"><input type="submit" value="<?php echo _('Disable Songs'); ?>" /></td>
-	</tr>
-	</table>
-	</form>
-	<?php show_box_bottom(); ?>
-<?php  } else { ?>
-<p class="error"><?php echo _('No Records Found'); ?></p>
-<?php  } // end if ($flags) and else ?>
-
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php
deleted file mode 100644
index 93267dff..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php
+++ /dev/null
@@ -1,51 +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 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.
-
-*/
-
-/* Prepare the variables */
-$title = scrub_out(truncate_with_ellipse($song->title,'25'));
-$album = scrub_out(truncate_with_ellipse($song->f_album_full,'25'));
-$artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25'));
-
-?>
-<td class="np_cell_1"><b><?php echo _('Username'); ?></b>:<br><?php echo scrub_out($np_user->fullname); ?><!-- ##  modified ##-->
-	<div id="lp_box_ctrl">
- 		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
-	</div>
-    <b><?php echo _('Song'); ?></b><br /><a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
-        <?php echo $title; ?>
-    </a>
-    <?php if(conf('ratings')) { ?>
-        <br /><?php show_rating($song->id,'song'); ?>
-    <?php } ?>
-</td>
-<td class="np_cell_3">
-    <b><?php echo _('Artist'); ?></b><br /><a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
-        <?php echo $artist; ?>
-    </a><br /><br />
-    <b><?php echo _('Album'); ?></b><br /><a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
-        <?php echo $album; ?></a>
-</td>
-    <?php if (conf('show_album_art')) { ?>
-<td class="np_cell_4">
-    <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
-</td>
-<?php } // end play album art ?>
\ No newline at end of file
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_object_rating_static.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_object_rating_static.inc.php
deleted file mode 100644
index ce1d3356..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.2/ampache/templates/show_object_rating_static.inc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- Copyright 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 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.
-
-*/
-
-/* Create some variables we are going to need */
-$web_path = conf('web_path');
-$base_url = conf('ajax_url') . '?action=set_rating&amp;rating_type=' . $rating->type . '&amp;object_id=' . $rating->id . conf('ajax_info');
-
-
-//set the background to no stars
-echo "<ul class=\"star-rating\">\n";
-
-/* Handle the "Not rated" possibility */
-if ($rating->rating == '-1') {
-    echo "<li class=\"zero-stars\"></li>\n";
-}
-else {
-    echo "<li class=\"zero-stars\"></li>\n";
-}
-// decide width of rating. image is 16 px wide
-$width = $rating->rating*16;
-if ($width < 0) $width = 0;
-
-//set the current rating background
-echo "<li class=\"current-rating\" style=\"width:${width}px\" >Current rating: ";
-if ($rating->rating <= 0) {
-    echo "not rated yet </li>\n";
-}
-else echo "$rating->rating of 5</li>\n";
-
-//it did not like my "1-star", "2-star" ... css styles, and I changed it to this after I realized star1... would have worked :\
-?>
-<li>
-    <span class="one-stars" title="1 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="two-stars" title="2 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="three-stars" title="3 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="four-stars" title="4 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="five-stars" title="5 <?php echo _('out of'); ?> 5"></span>
-</li>
-</ul>
\ No newline at end of file
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/lib/rating.lib.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/lib/rating.lib.php
deleted file mode 100644
index 4830b165..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/lib/rating.lib.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
-
- Copyright 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.
-
-*/
-
-/**
- * show_rating
- * This takes an artist id and includes the right file
- */
-function show_rating($object_id,$type) { 
-
-	$rating = new Rating($object_id,$type);
-	
-	include(conf('prefix') . '/templates/show_object_rating.inc.php');
-
-} // show_rating
-
-//  patch by andy90
-function show_rating_static($object_id,$type) {
-
-    $rating = new Rating($object_id,$type);
-
-    include(conf('prefix') . '/templates/show_object_rating_static.inc.php');
-
-} // show_rating_static
-
-/**
- * get_rating_name
- * This takes a score and returns the name that we should use 
- */
-function get_rating_name($score) { 
-
-	switch ($score) { 
-		case '0':
-			return _("Don't Play");
-		break;
-		case '1':
-			return _("It's Pretty Bad");
-		break;
-		case '2':
-			return _("It's Ok");
-		break;
-		case '3':
-			return _("It's Pretty Good");
-		break;
-		case '4':
-			return _("I Love It!");
-		break;
-		case '5':
-			return _("It's Insane");
-		break;
-		// I'm fired
-		default:
-			return _("Off the Charts!");
-		break;
-	} // end switch
-
-	return true;
-	
-} // get_rating_name
-
-?>
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php
deleted file mode 100644
index 7a172a6d..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php
+++ /dev/null
@@ -1,65 +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.
-
-*/
-
-$web_path = conf('web_path'); 
-$localplay = init_localplay();
-
-$required_info 	= "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
-$ajax_url	= $web_path . '/server/ajax.server.php';
-$status		= $localplay->status();
-
-
-?>
-<span style="font-weight:bold;" id="lp_state"><?php echo $localplay->get_user_state($status['state']) ?></span><br />
-&nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span>
-<div class="lp_box_ctrl"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
-<div class="lp_box_vol">
-	<?php if ($localplay->has_function('volume_up')) { ?>
-	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumeup'); ?>
-	</span>
-	<?php } ?>
-	<?php if ($localplay->has_function('volume_down')) { ?>
-	<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumedn'); ?>
-	</span>
-	<?php } ?>
-	<?php if ($localplay->has_function('volume_mute')) { ?>
-	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumemute'); ?>
-	</span>
-	<?php } ?>&nbsp;
-	<?php echo _('Volume'); ?>:<span id="lp_volume"><?php echo $status['volume']; ?></span>
-</div>
-<br />
-<?php if ($localplay->has_function('repeat')) { ?>
-	<?php echo _('Repeat') . ":" . print_boolean($status['repeat']); ?> | 
-	<a href="<?php echo $web_path; ?>/localplay.php?action=repeat&amp;value=<?php echo invert_boolean($status['repeat']); ?>">
-		<?php echo print_boolean(invert_boolean($status['repeat'])); ?>
-	</a><br />
-	<?php } ?>
-<?php if ($localplay->has_function('random')) { ?>
-	<?php echo _('Random') . ":" . print_boolean($status['random']); ?> | 
-	<a href="<?php echo $web_path; ?>/localplay.php?action=random&amp;value=<?php echo invert_boolean($status['random']); ?>">
-		<?php echo print_boolean(invert_boolean($status['random'])); ?>
-	</a><br />
-<?php } ?>
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php
deleted file mode 100644
index 93267dff..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php
+++ /dev/null
@@ -1,51 +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 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.
-
-*/
-
-/* Prepare the variables */
-$title = scrub_out(truncate_with_ellipse($song->title,'25'));
-$album = scrub_out(truncate_with_ellipse($song->f_album_full,'25'));
-$artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25'));
-
-?>
-<td class="np_cell_1"><b><?php echo _('Username'); ?></b>:<br><?php echo scrub_out($np_user->fullname); ?><!-- ##  modified ##-->
-	<div id="lp_box_ctrl">
- 		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
-	</div>
-    <b><?php echo _('Song'); ?></b><br /><a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
-        <?php echo $title; ?>
-    </a>
-    <?php if(conf('ratings')) { ?>
-        <br /><?php show_rating($song->id,'song'); ?>
-    <?php } ?>
-</td>
-<td class="np_cell_3">
-    <b><?php echo _('Artist'); ?></b><br /><a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
-        <?php echo $artist; ?>
-    </a><br /><br />
-    <b><?php echo _('Album'); ?></b><br /><a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
-        <?php echo $album; ?></a>
-</td>
-    <?php if (conf('show_album_art')) { ?>
-<td class="np_cell_4">
-    <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
-</td>
-<?php } // end play album art ?>
\ No newline at end of file
diff --git a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_object_rating_static.inc.php b/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_object_rating_static.inc.php
deleted file mode 100644
index ce1d3356..00000000
--- a/contrib/themes/Cleandy-Peach/patch-3.3.3.3/ampache/templates/show_object_rating_static.inc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- Copyright 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 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.
-
-*/
-
-/* Create some variables we are going to need */
-$web_path = conf('web_path');
-$base_url = conf('ajax_url') . '?action=set_rating&amp;rating_type=' . $rating->type . '&amp;object_id=' . $rating->id . conf('ajax_info');
-
-
-//set the background to no stars
-echo "<ul class=\"star-rating\">\n";
-
-/* Handle the "Not rated" possibility */
-if ($rating->rating == '-1') {
-    echo "<li class=\"zero-stars\"></li>\n";
-}
-else {
-    echo "<li class=\"zero-stars\"></li>\n";
-}
-// decide width of rating. image is 16 px wide
-$width = $rating->rating*16;
-if ($width < 0) $width = 0;
-
-//set the current rating background
-echo "<li class=\"current-rating\" style=\"width:${width}px\" >Current rating: ";
-if ($rating->rating <= 0) {
-    echo "not rated yet </li>\n";
-}
-else echo "$rating->rating of 5</li>\n";
-
-//it did not like my "1-star", "2-star" ... css styles, and I changed it to this after I realized star1... would have worked :\
-?>
-<li>
-    <span class="one-stars" title="1 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="two-stars" title="2 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="three-stars" title="3 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="four-stars" title="4 <?php echo _('out of'); ?> 5"></span>
-</li>
-<li>
-    <span class="five-stars" title="5 <?php echo _('out of'); ?> 5"></span>
-</li>
-</ul>
\ No newline at end of file
diff --git a/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php b/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php
deleted file mode 100644
index 4d319f97..00000000
--- a/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_list_duplicates.inc.php
+++ /dev/null
@@ -1,84 +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 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.
-
-*/
-
-$web_path = conf('web_path');
-show_duplicate_searchbox($search_type);
-
-if (count($flags)) { ?>
-	<?php show_box_top(_('Duplicate Songs')); ?>
-	<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable">
-	<table class="tabledata">
-	<tr class="table-header">
-		<td><?php echo _('Disable'); ?></td>
-		<td><?php echo _('Song'); ?></td>
-		<td><?php echo _('Artist'); ?></td>
-		<td><?php echo _('Album'); ?></td>
-		<td><?php echo _('Length'); ?></td>
-		<td><?php echo _('Bitrate'); ?></td>
-		<td><?php echo _('Size'); ?></td>
-		<td><?php echo _('Filename'); ?></td>
-	</tr>
-	<?php 
-	foreach ($flags as $flag) {
-		/* Build the Song */
-		$song = new Song($flag['song']);
-		$song->format_song();
-
-		// Set some extra vars
-		$alt_title = $song->title;
-		$formated_title = $song->f_title;
-		$artist = $song->f_artist;
-		$alt_artist = $song->f_full_artist;
-
-		// Gather the duplicates
-		$dinfolist = get_duplicate_info($song,$search_type,$_REQUEST['auto']);
-
-		// Set the current class, only changes once per set of duplicates
-		$current_class = flip_class(); 
-
-		foreach ($dinfolist as $key=>$dinfo) {
-			$check_txt = '';
-			if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } 
-			echo "<tr class=\"".$current_class."\">".
-			"<td><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>".
-			"<td><a href=\"$web_path/song.php?action=single_song&amp;song_id=$song->id\">".scrub_out($formated_title)."</a> </td>".
-			"<td><a href=\"$web_path/artists.php?action=show&amp;artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>".
-			"<td><a href=\"$web_path/albums.php?action=show&amp;album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>".
-			"<td>".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>".
-			"<td>".intval($dinfo['bitrate']/1000)."</td>".
-			"<td>".sprintf("%.2f", ($dinfo['size']/1048576))."MB</td>".
-			"<td><a href=\"file:////".$dinfo['file']."\">".$dinfo['file']."</a> </td>";
-//			"<td>".$dinfo['file']."</td>"; // original
-			echo "</tr>\n";
-		} // end foreach ($dinfolist as $dinfo)
-		
-	} // end foreach ($flags as $flag)
-	?>
-	<tr>
-		<td colspan="8" class="<?php echo flip_class(); ?>"><input type="submit" value="<?php echo _('Disable Songs'); ?>" /></td>
-	</tr>
-	</table>
-	</form>
-	<?php show_box_bottom(); ?>
-<?php  } else { ?>
-<p class="error"><?php echo _('No Records Found'); ?></p>
-<?php  } // end if ($flags) and else ?>
-
diff --git a/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php b/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php
deleted file mode 100644
index 93267dff..00000000
--- a/contrib/themes/Cleandy/patch-3.3.3.2/ampache/templates/show_now_playing_row.inc.php
+++ /dev/null
@@ -1,51 +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 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.
-
-*/
-
-/* Prepare the variables */
-$title = scrub_out(truncate_with_ellipse($song->title,'25'));
-$album = scrub_out(truncate_with_ellipse($song->f_album_full,'25'));
-$artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25'));
-
-?>
-<td class="np_cell_1"><b><?php echo _('Username'); ?></b>:<br><?php echo scrub_out($np_user->fullname); ?><!-- ##  modified ##-->
-	<div id="lp_box_ctrl">
- 		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
-	</div>
-    <b><?php echo _('Song'); ?></b><br /><a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
-        <?php echo $title; ?>
-    </a>
-    <?php if(conf('ratings')) { ?>
-        <br /><?php show_rating($song->id,'song'); ?>
-    <?php } ?>
-</td>
-<td class="np_cell_3">
-    <b><?php echo _('Artist'); ?></b><br /><a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
-        <?php echo $artist; ?>
-    </a><br /><br />
-    <b><?php echo _('Album'); ?></b><br /><a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
-        <?php echo $album; ?></a>
-</td>
-    <?php if (conf('show_album_art')) { ?>
-<td class="np_cell_4">
-    <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
-</td>
-<?php } // end play album art ?>
\ No newline at end of file
diff --git a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/lib/rating.lib.php b/contrib/themes/Cleandy/patch-3.3.3.3/ampache/lib/rating.lib.php
index 4830b165..118efc4d 100644
--- a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/lib/rating.lib.php
+++ b/contrib/themes/Cleandy/patch-3.3.3.3/ampache/lib/rating.lib.php
@@ -27,11 +27,11 @@ function show_rating($object_id,$type) {
 
 	$rating = new Rating($object_id,$type);
 	
-	include(conf('prefix') . '/templates/show_object_rating.inc.php');
+	require Config::get('prefix') . '/templates/show_object_rating.inc.php';
 
 } // show_rating
 
-//  patch by andy90
+//  andy90s rating patch added
 function show_rating_static($object_id,$type) {
 
     $rating = new Rating($object_id,$type);
diff --git a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php b/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php
deleted file mode 100644
index 7a172a6d..00000000
--- a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_localplay_status.inc.php
+++ /dev/null
@@ -1,65 +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.
-
-*/
-
-$web_path = conf('web_path'); 
-$localplay = init_localplay();
-
-$required_info 	= "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
-$ajax_url	= $web_path . '/server/ajax.server.php';
-$status		= $localplay->status();
-
-
-?>
-<span style="font-weight:bold;" id="lp_state"><?php echo $localplay->get_user_state($status['state']) ?></span><br />
-&nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span>
-<div class="lp_box_ctrl"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
-<div class="lp_box_vol">
-	<?php if ($localplay->has_function('volume_up')) { ?>
-	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumeup'); ?>
-	</span>
-	<?php } ?>
-	<?php if ($localplay->has_function('volume_down')) { ?>
-	<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumedn'); ?>
-	</span>
-	<?php } ?>
-	<?php if ($localplay->has_function('volume_mute')) { ?>
-	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
-		<?php echo get_user_icon('volumemute'); ?>
-	</span>
-	<?php } ?>&nbsp;
-	<?php echo _('Volume'); ?>:<span id="lp_volume"><?php echo $status['volume']; ?></span>
-</div>
-<br />
-<?php if ($localplay->has_function('repeat')) { ?>
-	<?php echo _('Repeat') . ":" . print_boolean($status['repeat']); ?> | 
-	<a href="<?php echo $web_path; ?>/localplay.php?action=repeat&amp;value=<?php echo invert_boolean($status['repeat']); ?>">
-		<?php echo print_boolean(invert_boolean($status['repeat'])); ?>
-	</a><br />
-	<?php } ?>
-<?php if ($localplay->has_function('random')) { ?>
-	<?php echo _('Random') . ":" . print_boolean($status['random']); ?> | 
-	<a href="<?php echo $web_path; ?>/localplay.php?action=random&amp;value=<?php echo invert_boolean($status['random']); ?>">
-		<?php echo print_boolean(invert_boolean($status['random'])); ?>
-	</a><br />
-<?php } ?>
diff --git a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php b/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php
deleted file mode 100644
index 93267dff..00000000
--- a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_now_playing_row.inc.php
+++ /dev/null
@@ -1,51 +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 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.
-
-*/
-
-/* Prepare the variables */
-$title = scrub_out(truncate_with_ellipse($song->title,'25'));
-$album = scrub_out(truncate_with_ellipse($song->f_album_full,'25'));
-$artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25'));
-
-?>
-<td class="np_cell_1"><b><?php echo _('Username'); ?></b>:<br><?php echo scrub_out($np_user->fullname); ?><!-- ##  modified ##-->
-	<div id="lp_box_ctrl">
- 		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
-	</div>
-    <b><?php echo _('Song'); ?></b><br /><a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
-        <?php echo $title; ?>
-    </a>
-    <?php if(conf('ratings')) { ?>
-        <br /><?php show_rating($song->id,'song'); ?>
-    <?php } ?>
-</td>
-<td class="np_cell_3">
-    <b><?php echo _('Artist'); ?></b><br /><a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
-        <?php echo $artist; ?>
-    </a><br /><br />
-    <b><?php echo _('Album'); ?></b><br /><a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
-        <?php echo $album; ?></a>
-</td>
-    <?php if (conf('show_album_art')) { ?>
-<td class="np_cell_4">
-    <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
-</td>
-<?php } // end play album art ?>
\ No newline at end of file
diff --git a/contrib/themes/Green-Marble/templates/default.css b/contrib/themes/Green-Marble/templates/default.css
index 1a99ca77..6351b486 100644
--- a/contrib/themes/Green-Marble/templates/default.css
+++ b/contrib/themes/Green-Marble/templates/default.css
@@ -591,6 +591,14 @@ table.tabledata {}
 .display {}
 
 
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
 
 
 	
diff --git a/contrib/themes/Greysme/templates/default.css b/contrib/themes/Greysme/templates/default.css
index eac3d4c6..b0bdcd62 100644
--- a/contrib/themes/Greysme/templates/default.css
+++ b/contrib/themes/Greysme/templates/default.css
@@ -784,3 +784,12 @@ table.tabledata {width:100%}
 

 #maincontainer{}

 

+

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

+}
\ No newline at end of file
diff --git a/contrib/themes/IL01/templates/default.css b/contrib/themes/IL01/templates/default.css
index 958c9cad..5460b129 100644
--- a/contrib/themes/IL01/templates/default.css
+++ b/contrib/themes/IL01/templates/default.css
@@ -522,3 +522,12 @@ margin-right:5em;
         border-bottom: 1px solid #000000;
 }
 
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/contrib/themes/INHOLLAND/templates/default.css b/contrib/themes/INHOLLAND/templates/default.css
index 66fc3657..f0c298df 100644
--- a/contrib/themes/INHOLLAND/templates/default.css
+++ b/contrib/themes/INHOLLAND/templates/default.css
@@ -714,3 +714,12 @@ li.current-rating{
         z-index: 1;
 }
 
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/contrib/themes/Spiffy/templates/default.css b/contrib/themes/Spiffy/templates/default.css
index 64fa32bd..96e3fffc 100644
--- a/contrib/themes/Spiffy/templates/default.css
+++ b/contrib/themes/Spiffy/templates/default.css
@@ -544,4 +544,12 @@ margin-right:5em;
         border-color: #000000;
         border-bottom: 1px solid #000000;
 }
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
 
diff --git a/contrib/themes/StoneBlue/templates/default.css b/contrib/themes/StoneBlue/templates/default.css
index 3835eb6f..ab9ce5dd 100644
--- a/contrib/themes/StoneBlue/templates/default.css
+++ b/contrib/themes/StoneBlue/templates/default.css
@@ -339,6 +339,14 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
     }

 .np_cell, .np_cell_left, .np_cell_m, .np_cell_right {

 }

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

+}

 /**

  * End Div Definitions

  * This is the end of the main structure def's

diff --git a/contrib/themes/Supernova/templates/default.css b/contrib/themes/Supernova/templates/default.css
index 0bf5135d..ab681ed1 100644
--- a/contrib/themes/Supernova/templates/default.css
+++ b/contrib/themes/Supernova/templates/default.css
@@ -526,4 +526,12 @@ margin-right:5em;
         border-color: #BBBBBB;
         border-bottom: 1px solid #BBBBBB;
 }
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
 
diff --git a/contrib/themes/apex/templates/default.css b/contrib/themes/apex/templates/default.css
index df2ccdf9..f60f3eb6 100644
--- a/contrib/themes/apex/templates/default.css
+++ b/contrib/themes/apex/templates/default.css
@@ -570,3 +570,13 @@ margin-right:5em;
 	border-left:4px solid #B21542;

 	border-top:4px solid #B21542;		

 }

+

+

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

+}
\ No newline at end of file
diff --git a/contrib/themes/aphelion/templates/default.css b/contrib/themes/aphelion/templates/default.css
index 8e318462..983edc2d 100644
--- a/contrib/themes/aphelion/templates/default.css
+++ b/contrib/themes/aphelion/templates/default.css
@@ -393,4 +393,14 @@ hr {
 }

 .loginp_1 input {

 	border:1px solid #999;

+}

+

+

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

 }
\ No newline at end of file
diff --git a/contrib/themes/apogee/templates/default.css b/contrib/themes/apogee/templates/default.css
index 655becaf..e548757d 100644
--- a/contrib/themes/apogee/templates/default.css
+++ b/contrib/themes/apogee/templates/default.css
@@ -397,4 +397,14 @@ div#sidebar {
 }

 .loginp_1 input {

 	border:1px solid #999;

+}

+

+

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

 }
\ No newline at end of file
diff --git a/contrib/themes/dark/templates/default.css b/contrib/themes/dark/templates/default.css
index 7bfae8dc..8bd7d8e1 100644
--- a/contrib/themes/dark/templates/default.css
+++ b/contrib/themes/dark/templates/default.css
@@ -529,3 +529,12 @@ margin-right:5em;
         border-bottom: 1px solid #606060;
 }
 
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/contrib/themes/eGurl/templates/default.css b/contrib/themes/eGurl/templates/default.css
index a76a3342..fbdec08d 100644
--- a/contrib/themes/eGurl/templates/default.css
+++ b/contrib/themes/eGurl/templates/default.css
@@ -514,3 +514,12 @@ margin-right:5em;
         border-bottom: 1px solid #B21542;
 }
 
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/contrib/themes/empires/templates/default.css b/contrib/themes/empires/templates/default.css
index 3bdbf924..a5c75dbe 100644
--- a/contrib/themes/empires/templates/default.css
+++ b/contrib/themes/empires/templates/default.css
@@ -692,4 +692,14 @@ td.user_offline {
 }
 td.user_disabled {
 	background:#999999;
+}
+
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
 }
\ No newline at end of file
diff --git a/contrib/themes/exterminal/templates/default.css b/contrib/themes/exterminal/templates/default.css
index e9b035d3..15157f81 100644
--- a/contrib/themes/exterminal/templates/default.css
+++ b/contrib/themes/exterminal/templates/default.css
@@ -690,4 +690,14 @@ td.user_offline {
 }
 td.user_disabled {
 	background:#999999;
+}
+
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
 }
\ No newline at end of file
diff --git a/contrib/themes/exterminal_exhibitA/templates/default.css b/contrib/themes/exterminal_exhibitA/templates/default.css
index 4f23b18b..c316d12f 100644
--- a/contrib/themes/exterminal_exhibitA/templates/default.css
+++ b/contrib/themes/exterminal_exhibitA/templates/default.css
@@ -689,4 +689,14 @@ td.user_offline {
 }
 td.user_disabled {
 	background:#999999;
+}
+
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
 }
\ No newline at end of file
diff --git a/contrib/themes/klassikiosk/templates/default.css b/contrib/themes/klassikiosk/templates/default.css
index c3cc3474..f9f876fc 100644
--- a/contrib/themes/klassikiosk/templates/default.css
+++ b/contrib/themes/klassikiosk/templates/default.css
@@ -635,6 +635,14 @@ table.tabledata {}
 

 

 

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

+}

 

 	

 

diff --git a/contrib/themes/simple_h/templates/default.css b/contrib/themes/simple_h/templates/default.css
index 60ee4d99..63dcfbf3 100644
--- a/contrib/themes/simple_h/templates/default.css
+++ b/contrib/themes/simple_h/templates/default.css
@@ -616,3 +616,13 @@ td.user_offline {
 td.user_disabled {
 	background:#999999;
 }
+
+
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/contrib/themes/steel/templates/default.css b/contrib/themes/steel/templates/default.css
index d4f73ef5..573684bb 100644
--- a/contrib/themes/steel/templates/default.css
+++ b/contrib/themes/steel/templates/default.css
@@ -217,4 +217,12 @@ textarea
 }
 
 .np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
+}
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
 }
\ No newline at end of file
diff --git a/contrib/themes/tangens/templates/default.css b/contrib/themes/tangens/templates/default.css
index 857ce75e..b077d37b 100644
--- a/contrib/themes/tangens/templates/default.css
+++ b/contrib/themes/tangens/templates/default.css
@@ -354,5 +354,13 @@ li.current-rating{
 

 .np_cell, .np_cell_left, .np_cell_m, .np_cell_right {

 }

+.lp_box_ctrl {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-top: 5px; */

+}

+.lp_box_vol {

+	text-align: center; /*for compatibility, may be controlled by themers now*/

+/* 	padding-left: 7px; */

+}

 -->

 </style>

diff --git a/contrib/themes/white_amps/templates/default.css b/contrib/themes/white_amps/templates/default.css
index eb620176..6b5a2c39 100755
--- a/contrib/themes/white_amps/templates/default.css
+++ b/contrib/themes/white_amps/templates/default.css
@@ -433,6 +433,14 @@
 		}
 .np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
 }
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
 -->
 </style>
 
diff --git a/lib/rating.lib.php b/lib/rating.lib.php
index 8dee7c8e..118efc4d 100644
--- a/lib/rating.lib.php
+++ b/lib/rating.lib.php
@@ -31,6 +31,15 @@ function show_rating($object_id,$type) {
 
 } // show_rating
 
+//  andy90s rating patch added
+function show_rating_static($object_id,$type) {
+
+    $rating = new Rating($object_id,$type);
+
+    include(conf('prefix') . '/templates/show_object_rating_static.inc.php');
+
+} // show_rating_static
+
 /**
  * get_rating_name
  * This takes a score and returns the name that we should use 
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index 7073db82..7a172a6d 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -30,9 +30,9 @@ $status		= $localplay->status();
 
 ?>
 <span style="font-weight:bold;" id="lp_state"><?php echo $localplay->get_user_state($status['state']) ?></span><br />
-&nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span><br />
-<div align="center"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
-<div align="center">
+&nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span>
+<div class="lp_box_ctrl"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
+<div class="lp_box_vol">
 	<?php if ($localplay->has_function('volume_up')) { ?>
 	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
 		<?php echo get_user_icon('volumeup'); ?>
@@ -47,8 +47,7 @@ $status		= $localplay->status();
 	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
 		<?php echo get_user_icon('volumemute'); ?>
 	</span>
-	<?php } ?>
-	<br />
+	<?php } ?>&nbsp;
 	<?php echo _('Volume'); ?>:<span id="lp_volume"><?php echo $status['volume']; ?></span>
 </div>
 <br />
diff --git a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_object_rating_static.inc.php b/templates/show_object_rating_static.inc.php
index ce1d3356..47c7d57e 100644
--- a/contrib/themes/Cleandy/patch-3.3.3.3/ampache/templates/show_object_rating_static.inc.php
+++ b/templates/show_object_rating_static.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- Copyright 2001 - 2006 Ampache.org
+ Copyright 2001 - 2007 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff --git a/themes/burgundy/templates/default.css b/themes/burgundy/templates/default.css
index c9d337ed..348651a4 100644
--- a/themes/burgundy/templates/default.css
+++ b/themes/burgundy/templates/default.css
@@ -293,6 +293,7 @@ div#Header{
     position: relative;
     width: 12em;
     width: /**/10.5em; /* Only IE5.5 can't see this */
+    height: 12px; /*fixed by the_foster*/
     margin: 0;
     padding: .5em 0 .5em 1em;
     border-bottom: 1px solid #8B8B8B;
@@ -483,7 +484,7 @@ margin-right:5em;
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
-.np_cell {
+.np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
 	margin: 10px;
 }
 #tablist {
@@ -612,3 +613,11 @@ li.current-rating{
         z-index: 1;
 }
 
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css
index 6d4d2992..05a7329c 100644
--- a/themes/classic/templates/default.css
+++ b/themes/classic/templates/default.css
@@ -311,7 +311,7 @@ h3#content_title span {
 .np_row {
 	padding: 3px 0;
 }
-.np_cell {
+.np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
 	margin: 10px;
 }
 
@@ -648,3 +648,11 @@ table.tabledata {}
 .display {}
 
 
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file
diff --git a/themes/greyblock/templates/default.css b/themes/greyblock/templates/default.css
index 8e1bb4f2..6869f7a6 100644
--- a/themes/greyblock/templates/default.css
+++ b/themes/greyblock/templates/default.css
@@ -418,3 +418,14 @@ li.current-rating{
         z-index: 1;
 }
 
+
+.np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
+}
+.lp_box_ctrl {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-top: 5px; */
+}
+.lp_box_vol {
+	text-align: center; /*for compatibility, may be controlled by themers now*/
+/* 	padding-left: 7px; */
+}
\ No newline at end of file