few minor fixes including a XML-RPC fix

5 files changed, 31 insertions, 19 deletions

diff --git a/templates/header.inc b/templates/header.inc
index 2168a293..d1ada535 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -65,9 +65,6 @@ if (conf('use_rss')) { ?>
 	</div><!-- End topbar -->
 	<div id="sidebar"><!-- This is the sidebar -->
 		<?php require_once(conf('prefix') . '/templates/sidebar.inc.php'); ?>
-		<?php if ($localplay = init_localplay()) { ?>
-		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
-		<?php } ?>
 	</div><!-- End sidebar -->
 	<div id="content">
 <!-- I hate IE... --> 
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index 8816937c..c8ecb222 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -23,7 +23,6 @@ $web_path = conf('web_path');
 /* Flagged Information Gathering */
 $flag = new Flag();
 $flagged	= $flag->get_recent(10);
-$total_flagged	= $flag->get_total();
 
 /* Disabled Information Gathering */
 $catalog = new Catalog(); 
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index b604ae32..b68c8631 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -25,7 +25,7 @@ $catalogs 	= $catalog->get_catalogs();
 
 ?>
 <?php show_box_top(_('Catalogs')); ?>
-<table border="0" cellpadding="0" cellspacing="0">
+<table class="tabledata" cellpadding="0" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Name'); ?></th>
 	<th align="center"><?php echo _('Action'); ?></th>
@@ -50,6 +50,14 @@ $catalogs 	= $catalog->get_catalogs();
 		<?php echo _('Delete'); ?></a>
 	</td>
 </tr>
+<!--
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="2">
+		<?php echo _('Fast'); ?><input type="checkbox" name="fast" value="1" />
+		<?php echo _('Gather Art'); ?><input type="checkbox" name="gather_art" value="1" />
+	</td>
+</tr>
+-->
 <?php } // end foreach ?>
 <?php if (!count($catalogs)) { ?>
 <tr>
@@ -74,10 +82,8 @@ $catalogs 	= $catalog->get_catalogs();
 <div class="text-action">
 	<a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a>
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a>
-	<hr noshade="noshade" size="3" />
 	<a href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a>
 	<a href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo _('Preferences Permissions'); ?></a>
-	<hr noshade="noshade" size="3" />
 	<a href="<?php echo $web_path; ?>/admin/system.php?action=export&amp;export=itunes"><?php echo _('Export To Itunes DB'); ?></a>
 <!--	<a href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>-->
 </div>
diff --git a/templates/show_disabled_songs.inc b/templates/show_disabled_songs.inc
index 61a47b3d..0c592777 100644
--- a/templates/show_disabled_songs.inc
+++ b/templates/show_disabled_songs.inc
@@ -44,8 +44,11 @@
 		<td colspan="7"><span class="error"><?php echo _('No Records Found'); ?></span></td>
 	</tr>
 <?php } ?>
-</table>
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="7">
 		<input class="button" type="submit" value="<?php echo _('Remove'); ?>" />&nbsp;&nbsp;
 		<input type="hidden" name="action" value="remove_disabled" />
+	</td>
+</tr>
+</table>
 </form>
-
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index 4d65d8ac..06873ecb 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -21,8 +21,10 @@
 
 $web_path = conf('web_path');
 ?>
+<form id="songs" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=reject_flags">
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr class="table-header">
+	<th><a href="#" onclick="check_songs(); return false;"><?php echo _('Select'); ?></a></th>
 	<th><?php echo _('Object'); ?></th>
 	<th><?php echo _('Flag'); ?></th>
 	<th><?php echo _('Status'); ?></th>
@@ -30,33 +32,38 @@ $web_path = conf('web_path');
 </tr>
 <?php foreach ($flagged as $data) { $flag = new Flag($data); ?>
 <tr class="<?php echo flip_class(); ?>">
+	<td align="center">
+		<input type="checkbox" name="song[]" value="<?php echo $flag->id; ?>" id="song_<?php echo $flag->id; ?>" />
+	</td>
 	<td><?php $flag->print_name(); ?></td>
 	<td><?php $flag->print_flag(); ?></td>
 	<td><?php $flag->print_status(); ?></td>
-	<td>
+	<td align="center">
 	<?php if ($flag->approved) { ?>
 		<a href="<?php echo $web_path; ?>/admin/flag.php?action=reject_flag&amp;flag_id=<?php echo $flag->id; ?>">
-			<?php echo _('Reject'); ?>
+			<?php echo get_user_icon('disable'); ?>
 		</a>
 	<?php } else { ?>
 		<a href="<?php echo $web_path; ?>/admin/flag.php?action=approve_flag&amp;flag_id=<?php echo $flag->id; ?>">
-			<?php echo _('Approve'); ?>
+			<?php echo get_user_icon('enable'); ?>
 		</a>
 	<?php } ?>
 	</td>
 </tr>
 <?php } if (!count($flagged)) { ?>
 <tr class="<?php echo flip_class(); ?>">
-	<td colspan="4" class="error"><?php echo _('No Records Found'); ?></td>
+	<td colspan="5" class="error"><?php echo _('No Records Found'); ?></td>
 </tr>
 <?php } ?>
-<?php if ($total_flagged > count($flagged)) { ?>
 <tr class="<?php echo flip_class(); ?>">
-	<td colspan="4">
-		<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged">
-			<?php echo _('Show All'); ?>...
-		</a>
+	<td colspan="5">
+		<input class="button" type="submit" value="<?php echo _('Update'); ?>" />
 	</td>
 </tr>
-<?php } ?>
 </table>
+</form>
+<div class="text-action">
+<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged">
+	<?php echo _('Show All'); ?>...
+</a>
+</div>