From a524f1f979aae71a5b15bccc1fd84cf9ebc00a97 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Thu, 13 Sep 2007 15:28:22 +0000
Subject: threw in add button for single playlist view, added the link for
 deleting catalogs back, also added back in the ACL page links, they dont
 work..

---
 templates/show_access_list.inc           | 76 --------------------------
 templates/show_access_list.inc.php       | 76 ++++++++++++++++++++++++++
 templates/show_add_access.inc            | 92 --------------------------------
 templates/show_add_access.inc.php        | 92 ++++++++++++++++++++++++++++++++
 templates/show_catalog_row.inc.php       |  1 +
 templates/show_playlist_song_row.inc.php |  1 +
 templates/show_playlist_songs.inc.php    |  1 +
 templates/sidebar_admin.inc.php          |  7 ++-
 8 files changed, 177 insertions(+), 169 deletions(-)
 delete mode 100644 templates/show_access_list.inc
 create mode 100644 templates/show_access_list.inc.php
 delete mode 100644 templates/show_add_access.inc
 create mode 100644 templates/show_add_access.inc.php

(limited to 'templates')

diff --git a/templates/show_access_list.inc b/templates/show_access_list.inc
deleted file mode 100644
index f709e33a..00000000
--- a/templates/show_access_list.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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 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.
-
-*/
-
-/*!
-	@header show access list
-	@discussion default display for access admin page
-
-*/
-$web_path = conf('web_path');
-?>
-<?php show_box_top(_('Host Access to Your Catalog')); ?>
-<p>Since your catalog can be accessed remotely you may want to limit the access from
-remote sources so you are not in violation of copyright laws.  By default your
-server will allow anyone with an account to stream music. It will not allow any
-other Ampache servers to connect to it to share catalog information.  Use tool below 
-to add any server's IP address that you want to access your Ampache catalog or be able to 
-stream from this server.</p>
-
-<p>
-<span class="text-action">
-<a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a>
-</span>
-</p>
-<?php if (count($list)) { ?>
-<table cellspacing="1" cellpadding="3" class="tabledata">
-<tr class="table-header" align="center">
-	<td><?php echo _('Name'); ?></td>
-	<td><?php echo _('Start Address'); ?></td>
-	<td><?php echo _('End Address'); ?></td>
-	<td><?php echo _('Level'); ?></td>
-	<td><?php echo _('User'); ?></td>
-	<td><?php echo _('Key'); ?></td>
-	<td><?php echo _('Type'); ?></td>
-	<td><?php echo _('Action'); ?></td>
-</tr>
-<?php 
-	/* Start foreach List Item */
-	foreach ($list as $access) { 
-?>
-		<tr class="<?php echo flip_class(); ?>">
-			<td><?php echo scrub_out($access->name); ?></td>
-			<td><?php echo int2ip($access->start); ?></td>
-			<td><?php echo int2ip($access->end); ?></td>
-			<td><?php echo $access->get_level_name(); ?></td>
-			<td><?php echo $access->get_user_name(); ?></td>
-			<td><?php echo $access->key; ?></td>
-			<td><?php echo $access->get_type_name(); ?></td>
-			<td>
-				<a href="<?php echo $web_path; ?>/admin/access.php?action=show_edit_host&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo _('Edit'); ?></a>
-				| 
-				<a href="<?php echo $web_path; ?>/admin/access.php?action=show_confirm_delete&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php print _("Revoke"); ?></a>
-			</td>
-		</tr>
-	<?php  } // end foreach ?>
-</table>
-<?php  } // end if count ?>
-<?php show_box_bottom(); ?>
-
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
new file mode 100644
index 00000000..15fb3417
--- /dev/null
+++ b/templates/show_access_list.inc.php
@@ -0,0 +1,76 @@
+<?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 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.
+
+*/
+
+/*!
+	@header show access list
+	@discussion default display for access admin page
+
+*/
+$web_path = Config::get('web_path');
+?>
+<?php show_box_top(_('Host Access to Your Catalog')); ?>
+<p>Since your catalog can be accessed remotely you may want to limit the access from
+remote sources so you are not in violation of copyright laws.  By default your
+server will allow anyone with an account to stream music. It will not allow any
+other Ampache servers to connect to it to share catalog information.  Use tool below 
+to add any server's IP address that you want to access your Ampache catalog or be able to 
+stream from this server.</p>
+
+<p>
+<span class="text-action">
+<a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a>
+</span>
+</p>
+<?php if (count($list)) { ?>
+<table cellspacing="1" cellpadding="3" class="tabledata">
+<tr class="table-header" align="center">
+	<td><?php echo _('Name'); ?></td>
+	<td><?php echo _('Start Address'); ?></td>
+	<td><?php echo _('End Address'); ?></td>
+	<td><?php echo _('Level'); ?></td>
+	<td><?php echo _('User'); ?></td>
+	<td><?php echo _('Key'); ?></td>
+	<td><?php echo _('Type'); ?></td>
+	<td><?php echo _('Action'); ?></td>
+</tr>
+<?php 
+	/* Start foreach List Item */
+	foreach ($list as $access) { 
+?>
+		<tr class="<?php echo flip_class(); ?>">
+			<td><?php echo scrub_out($access->name); ?></td>
+			<td><?php echo int2ip($access->start); ?></td>
+			<td><?php echo int2ip($access->end); ?></td>
+			<td><?php echo $access->get_level_name(); ?></td>
+			<td><?php echo $access->get_user_name(); ?></td>
+			<td><?php echo $access->key; ?></td>
+			<td><?php echo $access->get_type_name(); ?></td>
+			<td>
+				<a href="<?php echo $web_path; ?>/admin/access.php?action=show_edit_host&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo _('Edit'); ?></a>
+				| 
+				<a href="<?php echo $web_path; ?>/admin/access.php?action=show_confirm_delete&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php print _("Revoke"); ?></a>
+			</td>
+		</tr>
+	<?php  } // end foreach ?>
+</table>
+<?php  } // end if count ?>
+<?php show_box_bottom(); ?>
+
diff --git a/templates/show_add_access.inc b/templates/show_add_access.inc
deleted file mode 100644
index cd211bfd..00000000
--- a/templates/show_add_access.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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 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.
-
-*/
-?>
-<?php show_box_top(_('Add Access for a Host')); ?>
-<p><?php echo _('Use the form below to add a host that you want to have access to your Ampache catalog.'); ?></p>
-
-
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/access.php">
-<table cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td><?php echo _('Name'); ?>:</td>
-	<td>
-		<input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo _('Start IP Address'); ?>:</td>
-	<td>
-		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" maxlength="15" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo _('End IP Address'); ?>:</td>
-	<td>
-		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" maxlength="15" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo _('User'); ?>:</td>
-	<td>
-		<?php show_user_select('user'); ?>
-	</td>
-</tr>
-<tr>
-	<td><?php echo _('Level'); ?>:</td>
-	<td>
-		<select name="level">
-			<option selected="selected" value="5" ><?php echo _('View'); ?></option>
-			<option value="25"><?php echo _('Read'); ?></option>
-			<option value="50"><?php echo _('Read/Write'); ?></option>
-			<option value="75"><?php echo _('All'); ?></option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo _('ACL Type'); ?>:</td>
-	<td>
-		<select name="type">
-			<option selected="selected" value="stream"><?php echo _('Stream Access'); ?></option>
-			<option value="interface"><?php echo _('Web Interface'); ?></option>
-			<option value="network"><?php echo _('Local Network Definition'); ?></option>
-			<option value="xml-rpc"><?php echo _('XML-RPC'); ?></option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td colspan="2"><br /><?php echo _('XML-RPC Options'); ?>:</td>
-</tr>
-<tr>
-	<td><?php echo _('Remote Key'); ?>:</td>
-	<td>
-		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="32" maxlength="32" />
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<br />
-		<input type="hidden" name="action" value="add_host" />
-		<input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" />
-	</td>
-</tr>
-</table>
-</form>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
new file mode 100644
index 00000000..e171b507
--- /dev/null
+++ b/templates/show_add_access.inc.php
@@ -0,0 +1,92 @@
+<?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 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.
+
+*/
+?>
+<?php show_box_top(_('Add Access for a Host')); ?>
+<p><?php echo _('Use the form below to add a host that you want to have access to your Ampache catalog.'); ?></p>
+
+
+<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php">
+<table cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td><?php echo _('Name'); ?>:</td>
+	<td>
+		<input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" />
+	</td>
+</tr>
+<tr>
+	<td><?php echo _('Start IP Address'); ?>:</td>
+	<td>
+		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" maxlength="15" />
+	</td>
+</tr>
+<tr>
+	<td><?php echo _('End IP Address'); ?>:</td>
+	<td>
+		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" maxlength="15" />
+	</td>
+</tr>
+<tr>
+	<td><?php echo _('User'); ?>:</td>
+		<!-- Stuff Goes Here --> 
+	<td>
+	</td>
+</tr>
+<tr>
+	<td><?php echo _('Level'); ?>:</td>
+	<td>
+		<select name="level">
+			<option selected="selected" value="5" ><?php echo _('View'); ?></option>
+			<option value="25"><?php echo _('Read'); ?></option>
+			<option value="50"><?php echo _('Read/Write'); ?></option>
+			<option value="75"><?php echo _('All'); ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php echo _('ACL Type'); ?>:</td>
+	<td>
+		<select name="type">
+			<option selected="selected" value="stream"><?php echo _('Stream Access'); ?></option>
+			<option value="interface"><?php echo _('Web Interface'); ?></option>
+			<option value="network"><?php echo _('Local Network Definition'); ?></option>
+			<option value="xml-rpc"><?php echo _('XML-RPC'); ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td colspan="2"><br /><?php echo _('XML-RPC Options'); ?>:</td>
+</tr>
+<tr>
+	<td><?php echo _('Remote Key'); ?>:</td>
+	<td>
+		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="32" maxlength="32" />
+	</td>
+</tr>
+<tr>
+	<td colspan="2">
+		<br />
+		<input type="hidden" name="action" value="add_host" />
+		<input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index d58d7e30..34f7ea77 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -29,4 +29,5 @@ $web_path = Config::get('web_path');
 	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
         | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
 	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Gather Art'); ?></a>
+	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>"><?php echo _('Delete'); ?></a>
 </td>
diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php
index 50af6dec..9cfcc992 100644
--- a/templates/show_playlist_song_row.inc.php
+++ b/templates/show_playlist_song_row.inc.php
@@ -19,6 +19,7 @@
 
 */
 ?>
+<td><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'playlist_add_' . $song->id); ?></td>
 <td><?php echo $playlist_track; ?></td>
 <td><?php echo $song->f_link; ?></td>
 <td><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php
index 3e8918aa..17aa68a6 100644
--- a/templates/show_playlist_songs.inc.php
+++ b/templates/show_playlist_songs.inc.php
@@ -30,6 +30,7 @@ $ajax_url = Config::get('ajax_url');
 	</td>
 </tr>
 <tr class="table-header">
+	<th>&nbsp;</th>
 	<th><?php echo _('Track'); ?></th>
 	<th><?php echo _('Song Title'); ?></th>
 	<th><?php echo _('Artist'); ?></th>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 4f952e0f..c2348aec 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -10,7 +10,12 @@
       <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li>
     </ul>
   </li>
-
+  <li><h4><?php echo _('Access Control'); ?></h4>
+    <ul class="sb3" id="sb_admin_acl">
+      <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add ACL'); ?></li>
+      <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo _('Show ACL(s)'); ?></a>
+    </ul>
+  </li>
   <li><h4><?php echo _('Other Tools'); ?></h4>
     <ul class="sb3" id="sb_admin_ot">
       <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>
-- 
cgit