diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:11:57 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:11:57 -0300 |
| commit | 4daa45d861ab448da4fdc910619a4ab6b213bc50 (patch) | |
| tree | 4a432f7120d120443156e3cf3cf950d74f30ada8 /usr/local/www/services_captiveportal_ip.php | |
| parent | eb4ae8913eb745580cc0b5da2fb74d6f9590961c (diff) | |
| parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
| download | pfsense-4daa45d861ab448da4fdc910619a4ab6b213bc50.zip pfsense-4daa45d861ab448da4fdc910619a4ab6b213bc50.tar.gz | |
Merge remote branch 'mainline/master' into 4_load_balancer_and_services
Conflicts:
usr/local/www/services_captiveportal_ip_edit.php
usr/local/www/services_captiveportal_mac_edit.php
usr/local/www/services_dhcp_edit.php
usr/local/www/services_rfc2136.php
usr/local/www/services_snmp.php
Diffstat (limited to 'usr/local/www/services_captiveportal_ip.php')
| -rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index f538988..2eedce3 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -60,10 +60,16 @@ if ($_GET['act'] == "del") { $ipent = $a_allowedips[$_GET['id']]; if (isset($config['captiveportal']['enable'])) { + if (!empty($ipent['sn'])) + $ipent['ip'] .= "/{$ipent['sn']}"; mwexec("/sbin/ipfw table 3 delete " . $ipent['ip']); mwexec("/sbin/ipfw table 4 delete " . $ipent['ip']); mwexec("/sbin/ipfw table 5 delete " . $ipent['ip']); mwexec("/sbin/ipfw table 6 delete " . $ipent['ip']); + mwexec("/sbin/ipfw table 7 delete " . $ipent['ip']); + mwexec("/sbin/ipfw table 8 delete " . $ipent['ip']); + mwexec("/sbin/ipfw table 9 delete " . $ipent['ip']); + mwexec("/sbin/ipfw table 10 delete " . $ipent['ip']); } unset($a_allowedips[$_GET['id']]); @@ -110,13 +116,23 @@ include("head.inc"); <?php $i = 0; foreach ($a_allowedips as $ip): ?> <tr ondblclick="document.location='services_captiveportal_ip_edit.php?id=<?=$i;?>'"> <td class="listlr"> - <?php if($ip['dir'] == "to") - echo "any <img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\">"; + <?php + if($ip['dir'] == "to") { + echo "any <img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> "; + } + if($ip['dir'] == "both") { + echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> "; + } + echo strtolower($ip['ip']); + if($ip['sn'] != "32" && is_numeric($ip['sn'])) { + $sn = $ip['sn']; + echo "/$sn"; + } + if($ip['dir'] == "from") { + echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> any"; + } + ?> - <?=strtolower($ip['ip']);?> - <?php if($ip['dir'] == "from") - echo "<img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> any"; - ?> </td> <td class="listbg"> <?=htmlspecialchars($ip['descr']);?> @@ -153,6 +169,10 @@ include("head.inc"); <td>x.x.x.x <span class="vexpl"><img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"></span> <?=gettext("any"); ?> </td> <td><span class="vexpl"><?=gettext("All connections"); ?> <strong><?=gettext("from"); ?></strong> <?=gettext("the IP address are allowed"); ?> </span></td> </tr> + <tr> + <td><span class="vexpl"><img src="/themes/<?=$g['theme'];?>/images/icons/icon_pass.gif" width="11" height="11" align="right"></span> </td> + <td><span class="vexpl"> All connections <strong>to</strong> and <strong>from</strong> the IP address are allowed </span></td> + </tr> </table></td> <td class="list"> </td> </tr> |
