Fix whitespace formatting.

1 files changed, 184 insertions, 181 deletions

diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 55d8646..defb275 100755
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -28,7 +28,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/*	
+/*
 	pfSense_MODULE:	dnsforwarder
 */
 
@@ -44,18 +44,18 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 
-$pconfig['enable']  = isset($config['dnsmasq']['enable']);
+$pconfig['enable'] = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);
 $pconfig['regdhcpstatic'] = isset($config['dnsmasq']['regdhcpstatic']);
 
-if (!is_array($config['dnsmasq']['hosts'])) 
+if (!is_array($config['dnsmasq']['hosts']))
 	$config['dnsmasq']['hosts'] = array();
 
-if (!is_array($config['dnsmasq']['domainoverrides'])) 
-       $config['dnsmasq']['domainoverrides'] = array();
+if (!is_array($config['dnsmasq']['domainoverrides']))
+	$config['dnsmasq']['domainoverrides'] = array();
 
 
-$a_hosts 	   = &$config['dnsmasq']['hosts'];
+$a_hosts = &$config['dnsmasq']['hosts'];
 $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
 
 if ($_POST) {
@@ -80,24 +80,24 @@ if ($_POST) {
 }
 
 if ($_GET['act'] == "del") {
-       if ($_GET['type'] == 'host') {
-               if ($a_hosts[$_GET['id']]) {
-                       unset($a_hosts[$_GET['id']]);
-                       write_config();
+	if ($_GET['type'] == 'host') {
+		if ($a_hosts[$_GET['id']]) {
+			unset($a_hosts[$_GET['id']]);
+			write_config();
 			mark_subsystem_dirty('hosts');
-                       header("Location: services_dnsmasq.php");
-                       exit;
-               }
-       }
-       elseif ($_GET['type'] == 'doverride') {
-               if ($a_domainOverrides[$_GET['id']]) {
-                       unset($a_domainOverrides[$_GET['id']]);
-                       write_config();
+			header("Location: services_dnsmasq.php");
+			exit;
+		}
+	}
+	elseif ($_GET['type'] == 'doverride') {
+		if ($a_domainOverrides[$_GET['id']]) {
+			unset($a_domainOverrides[$_GET['id']]);
+			write_config();
 			mark_subsystem_dirty('hosts');
-                       header("Location: services_dnsmasq.php");
-                       exit;
-               }
-       }
+			header("Location: services_dnsmasq.php");
+			exit;
+		}
+	}
 }
 
 $pgtitle = array(gettext("Services"),gettext("DNS forwarder"));
@@ -123,170 +123,173 @@ function enable_change(enable_over) {
 <?php if (is_subsystem_dirty('hosts')): ?><p>
 <?php print_info_box_np(gettext("The DNS forwarder configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-                <tr>
-                  <td class="vtable"><p>
-                      <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?> onClick="enable_change(false)">
-                      <strong><?=gettext("Enable DNS forwarder");?><br>
-                      </strong></p></td>
-                </tr>
-                <tr>
-                  <td class="vtable"><p>
-                      <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked";?>>
-                      <strong><?=gettext("Register DHCP leases in DNS forwarder");?><br>
-                      </strong><?php printf(gettext("If this option is set, then machines that specify".
-                     " their hostname when requesting a DHCP lease will be registered".
-                     " in the DNS forwarder, so that their name can be resolved.".
-                     " You should also set the domain in %sSystem:".
-                     " General setup%s to the proper value."),'<a href="system.php">','</a>')?></p>
-                    </td>
-                </tr>
-                <tr>
-                  <td class="vtable"><p>
-                      <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked";?>>
-                      <strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br>
-                      </strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
-					  "be registered in the DNS forwarder, so that their name can be ".
-					  "resolved. You should also set the domain in %s".
-					  "System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p>
-                    </td>
-                </tr>				
-                <tr>
-                  <td> <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
-                  </td>
-                </tr>
-                <tr>
-                  <td><p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
-                      </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
-                     " service (if enabled) will automatically serve the LAN IP".
-                     " address as a DNS server to DHCP clients so they will use".
-                     " the forwarder. The DNS forwarder will use the DNS servers".
-                     " entered in %sSystem: General setup%s".
-                     " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
-                     " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-                     " is checked. If you don't use that option (or if you use".
-                     " a static IP address on WAN), you must manually specify at".
-                     " least one DNS server on the %sSystem:".
-                      "General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br>
-                      <br>
-                      <?=gettext("You may enter records that override the results from the".
-                     " forwarders below.");?></span></p></td>
-                </tr>
-        </table>
-        &nbsp;<br>
-        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="sortable">
-		<thead>
-                <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Host");?></td>
-                  <td width="25%" class="listhdrr"><?=gettext("Domain");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("IP");?></td>
-                  <td width="25%" class="listhdr"><?=gettext("Description");?></td>
-                  <td width="10%" class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-			<td width="17"></td>
-                        <td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-		  </td>
-		</tr>
-		</thead>
-		<tbody>
-			  <?php $i = 0; foreach ($a_hosts as $hostent): ?>
-                <tr>
-                  <td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
-                    <?=strtolower($hostent['host']);?>&nbsp;
-                  </td>
-                  <td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
-                    <?=strtolower($hostent['domain']);?>&nbsp;
-                  </td>
-                  <td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
-                    <?=$hostent['ip'];?>&nbsp;
-                  </td>
-                  <td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
-                    <?=htmlspecialchars($hostent['descr']);?>&nbsp;
-                  </td>
-                  <td valign="middle" nowrap class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td><a href="services_dnsmasq.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-		      </tr>
-                   </table>
-                </tr>
-		<?php $i++; endforeach; ?>
-		</tbody>
-		<tfoot>
-                <tr>
-                  <td class="list" colspan="4"></td>
-                  <td class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-			<td width="17"></td>
-                        <td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-		   </td>
+<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tr>
+		<td class="vtable"><p>
+			<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?> onClick="enable_change(false)">
+			<strong><?=gettext("Enable DNS forwarder");?><br>
+			</strong></p></td>
 		</tr>
-		</tfoot>
-	</table>
-<!-- update to enable domain overrides -->
-        <table width="100%" border="0" cellpadding="6" cellspacing="0">
-	       <tr><td>&nbsp;</td></tr>
-               <tr>
-                 <td><p><?=gettext("Below you can override an entire domain by specifying an".
-                       " authoritative DNS server to be queried for that domain.");?></p></td>
-               </tr>
-        </table>
-	&nbsp;<br>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0" class="sortable">
-		<thead>
-               <tr>
-                 <td width="35%" class="listhdrr"><?=gettext("Domain");?></td>
-                 <td width="20%" class="listhdrr"><?=gettext("IP");?></td>
-                 <td width="35%" class="listhdr"><?=gettext("Description");?></td>
-                 <td width="10%" class="list">
+	<tr>
+		<td class="vtable"><p>
+			<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked";?>>
+			<strong><?=gettext("Register DHCP leases in DNS forwarder");?><br>
+			</strong><?php printf(gettext("If this option is set, then machines that specify".
+			" their hostname when requesting a DHCP lease will be registered".
+			" in the DNS forwarder, so that their name can be resolved.".
+			" You should also set the domain in %sSystem:".
+			" General setup%s to the proper value."),'<a href="system.php">','</a>')?></p>
+		</td>
+	</tr>
+	<tr>
+		<td class="vtable"><p>
+			<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked";?>>
+			<strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br>
+			</strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
+					"be registered in the DNS forwarder, so that their name can be ".
+					"resolved. You should also set the domain in %s".
+					"System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+			</strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
+			" service (if enabled) will automatically serve the LAN IP".
+			" address as a DNS server to DHCP clients so they will use".
+			" the forwarder. The DNS forwarder will use the DNS servers".
+			" entered in %sSystem: General setup%s".
+			" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
+			" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
+			" is checked. If you don't use that option (or if you use".
+			" a static IP address on WAN), you must manually specify at".
+			" least one DNS server on the %sSystem:".
+			"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br>
+			<br>
+			<?=gettext("You may enter records that override the results from the".
+			" forwarders below.");?></span></p>
+		</td>
+	</tr>
+</table>
+&nbsp;<br>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="sortable">
+	<thead>
+	<tr>
+		<td width="20%" class="listhdrr"><?=gettext("Host");?></td>
+		<td width="25%" class="listhdrr"><?=gettext("Domain");?></td>
+		<td width="20%" class="listhdrr"><?=gettext("IP");?></td>
+		<td width="25%" class="listhdr"><?=gettext("Description");?></td>
+		<td width="10%" class="list">
 			<table border="0" cellspacing="0" cellpadding="1">
-			    <tr>
-				<td width="17" heigth="17"></td>			
-				<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-			    </tr>
+				<tr>
+					<td width="17"></td>
+					<td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+				</tr>
 			</table>
-		 </td>
-                              </tr>
-		</thead>
-		<tbody>
-                        <?php $i = 0; foreach ($a_domainOverrides as $doment): ?>
-               <tr>
-                 <td class="listlr">
-                   <?=strtolower($doment['domain']);?>&nbsp;
-                 </td>
-                 <td class="listr">
-                   <?=$doment['ip'];?>&nbsp;
-                 </td>
-                 <td class="listbg">
-                   <?=htmlspecialchars($doment['descr']);?>&nbsp;
-                 </td>
-                 <td valign="middle" nowrap class="list"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                    &nbsp;<a href="services_dnsmasq.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-                              </tr>
-                        <?php $i++; endforeach; ?>
-		</tbody>
-		<tfoot>
-               <tr>
-                 <td class="list" colspan="3"></td>
-                 <td class="list">
+		</td>
+	</tr>
+	</thead>
+	<tbody>
+	<?php $i = 0; foreach ($a_hosts as $hostent): ?>
+	<tr>
+		<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
+			<?=strtolower($hostent['host']);?>&nbsp;
+		</td>
+		<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
+			<?=strtolower($hostent['domain']);?>&nbsp;
+		</td>
+		<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
+			<?=$hostent['ip'];?>&nbsp;
+		</td>
+		<td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
+			<?=htmlspecialchars($hostent['descr']);?>&nbsp;
+		</td>
+		<td valign="middle" nowrap class="list">
 			<table border="0" cellspacing="0" cellpadding="1">
-			    <tr>
-				<td width="17" heigth="17"></td>			
-				<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-			    </tr>
+				<tr>
+					<td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+					<td><a href="services_dnsmasq.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+				</tr>
 			</table>
-		 </td>
-		</tr>
-		</tfoot>
-        </table>
-        </form>
+	</tr>
+	<?php $i++; endforeach; ?>
+	</tbody>
+	<tfoot>
+	<tr>
+		<td class="list" colspan="4"></td>
+		<td class="list">
+			<table border="0" cellspacing="0" cellpadding="1">
+				<tr>
+					<td width="17"></td>
+					<td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	</tfoot>
+</table>
+<!-- update to enable domain overrides -->
+<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tr><td>&nbsp;</td></tr>
+	<tr>
+		<td><p><?=gettext("Below you can override an entire domain by specifying an".
+		" authoritative DNS server to be queried for that domain.");?></p></td>
+	</tr>
+</table>
+&nbsp;<br>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="sortable">
+	<thead>
+	<tr>
+		<td width="35%" class="listhdrr"><?=gettext("Domain");?></td>
+		<td width="20%" class="listhdrr"><?=gettext("IP");?></td>
+		<td width="35%" class="listhdr"><?=gettext("Description");?></td>
+		<td width="10%" class="list">
+			<table border="0" cellspacing="0" cellpadding="1">
+				<tr>
+					<td width="17" heigth="17"></td>
+					<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	</thead>
+	<tbody>
+	<?php $i = 0; foreach ($a_domainOverrides as $doment): ?>
+	<tr>
+		<td class="listlr">
+			<?=strtolower($doment['domain']);?>&nbsp;
+		</td>
+		<td class="listr">
+			<?=$doment['ip'];?>&nbsp;
+		</td>
+		<td class="listbg">
+			<?=htmlspecialchars($doment['descr']);?>&nbsp;
+		</td>
+		<td valign="middle" nowrap class="list"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
+			&nbsp;<a href="services_dnsmasq.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+	</tr>
+	<?php $i++; endforeach; ?>
+	</tbody>
+	<tfoot>
+	<tr>
+		<td class="list" colspan="3"></td>
+		<td class="list">
+		<table border="0" cellspacing="0" cellpadding="1">
+			<tr>
+				<td width="17" heigth="17"></td>
+				<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	</tfoot>
+</table>
+</form>
 <script language="JavaScript">
 <!--
 enable_change(false);