From c4e0fc8bf46f473df6c97db46eb0eb13c87b5154 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 22 Apr 2010 21:15:34 +0000
Subject: Remove all code for directions it is not needed any more on
 passthrough ip's.

---
 usr/local/www/services_captiveportal_ip.php      |  6 ------
 usr/local/www/services_captiveportal_ip_edit.php | 24 +++---------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index 1da30a1..964163f 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -104,13 +104,7 @@ include("head.inc");
   <?php $i = 0; foreach ($a_allowedips as $ip): ?>
 	<tr>
 	  <td class="listlr">
-		<?php if($ip['dir'] == "to")
-			echo "any <img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\">";
-		?>
 		<?=strtolower($ip['ip']);?>
-		<?php if($ip['dir'] == "from")
-			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> any";
-		?>
 	  </td>
 	  <td class="listbg">
 		<?=htmlspecialchars($ip['descr']);?>&nbsp;
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index f3b297c..24bd4a0 100755
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -78,8 +78,8 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	/* input validation */
-	$reqdfields = explode(" ", "ip dir");
-	$reqdfieldsn = explode(",", "Allowed IP address,Direction");
+	$reqdfields = explode(" ", "ip");
+	$reqdfieldsn = explode(",", "Allowed IP address");
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 	
@@ -95,7 +95,7 @@ if ($_POST) {
 		if (isset($id) && ($a_allowedips[$id]) && ($a_allowedips[$id] === $ipent))
 			continue;
 		
-		if (($ipent['dir'] == $_POST['dir']) && ($ipent['ip'] == $_POST['ip'])){
+		if ($ipent['ip'] == $_POST['ip']){
 			$input_errors[] = "[" . $_POST['ip'] . "] already allowed." ;
 			break ;
 		}	
@@ -148,24 +148,6 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
             <form action="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
-<?php if (false): ?>
-		<tr>
-                  <td width="22%" valign="top" class="vncellreq">Direction</td>
-                  <td width="78%" class="vtable"> 
-					<select name="dir" class="formselect">
-					<?php 
-					$dirs = explode(" ", "From To") ;
-					foreach ($dirs as $dir): ?>
-					<option value="<?=strtolower($dir);?>" <?php if (strtolower($dir) == strtolower($pconfig['dir'])) echo "selected";?> >
-					<?=htmlspecialchars($dir);?>
-					</option>
-					<?php endforeach; ?>
-					</select>
-                    <br> 
-                    <span class="vexpl">Use <em>From</em> to always allow an IP address through the captive portal (without authentication). 
-                    Use <em>To</em> to allow access from all clients (even non-authenticated ones) behind the portal to this IP address.</span></td>
-                </tr>
-<?php endif; ?>
 		<tr>
                   <td width="22%" valign="top" class="vncellreq">IP address</td>
                   <td width="78%" class="vtable"> 
-- 
cgit v1.1