genre... we dont need no stinking genre.. we need them genreS fools

4 files changed, 25 insertions, 21 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 171e7745..5faa77ce 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -2178,7 +2178,7 @@ class Catalog {
 		$this->clean_stats();
 		$this->clean_playlists();
 		$this->clean_flagged();
-		$this->clean_genre();
+		$this->clean_genres();
 
 	} // delete_catalog
 
diff --git a/lib/general.js b/lib/general.js
index 21db395e..9eebe02b 100644
--- a/lib/general.js
+++ b/lib/general.js
@@ -270,6 +270,14 @@ function update_txt(value,field) {
 	document.getElementById(field).innerHTML=value;
 }
 
+// SubmitToPage this function specificaly submits the form to the specified page
+function SubmitToPage(form_id,action) { 
+
+	document.getElementById(form_id).action = action;
+	document.getElementById(form_id).submit();
+	return true;
+} 
+
 function popup_art(url) {
         var newwindow;
         newwindow=window.open(url, "ampache_art", "menubar=no,toolbar=no,location=no,directories=no");
diff --git a/templates/show_admin_catalog.inc.php b/templates/show_admin_catalog.inc.php
index 5db5f9ed..9bbbf504 100644
--- a/templates/show_admin_catalog.inc.php
+++ b/templates/show_admin_catalog.inc.php
@@ -23,8 +23,8 @@ $web_path 	= conf('web_path');
 $catalogs 	= Catalog::get_catalogs();
 
 ?>
+<span class="header1"><?php echo _('Catalogs'); ?></span>
 <div class="text-box"> 
-<span class="header2"><?php echo _('Catalogs'); ?></span>
 <!-- Current Catalogs -->
 <table border="0" cellpadding="0" cellspacing="0">
 <tr class="table-header">
@@ -60,24 +60,12 @@ $catalogs 	= Catalog::get_catalogs();
 </tr>
 <?php } // end if no catalogs ?>
 </table>
-<script type="text/javascript" language="javascript">
-<!--
-function ToCatalog(action)
-{
-        document.catalog.action = "<?php echo conf('web_path'); ?>/admin/catalog.php?action=" + action;
-        document.catalog.submit();                        // Submit the page
-        return true;
-}
-
--->
-</script>
-<form name="catalog" method="post" enctype="multipart/form-data" style="Display:inline;">
-<input class="button" type="button" value="<?php echo _('Clean Everything'); ?>" onclick="return ToCatalog('clean_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Verify Everything'); ?>" onclick="return ToCatalog('update_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Add to Everything'); ?>" onclick="return ToCatalog('add_to_all_catalogs');" />
-<input class="button" type="button" value="<?php echo _('Update Everything'); ?>" onclick="return ToCatalog('full_service');" />
-</div>
-<div class="text-box">
+<form id="catalog_tools" method="post" enctype="multipart/form-data" style="Display:inline;">
+<input class="button" type="button" value="<?php echo _('Clean Everything'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs');" />
+<input class="button" type="button" value="<?php echo _('Verify Everything'); ?>" onclick="return SubmitToPage('catalog_tools','<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs');" />
+<input class="button" type="button" value="<?php echo _('Add to Everything'); ?>" onclick="return SubmitToPage('catalog_tools',<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs');" />
+<input class="button" type="button" value="<?php echo _('Update Everything'); ?>" onclick="return SubmitToPage('catalog_tools',<?php echo $web_path; ?>/admin/catalog.php?action=full_service');" />
+<br />
 <span class="header2"><?php echo _('Other Tools'); ?></span><br />
 <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a><br />
 <a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a><br />
@@ -86,3 +74,4 @@ function ToCatalog(action)
 <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a><br />
 <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a><br />
 </div>
+<br />
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index c1d7e97b..e57b2485 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -22,6 +22,13 @@
 $web_path = conf('web_path');
 
 ?>
+<span class="header1"><?php echo _('Information'); ?></span><br />
 <div class="text-box"> 
-<span class="header2"><?php echo _('Information'); ?></span><br />
+<span class="header2"><?php echo _('Flagged Songs'); ?></span><br />
+<!-- Show Last 10 Flagged Songs -->
+<span class="header2"><?php echo _('Disabled Songs'); ?></span><br />
+<!-- Show Last 10 Disabled Songs -->
+<span class="header2"><?php echo _('Active Users'); ?></span><br />
+<!-- Show Last 10 Active Users (Bandwidth Usage guess) -->
+
 </div>