Clean up the ACL UI a bit

Make it more consistent and remove outdated references to RPC keys.

6 files changed, 50 insertions, 361 deletions

diff --git a/admin/access.php b/admin/access.php
index 154d277a..b2caf1ef 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -59,64 +59,27 @@ switch ($_REQUEST['action']) {
 			exit;
 		}
 
-		// We need to pre-process this a little bit as stuff is coming in from all over
-		switch ($_GET['method']) {
-			case 'advanced':
-				Access::create($_POST);
-			break;
-			case 'local':
-				$_POST['type'] = 'network';
-				Access::create($_POST);
+		Access::create($_POST);
 
-				// Create Additional stuff based on the type
-				if ($_POST['addtype'] == 'streamnetwork' OR $_POST['addtype'] == 'allnetwork') {
-					$_POST['type'] = 'stream';
-					Access::create($_POST);
-				}
-				if ($_POST['addtype'] == 'allnetwork') {
-					$_POST['type'] = 'interface';
-					Access::create($_POST);
-				}
-			break;
-			case 'current':
-				$_POST['start'] = $_SERVER['REMOTE_ADDR'];
-				$_POST['end'] = $_SERVER['REMOTE_ADDR'];
-				$_POST['type'] = 'interface';
-				Access::create($_POST);
-				$_POST['type'] = 'stream';
-				Access::create($_POST);
-			break;
-			case 'rpc':
-				$_POST['type'] = 'rpc';
-				Access::create($_POST);
-
-				// Create Additional stuff based on the type
-				if ($_POST['addtype'] == 'streamrpc' OR $_POST['addtype'] == 'allrpc') {
-					$_POST['type'] = 'stream';
-					Access::create($_POST);
-				}
-				if ($_POST['addtype'] == 'allrpc') {
-					$_POST['type'] = 'interface';
-					Access::create($_POST);
-				}
-			break;
-			default:
-				// Do nothing they f'ed something up
-			break;
-		} // end switch on method
+		// Create Additional stuff based on the type
+		if ($_POST['addtype'] == 'stream' || 
+			$_POST['addtype'] == 'all'
+		) {
+			$_POST['type'] = 'stream';
+			Access::create($_POST);
+		}
+		if ($_POST['addtype'] == 'all') {
+			$_POST['type'] = 'interface';
+			Access::create($_POST);
+		}
 
 		if (!Error::occurred()) {
 			$url = Config::get('web_path') . '/admin/access.php';
 			show_confirmation(T_('Added'), T_('Your new Access Control List(s) have been created'),$url);
 		}
 		else {
-			switch ($_GET['method']) {
-				case 'rpc': require_once Config::get('prefix') . '/templates/show_add_access_rpc.inc.php'; break;
-				case 'local': require_once Config::get('prefix') . '/templates/show_add_access_local.inc.php'; break;
-				case 'current': require_once Config::get('prefix') . '/templates/show_add_access_current.inc.php'; break;
-				case 'advanced': require_once Config::get('prefix') . '/templates/show_add_access.inc.php'; break;
-				default: require_once Config::get('prefix') . '/templates/show_access_list.inc.php'; break;
-			}
+			$action = 'show_add_' . $_POST['type'];
+			require_once Config::get('prefix') . '/templates/show_add_access.inc.php';
 		}
 	break;
 	case 'update_record':
@@ -135,15 +98,10 @@ switch ($_REQUEST['action']) {
 		}
 	break;
 	case 'show_add_current':
-		require_once Config::get('prefix') . '/templates/show_add_access_current.inc.php';
-	break;
 	case 'show_add_rpc':
-		require_once Config::get('prefix') . '/templates/show_add_access_rpc.inc.php';
-	break;
 	case 'show_add_local':
-		require_once Config::get('prefix') . '/templates/show_add_access_local.inc.php';
-	break;
 	case 'show_add_advanced':
+		$action = $_REQUEST['action'];
 		require_once Config::get('prefix') . '/templates/show_add_access.inc.php';
 	break;
 	case 'show_edit_record':
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index b458407d..bfcb6159 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -19,17 +19,11 @@
  * 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.
- *
- * @package	Ampache
- * @copyright	2001 - 2011 Ampache.org
- * @license	http://opensource.org/licenses/gpl-2.0 GPLv2
- * @link	http://www.ampache.org/
  */
-
 ?>
-<?php show_box_top(T_('Advanced Add'), 'box box_add_access'); ?>
+<?php show_box_top(T_('Add Access Control List'), 'box box_add_access'); ?>
 <?php Error::display('general'); ?>
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=advanced">
+<form name="update_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host">
 <table class="tabledata" cellpadding="5" cellspacing="0">
 <tr>
 	<td><?php echo T_('Name'); ?>:</td>
@@ -52,29 +46,33 @@
 		<?php show_user_select('user'); ?>
 	</td>
 </tr>
+<tr>   
+        <td valign="top"><?php echo T_('ACL Type'); ?>:</td>
+        <td colspan="3">
+<?php if ($action == 'show_add_rpc') { ?>
+		<input type="hidden" name="type" value="rpc" />
+		<select name="addtype">
+			<option value="rpc"><?php echo T_('API/RPC'); ?></option>
+			<option selected="selected" value="stream"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('Stream Access')); ?></option>
+			<option value="all"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('All')); ?></option>
+<?php } else if ($action == 'show_add_local') { ?>
+		<input type="hidden" name="type" value="local" />
+		<select name="addtype">
+			<option value="network"><?php echo T_('Local Network Definition'); ?></option>
+			<option value="stream"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('Stream Access')); ?></option>
+			<option selected="selected" value="all"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('All')); ?></option>
 
-<tr>
-	<td><?php echo T_('ACL Type'); ?>:</td>
-	<td colspan="3">
+<?php } else { ?>
 		<select name="type">
 			<option selected="selected" value="stream"><?php echo T_('Stream Access'); ?></option>
 			<option value="interface"><?php echo T_('Web Interface'); ?></option>
 			<option value="network"><?php echo T_('Local Network Definition'); ?></option>
-			<option value="rpc"><?php echo T_('RPC'); ?></option>
+			<option value="rpc"><?php echo T_('API/RPC'); ?></option>
+<?php } ?>
 		</select>
 	</td>
 </tr>
 <tr>
-	<td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td>
-</tr>
-<tr>
-	<td><?php echo T_('Remote Key'); ?>:</td>
-	<td colspan="3">
-		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['key']); ?>" maxlength="32" />
-	</td>
-</tr>
-
-<tr>
 	<td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3>
 		<span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span>
 	</td>
@@ -83,12 +81,24 @@
 	<td><?php echo T_('Start'); ?>:</td>
 	<td>
 		<?php Error::display('start'); ?>
-		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" maxlength="15" />
+		<input type="text" name="start" value="<?php 
+		if($action == 'show_add_current') {
+			echo scrub_out($_SERVER['REMOTE_ADDR']);
+		}
+		else {
+			echo scrub_out($_REQUEST['start']);
+		} ?>" size="20" maxlength="15" />
 	</td>
 	<td><?php echo T_('End'); ?>:</td>
 	<td>
 		<?php Error::display('end'); ?>
-		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" maxlength="15" />
+		<input type="text" name="end" value="<?php 
+		if($action == 'show_add_current') {
+			echo scrub_out($_SERVER['REMOTE_ADDR']);
+		}
+		else {
+			echo scrub_out($_REQUEST['end']);
+		} ?>" size="20" maxlength="15" />
 	</td>
 </tr>
 </table>
diff --git a/templates/show_add_access_current.inc.php b/templates/show_add_access_current.inc.php
deleted file mode 100644
index 1f1f18db..00000000
--- a/templates/show_add_access_current.inc.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
-/**
- * Show Add Access Current
- *
- *
- * LICENSE: GNU General Public License, version 2 (GPLv2)
- * Copyright (c) 2001 - 2011 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.
- *
- * @package	Ampache
- * @copyright	2001 - 2011 Ampache.org
- * @license	http://opensource.org/licenses/gpl-2.0 GPLv2
- * @link	http://www.ampache.org/
- */
-
-?>
-<?php show_box_top(T_('Add Current Host'), 'box box_add_access_current'); ?>
-<?php Error::display('general'); ?>
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=current">
-<table class="tabledata" cellpadding="5" cellspacing="0">
-<tr>
-	<td><?php echo T_('Name'); ?>:</td>
-	<td>
-		<input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('IPv4 or IPv6 Addresses'); ?>:</td>
-	<td><?php echo scrub_out($_SERVER['REMOTE_ADDR']); ?></td>
-<tr>
-	<td><?php echo T_('Level'); ?>:</td>
-	<td>
-		<input name="level" type="radio" value="5" /> <?php echo T_('View'); ?>
-		<input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?>
-		<input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?>
-		<input name="level" type="radio" value="75" /> <?php echo T_('All'); ?>
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('User'); ?>:</td>
-	<td>
-		<?php show_user_select('user'); ?>
-	</td>
-</tr>
-<tr>
-	<td colspan="2"><h4><?php echo T_('RPC Options'); ?></h4></td>
-</tr>
-<tr>
-	<td><?php echo T_('Remote Key'); ?>:</td>
-	<td>
-		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" maxlength="32" />
-	</td>
-</tr>
-</table>
-<div class="formValidation">
-		<?php echo Core::form_register('add_acl'); ?>
-		<input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" />
-</div>
-</form>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_add_access_local.inc.php b/templates/show_add_access_local.inc.php
deleted file mode 100644
index ef204483..00000000
--- a/templates/show_add_access_local.inc.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
-/**
- * Show Add Access Local
- *
- *
- * LICENSE: GNU General Public License, version 2 (GPLv2)
- * Copyright (c) 2001 - 2011 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.
- *
- * @package	Ampache
- * @copyright	2001 - 2011 Ampache.org
- * @license	http://opensource.org/licenses/gpl-2.0 GPLv2
- * @link	http://www.ampache.org/
- */
-
-?>
-<?php show_box_top(T_('Add Local Network Definition'), 'box box_add_access_local'); ?>
-<?php Error::display('general'); ?>
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=local">
-<table class="tabledata" cellpadding="5" cellspacing="0">
-<tr>
-	<td><?php echo T_('Name'); ?>:</td>
-	<td colspan="3">
-		<input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('Level'); ?>:</td>
-	<td colspan="3">
-		<input name="level" type="radio" value="5" /> <?php echo T_('View'); ?>
-		<input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?>
-		<input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?>
-		<input name="level" type="radio" value="75" /> <?php echo T_('All'); ?>
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('User'); ?>:</td>
-	<td colspan="3">
-		<?php show_user_select('user'); ?>
-	</td>
-</tr>
-
-<tr>
-	<td valign="top"><?php echo T_('Type'); ?>:</td>
-	<td colspan="3">
-		<input type="radio" name="addtype" value="network" /><?php echo T_('Local Network Definition'); ?><br />
-		<input type="radio" name="addtype" value="streamnetwork" /><?php echo T_('Local Network Definition'); ?> + <?php echo T_('Stream Access'); ?> + <?php echo T_('Web Interface'); ?><br />
-		<input type="radio" name="addtype" value="allnetwork" checked="checked" /><?php echo T_('Local Network Definition'); ?> + <?php echo T_('All'); ?><br />
-	</td>
-</tr>
-<tr>
-	<td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td>
-</tr>
-<tr>
-	<td><?php echo T_('Remote Key'); ?>:</td>
-	<td colspan="3">
-		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" maxlength="32" />
-	</td>
-</tr>
-
-<tr>
-	<td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3>
-		<span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span>
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('Start'); ?>:</td>
-	<td>
-		<?php Error::display('start'); ?>
-		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" />
-	</td>
-	<td><?php echo T_('End'); ?>:</td>
-	<td>
-		<?php Error::display('end'); ?>
-		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" />
-	</td>
-</tr>
-</table>
-<div class="formValidation">
-		<?php echo Core::form_register('add_acl'); ?>
-		<input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" />
-</div>
-</form>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_add_access_rpc.inc.php b/templates/show_add_access_rpc.inc.php
deleted file mode 100644
index ed9d8a8d..00000000
--- a/templates/show_add_access_rpc.inc.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
-/**
- * Show Add Access RPC
- *
- *
- * LICENSE: GNU General Public License, version 2 (GPLv2)
- * Copyright (c) 2001 - 2011 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.
- *
- * @package	Ampache
- * @copyright	2001 - 2011 Ampache.org
- * @license	http://opensource.org/licenses/gpl-2.0 GPLv2
- * @link	http://www.ampache.org/
- */
-
-?>
-<?php show_box_top(T_('Add API / RPC Host'), 'box box_add_access_rpc'); ?>
-<?php Error::display('general'); ?>
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=rpc">
-<table class="tabledata" cellpadding="5" cellspacing="0">
-<tr>
-	<td><?php echo T_('Name'); ?>:</td>
-	<td colspan="3">
-		<input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('Level'); ?>:</td>
-	<td colspan="3">
-		<input name="level" type="radio" value="5" /> <?php echo T_('View'); ?>
-		<input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?>
-		<input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?>
-		<input name="level" type="radio" value="75" /> <?php echo T_('All'); ?>
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('User'); ?>:</td>
-	<td colspan="3">
-		<?php show_user_select('user'); ?>
-	</td>
-</tr>
-
-<tr>
-	<td valign="top"><?php echo T_('Type'); ?>:</td>
-	<td colspan="3">
-		<input type="radio" name="addtype" value="rpc" /><?php echo T_('RPC'); ?><br />
-		<input type="radio" name="addtype" value="streamrpc" checked="checked" /><?php echo T_('RPC'); ?> + <?php echo T_('Stream Access'); ?><br />
-		<input type="radio" name="addtype" value="allrpc" /><?php echo T_('RPC'); ?> + <?php echo T_('All'); ?>
-	</td>
-</tr>
-<tr>
-	<td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td>
-</tr>
-<tr>
-	<td><?php echo T_('Remote Key'); ?>:</td>
-	<td colspan="3">
-		<input type="text" name="key" value="<?php echo scrub_out($_REQUEST['key']); ?>" maxlength="32" />
-	</td>
-</tr>
-
-<tr>
-	<td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3>
-		<span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span>
-	</td>
-</tr>
-<tr>
-	<td><?php echo T_('Start'); ?>:</td>
-	<td>
-		<?php Error::display('start'); ?>
-		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" />
-	</td>
-	<td><?php echo T_('End'); ?>:</td>
-	<td>
-		<?php Error::display('end'); ?>
-		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" />
-	</td>
-</tr>
-</table>
-<div class="formValidation">
-		<?php echo Core::form_register('add_acl'); ?>
-		<input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" />
-</div>
-</form>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index 28bd0f73..a17fba35 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -19,13 +19,7 @@
  * 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.
- *
- * @package	Ampache
- * @copyright	2001 - 2011 Ampache.org
- * @license	http://opensource.org/licenses/gpl-2.0 GPLv2
- * @link	http://www.ampache.org/
  */
-
 ?>
 <?php show_box_top(T_('Edit Access Control List')); ?>
 <form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>">
@@ -42,7 +36,7 @@
                         <option value="stream"<?php echo $sl_stream; ?>><?php echo T_('Stream Access'); ?></option>
                         <option value="interface"<?php echo $sl_interface; ?>><?php echo T_('Web Interface'); ?></option>
                         <option value="network"<?php echo $sl_network; ?>><?php echo T_('Local Network Definition'); ?></option>
-                        <option value="rpc"<?php echo $sl_rpc; ?>><?php echo T_('RPC'); ?></option>
+                        <option value="rpc"<?php echo $sl_rpc; ?>><?php echo T_('API/RPC'); ?></option>
                 </select>
         </td>
 
@@ -71,12 +65,6 @@
 	</td>
 </tr>
 <tr>
-	<td><?php echo T_('Remote Key'); ?></td>
-	<td colspan="3">
-		<input type="text" name="key" value="<?php echo scrub_out($access->key); ?>" size="32" maxlength="32" />
-	</td>
-</tr>
-<tr>
 	<td><?php echo T_('Level'); ?>:</td>
 	<td colspan="3">
 		<?php $name = 'level_' . $access->level; ${$name} = 'checked="checked"'; ?>