diff options
| author | Chris Buechler <cmb@pfsense.org> | 2010-07-28 03:18:23 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2010-07-28 03:18:23 -0400 |
| commit | 23b517ab6033db36a08b3f22f530122ec98aabd9 (patch) | |
| tree | 139ac3467182a25deae1bc5898ada02eef404d68 /usr/local | |
| parent | d83dccfff97f6354644deb863c6b8508656b9f84 (diff) | |
| download | pfsense-23b517ab6033db36a08b3f22f530122ec98aabd9.zip pfsense-23b517ab6033db36a08b3f22f530122ec98aabd9.tar.gz | |
fix several cosmetic issues. add an icon type for the "both" direction, fix icons for other directions
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 26 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_ip_edit.php | 4 |
2 files changed, 22 insertions, 8 deletions
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 1979519..171f583 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -115,13 +115,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']);?> @@ -158,6 +168,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> any </td> <td><span class="vexpl">All connections <strong>from</strong> 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> diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 633900d..e6eab55 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -174,13 +174,13 @@ include("head.inc"); <td width="22%" valign="top" class="vncellreq">IP address</td> <td width="78%" class="vtable"> <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="17" value="<?=htmlspecialchars($pconfig['ip']);?>"> - <select name='sn' class="formselect" id='sn'> + /<select name='sn' class="formselect" id='sn'> <?php for ($i = 32; $i >= 1; $i--): ?> <option value="<?=$i;?>" <?php if ($i == $pconfig['sn']) echo "selected"; ?>><?=$i;?></option> <?php endfor; ?> </select> <br> - <span class="vexpl">IP address</span></td> + <span class="vexpl">IP address and subnet mask. Use /32 for a single IP.</span></td> </tr> <tr> <td width="22%" valign="top" class="vncell">Description</td> |
