Clean up the ACL UI a bit

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

1 files changed, 34 insertions, 24 deletions

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>