- Fixed Sorting on Admin->Browse Users

        - Fixed Shoutbox and shoutbox management (pb1dft)

6 files changed, 71 insertions, 7 deletions

diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index 9d1ead88..c52565f2 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -31,7 +31,7 @@
 </tr>
 <?php if (Access::check('interface','50')) { ?>
 <tr>
-	<td><input type="checkbox" name="sticky" value="0" /> <strong><?php echo _('Make Sticky'); ?></strong></td>
+	<td><input type="checkbox" name="sticky" /> <strong><?php echo _('Make Sticky'); ?></strong></td>
 </tr>
 <?php } ?>
 <tr>
diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php
new file mode 100644
index 00000000..2709b90d
--- /dev/null
+++ b/templates/show_edit_shout.inc.php
@@ -0,0 +1,46 @@
+<?php
+/*
+
+ Copyright (c) 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
+ as published by the Free Software Foundation; version 2
+ of the License.
+
+ 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.
+
+*/
+?>
+<?php show_box_top(_('Edit existing Shoutbox Post')); ?>
+<form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/shout.php?action=edit_shout">
+<input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" />
+<table class="tabledata" cellpadding="0" cellspacing="0">
+<tr>
+	<td><strong>Created by: <?php echo $client->f_link; ?> for <?php echo $object->f_link; ?></strong>
+<tr>
+<tr>
+	<td><strong>Comment:</strong>
+</tr>
+<tr>
+	<td><textarea rows="5" cols="70" name="comment"><?php echo $shout->text; ?></textarea></td>
+</tr>
+<tr>
+	<td><input type="checkbox" name="sticky" <?php if ($shout->sticky == "1") { echo "checked"; } ?>/> <strong><?php echo _('Make Sticky'); ?></strong></td>
+</tr>
+<tr>
+	<td>
+		<input type="submit" value="<?php echo _('Update'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php
index 33c10c2d..9394aaab 100644
--- a/templates/show_manage_shoutbox.inc.php
+++ b/templates/show_manage_shoutbox.inc.php
@@ -27,6 +27,7 @@ $web_path = Config::get('web_path');
   <col id="col_username" />
   <col id="col_sticky" />
   <col id="col_comment" />
+  <col id="col_date />
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
@@ -34,11 +35,18 @@ $web_path = Config::get('web_path');
 	<th class="cel_username"><?php echo _('User'); ?></th>
 	<th class="cel_flag"><?php echo _('Sticky'); ?></th>
 	<th class="cel_comment"><?php echo _('Comment'); ?></th>
+	<th class="cel_date"><?php echo _('Date Added'); ?></th>
 	<th class="cel_action"><?php echo _('Action'); ?></th>
 </tr>
 <?php 
 foreach ($object_ids as $shout_id) { 
 	$shout = new shoutBox($shout_id); 
+	$shout->format();
+        $object = shoutBox::get_object($shout->object_type,$shout->object_id);
+        $object->format();
+        $client = new User($shout->user);
+        $client->format();
+
 	require Config::get('prefix') . '/templates/show_shout_row.inc.php'; 
 ?>
 <?php } if (!count($object_ids)) { ?>
@@ -51,6 +59,7 @@ foreach ($object_ids as $shout_id) {
 	<th class="cel_username"><?php echo _('User'); ?></th>
 	<th class="cel_sticky"><?php echo _('Sticky'); ?></th>
 	<th class="cel_comment"><?php echo _('Comment'); ?></th>
+	<th class="cel_date"><?php echo _('Date Added'); ?></th>
 	<th class="cel_action"><?php echo _('Action'); ?></th>
 </tr>
 </table>
diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php
index 25990cca..a57b8594 100644
--- a/templates/show_shout_row.inc.php
+++ b/templates/show_shout_row.inc.php
@@ -21,10 +21,19 @@
 
 ?>
 <tr id="flagged_<?php echo $shout->id; ?>" class="<?php echo flip_class(); ?>">
-	<td class="cel_object"><?php echo $shout->f_name; ?></td>
-	<td class="cel_username"><?php echo $shout->f_user; ?></td>
-	<td class="cel_sticky"><?php $shout->sticky; ?></td>
-	<td class="cel_comment"><?php echo scrub_out($shout->comment); ?></td>
+	<td class="cel_object"><?php echo $object->f_link; ?></td>
+	<td class="cel_username"><?php echo $client->f_link; ?></td>
+	<td class="cel_sticky"><?php echo $shout->sticky; ?></td>
+	<td class="cel_comment"><?php echo scrub_out($shout->text); ?></td>
+	<td class="cel_date"><?php echo $shout->date; ?></td>
 	<td class="cel_action">
+
+                <a href="<?php echo $web_path; ?>/admin/shout.php?action=show_edit&amp;shout_id=<?php echo $shout->id; ?>">
+                <?php echo get_user_icon('edit'); ?>
+                </a>
+
+                <a href="<?php echo $web_path; ?>/admin/shout.php?action=delete&amp;shout_id=<?php echo $shout->id; ?>">
+                <?php echo get_user_icon('delete'); ?>
+                </a>
 	</td>
 </tr>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index 43cdbbea..f35e6bfe 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -123,7 +123,7 @@ if (Config::get('user_agreement')) { ?>
 </tr>
 </table>
 <?php if (Config::get('captcha_public_reg')) { ?>
-			<?php echo captcha::form(); ?>
+			<?php  echo captcha::form("&rarr;&nbsp;"); ?>
 			<?php Error::display('captcha'); ?>
 <?php } ?>
 <table>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index fbe589fa..d5f25803 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -49,7 +49,7 @@
       <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export Catalog'); ?></a></li>
       <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li>
       <?php if (Config::get('shoutbox')) { ?>
-      <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/shout.php?action=show_manage"><?php echo _('Manage Shoutbox'); ?></a></li>
+      <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php"><?php echo _('Manage Shoutbox'); ?></a></li>
       <?php } ?>
     </ul>
   </li>