Code style www services captive portal

1 files changed, 117 insertions, 89 deletions

diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php
index 03afc59..939fb23 100644
--- a/usr/local/www/services_captiveportal_hostname.php
+++ b/usr/local/www/services_captiveportal_hostname.php
@@ -49,36 +49,40 @@ require("shaper.inc");
 require("captiveportal.inc");
 
 $cpzone = $_GET['zone'];
-if (isset($_POST['zone']))
+if (isset($_POST['zone'])) {
 	$cpzone = $_POST['zone'];
+}
 
 if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
-        header("Location: services_captiveportal_zones.php");
-        exit;
+	header("Location: services_captiveportal_zones.php");
+	exit;
 }
 
-if (!is_array($config['captiveportal']))
+if (!is_array($config['captiveportal'])) {
 	$config['captiveportal'] = array();
+}
 $a_cp =& $config['captiveportal'];
 
-if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid']))
+if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) {
 	$cpzoneid = $a_cp[$cpzone]['zoneid'];
+}
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']);
+$pgtitle = array(gettext("Services"), gettext("Captive portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) {
 	$a_allowedhostnames =& $a_cp[$cpzone]['allowedhostname'];
 	if ($a_allowedhostnames[$_GET['id']]) {
 		$ipent = $a_allowedhostnames[$_GET['id']];
-		
+
 		if (isset($a_cp[$cpzone]['enable'])) {
-			if(is_ipaddr($ipent['hostname']))
+			if (is_ipaddr($ipent['hostname'])) {
 				$ip = $ipent['hostname'];
-			else
+			} else {
 				$ip = gethostbyname($ipent['hostname']);
+			}
 			$sn = (is_ipaddrv6($ip)) ? 128 : 32;
-			if(is_ipaddr($ip)) {
+			if (is_ipaddr($ip)) {
 				$ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $ip);
 				if (is_array($ipfw)) {
 					captiveportal_free_dn_ruleno($ipfw['dnpipe']);
@@ -89,7 +93,7 @@ if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) {
 				pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 4, $ip, $sn);
 			}
 		}
-			
+
 		unset($a_allowedhostnames[$_GET['id']]);
 		write_config();
 		captiveportal_allowedhostname_configure();
@@ -107,7 +111,8 @@ include("head.inc");
 <input type="hidden" name="zone" id="zone" value="<?=htmlspecialchars($cpzone);?>" />
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="captiveportal hostname">
-  <tr><td class="tabnavtbl">
+	<tr>
+		<td class="tabnavtbl">
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Captive portal(s)"), false, "services_captiveportal.php?zone={$cpzone}");
@@ -118,86 +123,109 @@ include("head.inc");
 	$tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}");
 	display_top_tabs($tab_array, true);
 ?>
-  </td></tr>
-  <tr>
-  <td class="tabcont">
-  <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="main">
-	<tr>
-	  <td width="60%" class="listhdrr"><?=gettext("Hostname"); ?></td>
-	  <td width="40%" class="listhdr"><?=gettext("Description"); ?></td>
-	  <td width="10%" class="list">
-		<table border="0" cellspacing="0" cellpadding="1" summary="add">
-		   <tr>
-			<td width="17" height="17"></td>
-			<td><a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add address"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
-		   </tr>
-		</table>
-	  </td>
-	</tr>
-<?php	if (is_array($a_cp[$cpzone]['allowedhostname'])):
-		$i = 0;	foreach ($a_cp[$cpzone]['allowedhostname'] as $ip): ?>
-	<tr ondblclick="document.location='services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>&amp;id=<?=$i;?>'">
-	  <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=\"middle\" alt=\"in\" /> ";
-		}
-		if($ip['dir'] == "both") {
-			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"pass\" />   ";
-		}
-		echo strtolower($ip['hostname']);
-		if($ip['dir'] == "from") {
-			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"in\" /> any";
-		}
-		
-		?>	
-	  </td>
-	  <td class="listbg">
-		<?=htmlspecialchars($ip['descr']);?>&nbsp;
-	  </td>
-	  <td valign="middle" class="list nowrap"> <a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>&amp;id=<?=$i;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit address"); ?>" width="17" height="17" border="0" alt="add" /></a>
-		 &nbsp;<a href="services_captiveportal_hostname.php?zone=<?=$cpzone;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this address?"); ?>')"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete address"); ?>" width="17" height="17" border="0" alt="delete" /></a></td>
-	</tr>
-  <?php $i++; endforeach; endif;  ?>
-	<tr>
-	  <td class="list" colspan="2">&nbsp;</td>
-	  <td class="list">
-		<table border="0" cellspacing="0" cellpadding="1" summary="add">
-		   <tr>
-			<td width="17" height="17"></td>
-			<td><a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add address"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
-		   </tr>
-		</table>
-	  </td>
+		</td>
 	</tr>
 	<tr>
-	<td colspan="2" class="list"><p class="vexpl"><span class="red"><strong>
-	  <?=gettext("Note:"); ?><br />
-	  </strong></span>
-	  <?=gettext("Adding allowed Hostnames will allow a DNS hostname access to/from access through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal."); ?></p>
-	  <table border="0" cellspacing="0" cellpadding="0" summary="icons">
-		<tr>
-		  <td><span class="vexpl"><?=gettext("any"); ?> <img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="middle" alt="in" /> x.x.x.x </span></td>
-		  <td><span class="vexpl"><?=gettext("All connections"); ?> <strong><?=gettext("to"); ?></strong> <?=gettext("the Hostname are allowed"); ?></span></td>
-		</tr>
-		<tr>
-		  <td colspan="5" height="4"></td>
-		</tr>
-		<tr>
-		  <td>x.x.x.x <span class="vexpl"><img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="middle" alt="in" /></span> <?=gettext("any"); ?>&nbsp;&nbsp;&nbsp; </td>
-		  <td><span class="vexpl"><?=gettext("All connections"); ?> <strong><?=gettext("from"); ?></strong> <?=gettext("the Hostname 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" alt="pass" /></span>&nbsp;&nbsp;&nbsp;&nbsp; </td>
-		  <td><span class="vexpl"> All connections <strong>to</strong> and <strong>from</strong> the Hostname are allowed </span></td>
+		<td class="tabcont">
+			<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="main">
+				<tr>
+					<td width="60%" class="listhdrr"><?=gettext("Hostname"); ?></td>
+					<td width="40%" class="listhdr"><?=gettext("Description"); ?></td>
+					<td width="10%" class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add">
+							<tr>
+								<td width="17" height="17"></td>
+								<td>
+									<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add address"); ?>" width="17" height="17" border="0" alt="add" /></a>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+<?php
+	if (is_array($a_cp[$cpzone]['allowedhostname'])):
+		$i = 0;
+		foreach ($a_cp[$cpzone]['allowedhostname'] as $ip):
+?>
+				<tr ondblclick="document.location='services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>&amp;id=<?=$i;?>'">
+					<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=\"middle\" alt=\"in\" /> ";
+			}
+			if ($ip['dir'] == "both") {
+				echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"pass\" />   ";
+			}
+			echo strtolower($ip['hostname']);
+			if ($ip['dir'] == "from") {
+				echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"in\" /> any";
+			}
+?>
+					</td>
+					<td class="listbg">
+						<?=htmlspecialchars($ip['descr']);?>&nbsp;
+					</td>
+					<td valign="middle" class="list nowrap">
+						<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>&amp;id=<?=$i;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit address"); ?>" width="17" height="17" border="0" alt="add" /></a>
+						&nbsp;<a href="services_captiveportal_hostname.php?zone=<?=$cpzone;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this address?"); ?>')"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete address"); ?>" width="17" height="17" border="0" alt="delete" /></a>
+					</td>
+				</tr>
+<?php
+			$i++;
+		endforeach;
+	endif;
+?>
+				<tr>
+					<td class="list" colspan="2">&nbsp;</td>
+					<td class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add">
+							<tr>
+								<td width="17" height="17"></td>
+								<td>
+									<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone;?>"><img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add address"); ?>" width="17" height="17" border="0" alt="add" /></a>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="list">
+						<p class="vexpl">
+							<span class="red">
+								<strong>
+									<?=gettext("Note:"); ?><br />
+								</strong>
+							</span>
+							<?=gettext("Adding allowed Hostnames will allow a DNS hostname access to/from access through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal."); ?>
+						</p>
+						<table border="0" cellspacing="0" cellpadding="0" summary="icons">
+							<tr>
+								<td>
+									<span class="vexpl"><?=gettext("any"); ?> <img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="middle" alt="in" /> x.x.x.x </span>
+								</td>
+								<td>
+									<span class="vexpl"><?=gettext("All connections"); ?> <strong><?=gettext("to"); ?></strong> <?=gettext("the Hostname are allowed"); ?></span>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="5" height="4"></td>
+							</tr>
+							<tr>
+								<td>x.x.x.x <span class="vexpl"><img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="middle" alt="in" /></span> <?=gettext("any"); ?>&nbsp;&nbsp;&nbsp; </td>
+								<td><span class="vexpl"><?=gettext("All connections"); ?> <strong><?=gettext("from"); ?></strong> <?=gettext("the Hostname 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" alt="pass" /></span>&nbsp;&nbsp;&nbsp;&nbsp; </td>
+								<td><span class="vexpl"> All connections <strong>to</strong> and <strong>from</strong> the Hostname are allowed </span></td>
+							</tr>
+						</table>
+					</td>
+					<td class="list">&nbsp;</td>
+				</tr>
+			</table>
+		</td>
 		</tr>
-	  </table></td>
-	<td class="list">&nbsp;</td>
-	</tr>
-  </table>
-  </td>
-  </tr>
-  </table>
+</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>