Code style services RFC2136

1 files changed, 148 insertions, 119 deletions

diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php
index ffe446b..6c3a8c2 100644
--- a/usr/local/www/services_rfc2136_edit.php
+++ b/usr/local/www/services_rfc2136_edit.php
@@ -40,29 +40,34 @@ if (!is_array($config['dnsupdates']['dnsupdate'])) {
 
 $a_rfc2136 = &$config['dnsupdates']['dnsupdate'];
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && isset($a_rfc2136[$id])) {
 	$pconfig['enable'] = isset($a_rfc2136[$id]['enable']);
 	$pconfig['host'] = $a_rfc2136[$id]['host'];
 	$pconfig['ttl'] = $a_rfc2136[$id]['ttl'];
-	if (!$pconfig['ttl'])
+	if (!$pconfig['ttl']) {
 		$pconfig['ttl'] = 60;
+	}
 	$pconfig['keydata'] = $a_rfc2136[$id]['keydata'];
 	$pconfig['keyname'] = $a_rfc2136[$id]['keyname'];
 	$pconfig['keytype'] = $a_rfc2136[$id]['keytype'];
-	if (!$pconfig['keytype'])
+	if (!$pconfig['keytype']) {
 		$pconfig['keytype'] = "zone";
+	}
 	$pconfig['server'] = $a_rfc2136[$id]['server'];
 	$pconfig['interface'] = $a_rfc2136[$id]['interface'];
 	$pconfig['usetcp'] = isset($a_rfc2136[$id]['usetcp']);
 	$pconfig['usepublicip'] = isset($a_rfc2136[$id]['usepublicip']);
 	$pconfig['recordtype'] = $a_rfc2136[$id]['recordtype'];
-	if (!$pconfig['recordtype'])
+	if (!$pconfig['recordtype']) {
 		$pconfig['recordtype'] = "both";
+	}
 	$pconfig['descr'] = $a_rfc2136[$id]['descr'];
 
 }
@@ -80,12 +85,15 @@ if ($_POST) {
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if (($_POST['host'] && !is_domain($_POST['host'])))  
+	if (($_POST['host'] && !is_domain($_POST['host']))) {
 		$input_errors[] = gettext("The DNS update host name contains invalid characters.");
-	if (($_POST['ttl'] && !is_numericint($_POST['ttl']))) 
+	}
+	if (($_POST['ttl'] && !is_numericint($_POST['ttl']))) {
 		$input_errors[] = gettext("The DNS update TTL must be an integer.");
-	if (($_POST['keyname'] && !is_domain($_POST['keyname'])))
+	}
+	if (($_POST['keyname'] && !is_domain($_POST['keyname']))) {
 		$input_errors[] = gettext("The DNS update key name contains invalid characters.");
+	}
 
 	if (!$input_errors) {
 		$rfc2136 = array();
@@ -102,24 +110,26 @@ if ($_POST) {
 		$rfc2136['interface'] = $_POST['interface'];
 		$rfc2136['descr'] = $_POST['descr'];
 
-		if (isset($id) && $a_rfc2136[$id])
+		if (isset($id) && $a_rfc2136[$id]) {
 			$a_rfc2136[$id] = $rfc2136;
-		else
+		} else {
 			$a_rfc2136[] = $rfc2136;
+		}
 
 		write_config(gettext("New/Edited RFC2136 dnsupdate entry was posted."));
 
-		if ($_POST['Submit'] == gettext("Save & Force Update"))
+		if ($_POST['Submit'] == gettext("Save & Force Update")) {
 			$retval = services_dnsupdate_process("", $rfc2136['host'], true);
-		else
+		} else {
 			$retval = services_dnsupdate_process();
+		}
 
 		header("Location: services_rfc2136.php");
 		exit;
 	}
 }
 
-$pgtitle = array(gettext("Services"),gettext("RFC 2136 client"), gettext("Edit"));
+$pgtitle = array(gettext("Services"), gettext("RFC 2136 client"), gettext("Edit"));
 include("head.inc");
 
 ?>
@@ -128,79 +138,90 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-            <form action="services_rfc2136_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="rfs2136 edit">
-			  	<tr>
-                  <td colspan="2" valign="top" class="optsect_t">
-				  <table border="0" cellspacing="0" cellpadding="0" width="100%" summary="title">
-				  	<tr><td class="optsect_s"><strong><?=gettext("RFC 2136 client");?></strong></td></tr>
-				  </table>
-				  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
-				  <td width="78%" class="vtable">
-				    <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> />
-				  </td>
-                </tr>
-				<tr>
-				   <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface to monitor");?></td>  
-				   <td width="78%" class="vtable">
-				   <select name="interface" class="formselect" id="interface">
-				   <?php $iflist = get_configured_interface_with_descr();
-				   		foreach ($iflist as $if => $ifdesc):?>
-							<option value="<?=$if;?>" <?php if ($pconfig['interface'] == $if) echo "selected=\"selected\"";?>><?=$ifdesc;?></option>
-					<?php endforeach; ?>
-					</select>
-					</td>
-				</tr>	
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>" />
-			<br /><span>Fully qualified hostname of the host to be updated</span>
-                  </td>
-				</tr>
-                <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("TTL"); ?></td>
-                  <td class="vtable">
-                    <input name="ttl" type="text" class="formfld unknown" id="ttl" size="6" value="<?=htmlspecialchars($pconfig['ttl']);?>" />
-                  <?=gettext("seconds");?></td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Key name");?></td>
-                  <td class="vtable">
-                    <input name="keyname" type="text" class="formfld unknown" id="keyname" size="30" value="<?=htmlspecialchars($pconfig['keyname']);?>" />
-                    <br />
-                    <?=gettext("This must match the setting on the DNS server.");?></td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Key type");?> </td>
-                  <td class="vtable">
-				  <input name="keytype" type="radio" value="zone" <?php if ($pconfig['keytype'] == "zone") echo "checked=\"checked\""; ?> /> <?=gettext("Zone");?> &nbsp;
-                  <input name="keytype" type="radio" value="host" <?php if ($pconfig['keytype'] == "host") echo "checked=\"checked\""; ?> /> <?=gettext("Host");?> &nbsp;
-                  <input name="keytype" type="radio" value="user" <?php if ($pconfig['keytype'] == "user") echo "checked=\"checked\""; ?> /><?=gettext(" User");?>
-				</td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Key");?></td>
-                  <td class="vtable">
-                    <input name="keydata" type="text" class="formfld unknown" id="keydata" size="70" value="<?=htmlspecialchars($pconfig['keydata']);?>" />
-                    <br />
-                    <?=gettext("Paste an HMAC-MD5 key here.");?></td>
-				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Server");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="server" type="text" class="formfld unknown" id="server" size="30" value="<?=htmlspecialchars($pconfig['server'])?>" />
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="usetcp" type="checkbox" id="usetcp" value="<?=gettext("yes");?>" <?php if ($pconfig['usetcp']) echo "checked=\"checked\""; ?> />
-                    <strong><?=gettext("Use TCP instead of UDP");?></strong></td>
-				</tr>
+<form action="services_rfc2136_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="rfs2136 edit">
+		<tr>
+			<td colspan="2" valign="top" class="optsect_t">
+				<table border="0" cellspacing="0" cellpadding="0" width="100%" summary="title">
+					<tr>
+						<td class="optsect_s">
+							<strong><?=gettext("RFC 2136 client");?></strong>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
+			<td width="78%" class="vtable">
+				<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> />
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Interface to monitor");?></td>
+			<td width="78%" class="vtable">
+				<select name="interface" class="formselect" id="interface">
+				<?php
+					$iflist = get_configured_interface_with_descr();
+					foreach ($iflist as $if => $ifdesc):?>
+					<option value="<?=$if;?>" <?php if ($pconfig['interface'] == $if) echo "selected=\"selected\"";?>><?=$ifdesc;?></option>
+				<?php
+					endforeach;
+				?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname");?></td>
+			<td width="78%" class="vtable">
+				<input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>" />
+				<br /><span>Fully qualified hostname of the host to be updated</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("TTL"); ?></td>
+			<td class="vtable">
+				<input name="ttl" type="text" class="formfld unknown" id="ttl" size="6" value="<?=htmlspecialchars($pconfig['ttl']);?>" />
+				<?=gettext("seconds");?>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("Key name");?></td>
+			<td class="vtable">
+				<input name="keyname" type="text" class="formfld unknown" id="keyname" size="30" value="<?=htmlspecialchars($pconfig['keyname']);?>" />
+				<br />
+				<?=gettext("This must match the setting on the DNS server.");?>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("Key type");?> </td>
+			<td class="vtable">
+				<input name="keytype" type="radio" value="zone" <?php if ($pconfig['keytype'] == "zone") echo "checked=\"checked\""; ?> /> <?=gettext("Zone");?> &nbsp;
+				<input name="keytype" type="radio" value="host" <?php if ($pconfig['keytype'] == "host") echo "checked=\"checked\""; ?> /> <?=gettext("Host");?> &nbsp;
+				<input name="keytype" type="radio" value="user" <?php if ($pconfig['keytype'] == "user") echo "checked=\"checked\""; ?> /><?=gettext(" User");?>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("Key");?></td>
+			<td class="vtable">
+				<input name="keydata" type="text" class="formfld unknown" id="keydata" size="70" value="<?=htmlspecialchars($pconfig['keydata']);?>" />
+				<br />
+				<?=gettext("Paste an HMAC-MD5 key here.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Server");?></td>
+			<td width="78%" class="vtable">
+				<input name="server" type="text" class="formfld unknown" id="server" size="30" value="<?=htmlspecialchars($pconfig['server'])?>" />
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol");?></td>
+			<td width="78%" class="vtable">
+				<input name="usetcp" type="checkbox" id="usetcp" value="<?=gettext("yes");?>" <?php if ($pconfig['usetcp']) echo "checked=\"checked\""; ?> />
+				<strong><?=gettext("Use TCP instead of UDP");?></strong>
+			</td>
+		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Use Public IP");?></td>
 			<td width="78%" class="vtable">
@@ -208,39 +229,47 @@ include("head.inc");
 				<strong><?=gettext("If the interface IP is private, attempt to fetch and use the public IP instead.");?></strong>
 			</td>
 		</tr>
-                <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Record Type");?> </td>
-                  <td class="vtable">
-                    <input name="recordtype" type="radio" value="A" <?php if ($pconfig['recordtype'] == "A") echo "checked=\"checked\""; ?> /> <?=gettext("A (IPv4)");?> &nbsp;
-                    <input name="recordtype" type="radio" value="AAAA" <?php if ($pconfig['recordtype'] == "AAAA") echo "checked=\"checked\""; ?> /> <?=gettext("AAAA (IPv6)");?> &nbsp;
-                    <input name="recordtype" type="radio" value="both" <?php if ($pconfig['recordtype'] == "both") echo "checked=\"checked\""; ?> /> <?=gettext("Both");?>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-					<a href="services_rfc2136.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a>
-					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save &amp; Force Update");?>" onclick="enable_change(true)" />
-					<?php if (isset($id) && $a_rfc2136[$id]): ?>
-						<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-					<?php endif; ?>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
-                    </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem: " .
-                    "General setup %sor allow the DNS server list to be overridden " .
-                    "by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">', '</a>');?></span></td>
-                </tr>
-              </table>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("Record Type");?> </td>
+			<td class="vtable">
+				<input name="recordtype" type="radio" value="A" <?php if ($pconfig['recordtype'] == "A") echo "checked=\"checked\""; ?> /> <?=gettext("A (IPv4)");?> &nbsp;
+				<input name="recordtype" type="radio" value="AAAA" <?php if ($pconfig['recordtype'] == "AAAA") echo "checked=\"checked\""; ?> /> <?=gettext("AAAA (IPv6)");?> &nbsp;
+				<input name="recordtype" type="radio" value="both" <?php if ($pconfig['recordtype'] == "both") echo "checked=\"checked\""; ?> /> <?=gettext("Both");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+				<a href="services_rfc2136.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a>
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save &amp; Force Update");?>" onclick="enable_change(true)" />
+				<?php if (isset($id) && $a_rfc2136[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<span class="vexpl">
+					<span class="red">
+						<strong>
+							<?=gettext("Note:");?><br />
+						</strong>
+					</span>
+					<?php printf(gettext("You must configure a DNS server in %sSystem: " .
+						"General setup %sor allow the DNS server list to be overridden " .
+						"by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">', '</a>');?>
+				</span>
+			</td>
+		</tr>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>