added in the manage users section and put in a temp disable songs section which currently does not work

3 files changed, 75 insertions, 11 deletions

diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index 2d69c058..b87a7847 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -21,11 +21,18 @@
 */
 $web_path = conf('web_path');
 
-/* Setup the needed objects */
+/* Flagged Information Gathering */
 $flag = new Flag();
-$flagged	= $flag->get_recent('10');
+$flagged	= $flag->get_recent(10);
 $total_flagged	= $flag->get_total();
 
+/* Disabled Information Gathering */
+$catalog = new Catalog(); 
+$songs = $catalog->get_disabled(10);
+
+/* User Information */
+$users = $GLOBALS['user']->get_recent(10);
+
 ?>
 <span class="header1"><?php echo _('Information'); ?></span><br />
 <div class="text-box"> 
@@ -38,9 +45,8 @@ $total_flagged	= $flag->get_total();
 <span class="header2"><?php echo _('Disabled Songs'); ?></span><br />
 <div class="text-box">	
 	<!-- Show Last 10 Disabled Songs -->&nbsp;
-</div><br />
-<span class="header2"><?php echo _('User Activity'); ?></span><br />
-<div class="text-box">
-	<!-- Show Last 10 Active Users (Bandwidth Usage guess) -->
-&nbsp;
+	<?php require (conf('prefix') . '/templates/show_disabled_songs.inc'); ?>
+	<div class="text-action">
+	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a>
+	</div>
 </div>
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index 94a33932..1dade1f2 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -20,7 +20,8 @@
 
 */
 $web_path 	= conf('web_path');
-$catalogs 	= Catalog::get_catalogs();
+$catalog	= new Catalog(); 
+$catalogs 	= $catalog->get_catalogs();
 
 ?>
 <span class="header1"><?php echo _('Catalogs'); ?></span>
@@ -76,11 +77,13 @@ $catalogs 	= Catalog::get_catalogs();
 <div class="text-box">
 <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=show_disabled"><?php echo _('Show Disabled Songs'); ?></a>
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a>
 </div>
 </div><br />
-<span class="header1"><?php echo _('Manage Users'); ?></span>
+<span class="header2"><?php echo _('User Activity'); ?></span><br />
 <div class="text-box">
-&nbsp;
+        <?php require (conf('prefix') . '/templates/show_users_info.inc.php'); ?>
+        <div class="text-action">
+        <a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Show All'); ?>...</a>
+        </div>
 </div>
diff --git a/templates/show_users_info.inc.php b/templates/show_users_info.inc.php
new file mode 100644
index 00000000..3a854d04
--- /dev/null
+++ b/templates/show_users_info.inc.php
@@ -0,0 +1,55 @@
+<?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');
+?>
+<table class="tabledata" cellpadding="0" cellspacing="0" border="0">
+<tr class="table-header">
+	<th align="center"><?php echo _('Fullname'); ?> (<?php echo _('Username'); ?>)</th>
+        <th align="center"><?php echo _('Last Seen'); ?></th>
+        <th align="center"><?php echo _('Activity'); ?></th>
+        <th align="center"><?php echo _('Action'); ?></th>
+</tr>
+<?php foreach ($users as $user_id) { $data = new User($user_id); $data->format_user(); ?>
+<tr class="<?php echo flip_class(); ?>">
+	<td>
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&amp;user=<?php echo scrub_out($data->id); ?>">
+		<?php echo scrub_out($data->fullname); ?> (<?php echo scrub_out($data->username); ?>)</a>
+	</td>
+        <td align="center">
+		<?php echo scrub_out($data->f_last_seen); ?>
+	</td>
+	<td>
+		<?php echo scrub_out($data->f_useage); ?>
+	</td>
+        <td>
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user=<?php echo scrub_out($data->id); ?>">
+			<?php echo _('Edit'); ?>
+		</a>
+	</td>
+</tr>
+<?php } if (!count($users)) { ?>
+<tr>
+	<td colspan="4"><?php echo _('No Records Found'); ?></td>
+</tr>
+<?php } ?>
+</table>