summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/show_add_user.inc.php3
-rw-r--r--templates/show_edit_user.inc.php3
-rw-r--r--templates/show_flagged.inc.php4
-rw-r--r--templates/show_install_account.inc.php4
-rw-r--r--templates/show_manage_shoutbox.inc.php56
-rw-r--r--templates/show_shout_row.inc.php30
-rw-r--r--templates/show_shoutbox.inc.php2
-rw-r--r--templates/sidebar_browse.inc.php2
8 files changed, 100 insertions, 4 deletions
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index 0b3adcd3..dbe57aa4 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -19,6 +19,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+$form_string = generate_password('32');
+$_SESSION['forms']['createuser'] = $form_string;
?>
<?php show_box_top(_('Adding a New User')); ?>
<?php Error::display('general'); ?>
@@ -81,6 +83,7 @@
</tr>
</table>
<div class="formValidation">
+ <input type="hidden" name="formkey" value="<?php echo $form_string; ?>" />
<input type="submit" value="<?php echo _('Add User'); ?>" />
</div>
</form>
diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php
index 7b119736..56ed7179 100644
--- a/templates/show_edit_user.inc.php
+++ b/templates/show_edit_user.inc.php
@@ -19,6 +19,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+$form_string = generate_password('32');
+$_SESSION['forms']['adminuser'] = $form_string;
?>
<?php show_box_top(_('Editing existing User')); ?>
<?php Error::display('general'); ?>
@@ -83,6 +85,7 @@
<div class="formValidation">
<input type="hidden" name="action" value="update_user" />
<input type="submit" value="<?php echo _('Update User'); ?>" />
+ <input type="hidden" name="formkey" value="<?php echo $form_string; ?>" />
<input type="hidden" name="user_id" value="<?php echo $client->id; ?>" />
</div>
</form>
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index 8c61113b..00324771 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2008 Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -21,7 +21,6 @@
$web_path = Config::get('web_path');
?>
-<form id="songs" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=reject_flags">
<table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup>
<col id="col_object" />
@@ -59,4 +58,3 @@ foreach ($object_ids as $flag_id) {
<th class="cel_action"><?php echo _('Action'); ?></th>
</tr>
</table>
-</form>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 90141263..486a316e 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -65,6 +65,10 @@ if (INSTALL != '1') { exit; }
<td><input type="password" name="local_pass" value="" /></td>
</tr>
<tr>
+ <td class="align"><?php echo _('Confirm Password'); ?></td>
+ <td><input type="password" name="local_pass2" value="" /></td>
+</tr>
+<tr>
<td>&nbsp;</td>
<td><input type="submit" value="<?php echo _('Create Account'); ?>" /></td>
</tr>
diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php
new file mode 100644
index 00000000..33c10c2d
--- /dev/null
+++ b/templates/show_manage_shoutbox.inc.php
@@ -0,0 +1,56 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2008 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 v2
+ as published by the Free Software Foundation.
+
+ 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 = Config::get('web_path');
+?>
+<table class="tabledata" cellpadding="0" cellspacing="0">
+<colgroup>
+ <col id="col_object" />
+ <col id="col_username" />
+ <col id="col_sticky" />
+ <col id="col_comment" />
+ <col id="col_action" />
+</colgroup>
+<tr class="th-top">
+ <th class="cel_object"><?php echo _('Object'); ?></th>
+ <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_action"><?php echo _('Action'); ?></th>
+</tr>
+<?php
+foreach ($object_ids as $shout_id) {
+ $shout = new shoutBox($shout_id);
+ require Config::get('prefix') . '/templates/show_shout_row.inc.php';
+?>
+<?php } if (!count($object_ids)) { ?>
+<tr class="<?php echo flip_class(); ?>">
+ <td colspan="7" class="error"><?php echo _('No Records Found'); ?></td>
+</tr>
+<?php } ?>
+<tr class="th-bottom">
+ <th class="cel_object"><?php echo _('Object'); ?></th>
+ <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_action"><?php echo _('Action'); ?></th>
+</tr>
+</table>
diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php
new file mode 100644
index 00000000..25990cca
--- /dev/null
+++ b/templates/show_shout_row.inc.php
@@ -0,0 +1,30 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2008 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 v2
+ as published by the Free Software Foundation.
+
+ 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.
+
+*/
+
+?>
+<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_action">
+ </td>
+</tr>
diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 72da5ac1..006cb73d 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) 2001 - 2008 Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php
index 450108f9..4a51c3db 100644
--- a/templates/sidebar_browse.inc.php
+++ b/templates/sidebar_browse.inc.php
@@ -38,6 +38,7 @@ $allowed_filters = Browse::get_allowed_filters();
<li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li>
</ul>
</li>
+<?php if (count($allowed_filters)) { ?>
<li><h4><?php echo _('Filters'); ?></h4>
<div class="sb3">
<?php if (in_array('alpha_match',$allowed_filters)) { ?>
@@ -71,4 +72,5 @@ $allowed_filters = Browse::get_allowed_filters();
<?php } // if playlist_type ?>
</div>
</li>
+<?php } ?>
</ul>