From d29303c5a0b7034757f3746562126ba3fc52131d Mon Sep 17 00:00:00 2001
From: Colin Fleming <cj_fleming@sky.com>
Date: Fri, 4 Apr 2014 17:39:01 +0100
Subject: Tidy up "services_router_advertisements" XHTML

Add CDATA sections to script
Add SUMMARY to table
Update HTML Boolean operators
Add dummy table row, but don't display it
Close INPUT
---
 usr/local/www/services_router_advertisements.php | 25 ++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/usr/local/www/services_router_advertisements.php b/usr/local/www/services_router_advertisements.php
index 7316dd6..e7d33bd 100644
--- a/usr/local/www/services_router_advertisements.php
+++ b/usr/local/www/services_router_advertisements.php
@@ -202,6 +202,7 @@ include("head.inc");
 <script type="text/javascript" src="/javascript/suggestions.js">
 </script>
 <script type="text/javascript">
+//<![CDATA[
 	rowname[0] = "subnet_address";
 	rowtype[0] = "textbox";
 	rowsize[0] = "30";
@@ -215,12 +216,13 @@ include("head.inc");
 		obj.setAttribute('autocomplete', 'off');
 		objAlias[totalrows - 1] = new AutoSuggestControl(obj, new StateSuggestions(addressarray));
 	}
+//]]>
 </script>
 
 <form action="services_router_advertisements.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="router advert">
 <tr><td>
 <?php
 	/* active tabs */
@@ -260,13 +262,13 @@ display_top_tabs($tab_array);
 <tr>
 <td>
 	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 			<tr>
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Router Advertisements");?></td>
 			<td width="78%" class="vtable">
 				<select name="ramode" id="ramode">
 					<?php foreach($advertise_modes as $name => $value) { ?>
-					<option value="<?=$name ?>" <?php if ($pconfig['ramode'] == $name) echo "selected"; ?> > <?=$value ?></option>
+					<option value="<?=$name ?>" <?php if ($pconfig['ramode'] == $name) echo "selected=\"selected\""; ?> > <?=$value ?></option>
 					<?php } ?>
 				</select><br />
 			<strong><?php printf(gettext("Select the Operating Mode for the Router Advertisement (RA) Daemon."))?></strong>
@@ -279,7 +281,7 @@ display_top_tabs($tab_array);
 			<td width="78%" class="vtable">
 				<select name="rapriority" id="rapriority">
 					<?php foreach($priority_modes as $name => $value) { ?>
-					<option value="<?=$name ?>" <?php if ($pconfig['rapriority'] == $name) echo "selected"; ?> > <?=$value ?></option>
+					<option value="<?=$name ?>" <?php if ($pconfig['rapriority'] == $name) echo "selected=\"selected\""; ?> > <?=$value ?></option>
 					<?php } ?>
 				</select><br />
 			<strong><?php printf(gettext("Select the Priority for the Router Advertisement (RA) Daemon."))?></strong>
@@ -300,8 +302,8 @@ display_top_tabs($tab_array);
 			<td width="78%" class="vtable">
 				<select name="rainterface" id="rainterface">
 					<?php foreach($carplistif as $ifname => $vip) { ?>
-					<option value="interface" <?php if ($pconfig['rainterface'] == "interface") echo "selected"; ?> > <?=strtoupper($if); ?></option>
-					<option value="<?=$ifname ?>" <?php if ($pconfig['rainterface'] == $ifname) echo "selected"; ?> > <?="$ifname - $vip"; ?></option>
+					<option value="interface" <?php if ($pconfig['rainterface'] == "interface") echo "selected=\"selected\""; ?> > <?=strtoupper($if); ?></option>
+					<option value="<?=$ifname ?>" <?php if ($pconfig['rainterface'] == $ifname) echo "selected=\"selected\""; ?> > <?="$ifname - $vip"; ?></option>
 					<?php } ?>
 				</select><br />
 			<strong><?php printf(gettext("Select the Interface for the Router Advertisement (RA) Daemon."))?></strong>
@@ -313,7 +315,7 @@ display_top_tabs($tab_array);
 			<td width="22%" valign="top" class="vncell"><?=gettext("RA Subnet(s)");?></td>
 			<td width="78%" class="vtable">
 				<div><?= htmlentities($subnets_help) ?></div>
-				<table id="maintable">
+				<table id="maintable" summary="subnets">
 				<tbody>
 <?php
 				$counter = 0;
@@ -342,11 +344,14 @@ display_top_tabs($tab_array);
 					$counter += 1;
 				}
 ?>
+				<tr style="display:none"><td></td></tr>
 				</tbody>
 				</table>
 				<script type="text/javascript">
+				//<![CDATA[
 					field_counter_js = 2;
 					totalrows = <?= $counter ?>;
+				//]]>
 				</script>
 				<div id="addrowbutton">
 					<a onclick="javascript:addRowTo('maintable'); add_alias_control(); return false;" href="#"><!--
@@ -366,8 +371,8 @@ display_top_tabs($tab_array);
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
 			<td width="78%" class="vtable">
-				<input name="radns1" type="text" class="formfld unknown" id="radns1" size="28" value="<?=htmlspecialchars($pconfig['radns1']);?>"><br />
-				<input name="radns2" type="text" class="formfld unknown" id="radns2" size="28" value="<?=htmlspecialchars($pconfig['radns2']);?>"><br />
+				<input name="radns1" type="text" class="formfld unknown" id="radns1" size="28" value="<?=htmlspecialchars($pconfig['radns1']);?>" /><br />
+				<input name="radns2" type="text" class="formfld unknown" id="radns2" size="28" value="<?=htmlspecialchars($pconfig['radns2']);?>" /><br />
 				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
 			</td>
 			</tr>
@@ -375,7 +380,7 @@ display_top_tabs($tab_array);
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
 			<td width="78%" class="vtable">
-				<input name="radomainsearchlist" type="text" class="formfld unknown" id="radomainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['radomainsearchlist']);?>"><br />
+				<input name="radomainsearchlist" type="text" class="formfld unknown" id="radomainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['radomainsearchlist']);?>" /><br />
 				<?=gettext("The RA server can optionally provide a domain search list. Use the semicolon character as separator");?>
 			</td>
 			</tr>
-- 
cgit v1.1