added some more to flagging and updated mail page to fit new standards

5 files changed, 86 insertions, 15 deletions

diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index bf5820e4..2d69c058 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -22,24 +22,25 @@
 $web_path = conf('web_path');
 
 /* Setup the needed objects */
-$flagged	= Flag::get_recent('10');
-$total_flagged	= Flag::get_total();
+$flag = new Flag();
+$flagged	= $flag->get_recent('10');
+$total_flagged	= $flag->get_total();
 
 ?>
 <span class="header1"><?php echo _('Information'); ?></span><br />
 <div class="text-box"> 
-<span class="header2"><?php echo _('Last Ten Flagged Songs'); ?></span><br />
-<?php require (conf('prefix') . '/templates/show_flagged.inc.php'); ?>
-<div class="text-action">
-<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a>
-</div>
+<span class="header2"><?php echo _('Last Ten Flagged Records'); ?></span><br />
+	<?php require (conf('prefix') . '/templates/show_flagged.inc.php'); ?>
+	<div class="text-action">
+	<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a>
+	</div>
 </div><br />
 <span class="header2"><?php echo _('Disabled Songs'); ?></span><br />
 <div class="text-box">	
-<!-- Show Last 10 Disabled Songs -->&nbsp;
+	<!-- 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) -->
+	<!-- Show Last 10 Active Users (Bandwidth Usage guess) -->
 &nbsp;
 </div>
diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php
index 07994401..bf64f576 100644
--- a/templates/show_confirmation.inc.php
+++ b/templates/show_confirmation.inc.php
@@ -22,9 +22,11 @@
 <div class="confirmation-box">
 <span class="header1"><?php echo scrub_out($title); ?></span><br />
 <?php echo scrub_out($text); ?>
-<br /><br />
-[ <a href="<?php echo $path; ?>"><?php echo _('Continue'); ?></a> ]
+<br />
+<div class="text-action">
+	<a href="<?php echo $path; ?>"><?php echo _('Continue'); ?></a>
 <?php if ($cancel) { ?>
-	[ <a href="<?php echo conf('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a> ]<br />
+	<a href="<?php echo conf('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a>
 <?php } ?>
 </div>
+</div>
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index 068f38af..b078a2da 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -47,5 +47,9 @@ $web_path = conf('web_path');
 	<?php } ?>
 	</td>
 </tr>
+<?php } if (!count($flagged)) { ?>
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="4" class="error"><?php echo _('No Records Found'); ?></td>
+</tr>
 <?php } ?>
 </table>
diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php
new file mode 100644
index 00000000..19960474
--- /dev/null
+++ b/templates/show_mail_users.inc.php
@@ -0,0 +1,59 @@
+<?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.
+
+*/
+?>
+<form name="mail" method="post" action="<?php echo conf('web_path'); ?>/admin/mail.php" enctype="multipart/form-data">
+<span class="header1"><?php echo _('Send E-mail to Users'); ?></span>
+<table class="text-box">
+  <tr>
+    <td><?php echo _('Mail to'); ?>:</td>
+    <td>
+        <select name="to">
+                <option value="all" <?php if ($to == 'all') { echo "selected=\"selected\""; } ?>>All</option>
+                <option value="users" <?php if ($to == 'user') { echo "selected=\"selected\""; } ?>>Users</option>
+                <option value="admins" <?php if ($to == 'admin') { echo "selected=\"selected\""; } ?>>Admins</option>
+        </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td><?php echo _('Subject'); ?>:</td>
+    <td>
+        <input name="subject" value="<?php echo scrub_out($_POST['subject']); ?>" size="50"></input>
+    </td>
+  </tr>
+
+  <tr>
+    <td valign="top"><?php echo _('Message'); ?>:</td>
+    <td>
+        <textarea class="input" name="message" rows="20" cols="70"><?php echo scrub_out($message); ?></textarea>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+        <input type="hidden" name="action" value="send_mail" />
+        <input class="button" type="submit" value="<?php echo _('Send Mail'); ?>" />
+    </td>
+  </tr>
+</table>
+</form>
diff --git a/templates/show_uploads.inc b/templates/show_uploads.inc
index d0f444d4..6553c932 100644
--- a/templates/show_uploads.inc
+++ b/templates/show_uploads.inc
@@ -45,14 +45,19 @@ if (count($uploads)) {
 <?php foreach ($uploads as $upload) { ?>
 <tr class="<?php echo flip_class(); ?>">
 	<?php if($GLOBALS['user']->has_access(100)) { ?>
-		<td>
-			<a href="<?php echo conf('web_path'); ?>/upload.php?action=add&amp;id=<?php echo $upload['id']; ?>"><?php echo _('Add'); ?></a>&nbsp;|&nbsp;
+		<td align="center">
+		<div class="text-action">
+		<?php if ($upload['action'] != 'add') { ?>
+			<a href="<?php echo conf('web_path'); ?>/upload.php?action=add&amp;id=<?php echo $upload['id']; ?>"><?php echo _('Add'); ?></a>
+		<?php } elseif ($upload['action'] != 'delete') { ?>
 			<a href="<?php echo conf('web_path'); ?>/upload.php?action=delete&amp;id=<?php echo $upload['id']; ?>"><?php echo _('Delete'); ?></a>
+		<?php } ?>
+		</div>
 		</td>
 	<?php } else { ?>
 		<td>N/A</td>
 	<?php } ?>
-	<td><?php echo ucfirst($upload['action']); ?></td>
+	<td style="<?php echo show_upload_status_style($upload['action']); ?>">&nbsp;</td>
 	<td><?php echo $upload['title']; ?></td>
 	<td><?php echo $upload['artist']; ?></td>
 	<td><?php echo $upload['album']; ?></td>