From d28502be612400396e5d45e12c26aeb007db3604 Mon Sep 17 00:00:00 2001
From: Colin Fleming <cj_fleming@sky.com>
Date: Thu, 8 May 2014 23:31:54 +0100
Subject: Tidy up "vpn_l2pt.php" XHTML

Add CDATA section to SCRIPTS
Add SUMMARY to TABLES
Update HTML Boolean Operators
Close INPUT tags
---
 usr/local/www/vpn_l2tp.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php
index c6b6d31..3197f57 100644
--- a/usr/local/www/vpn_l2tp.php
+++ b/usr/local/www/vpn_l2tp.php
@@ -187,7 +187,7 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 
 <script type="text/javascript">
-<!--
+//<![CDATA[
 function get_radio_value(obj)
 {
 	for (i = 0; i < obj.length; i++) {
@@ -271,13 +271,13 @@ function enable_change(enable_over) {
 		document.iform.secret.style.backgroundColor = '#D4D0C8';
 	}
 }
-//-->
+//]]>
 </script>
 <form action="vpn_l2tp.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <div id="inputerrors"></div>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="vpn l2tp">
   <tr><td class="tabnavtbl">
 <?php
 	$tab_array = array();
@@ -289,7 +289,7 @@ function enable_change(enable_over) {
   <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="vtable">&nbsp;</td>
                   <td width="78%" class="vtable">
@@ -313,7 +313,7 @@ function enable_change(enable_over) {
 				$interfaces = get_configured_interface_with_descr();
 				foreach ($interfaces as $iface => $ifacename):
 			  ?>
-			  <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>>
+			  <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected=\"selected\""; ?>>
 			  <?=htmlspecialchars($ifacename);?>
 			  </option>
 			  <?php endforeach; ?>
@@ -348,7 +348,7 @@ function enable_change(enable_over) {
                     <?php
                      for($x=0; $x<33; $x++) {
                         if($x == $pconfig['l2tp_subnet'])
-                                $SELECTED = " SELECTED";
+                                $SELECTED = " selected=\"selected\"";
                         else
                                 $SELECTED = "";
                         echo "<option value=\"{$x}\"{$SELECTED}>{$x}</option>\n";
@@ -365,7 +365,7 @@ function enable_change(enable_over) {
                     <?php
                      for($x=0; $x<255; $x++) {
                         if($x == $pconfig['n_l2tp_units'])
-                                $SELECTED = " SELECTED";
+                                $SELECTED = " selected=\"selected\"";
                         else
                                 $SELECTED = "";
                         echo "<option value=\"{$x}\"{$SELECTED}>{$x}</option>\n";
@@ -378,7 +378,7 @@ function enable_change(enable_over) {
 		<tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Secret");?></td>
                   <td width="78%" class="vtable">
-			<input type="password" name="secret" id="secret" class="formfld pwd" value="<?php echo htmlspecialchars($pconfig['secret']); ?>">
+			<input type="password" name="secret" id="secret" class="formfld pwd" value="<?php echo htmlspecialchars($pconfig['secret']); ?>" />
                     <br />
                     <?=gettext("Specify optional secret shared between peers. Required on some devices/setups.");?><br />
                     </td>
@@ -387,8 +387,8 @@ function enable_change(enable_over) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication Type");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><select name="paporchap" id="paporchap">
-			<option value='chap'<?php if($pconfig['paporchap'] == "chap") echo " SELECTED"; ?>><?=gettext("CHAP"); ?></option>
-			<option value='pap'<?php if($pconfig['paporchap'] == "pap") echo " SELECTED"; ?>><?=gettext("PAP"); ?></option>
+			<option value='chap'<?php if($pconfig['paporchap'] == "chap") echo " selected=\"selected\""; ?>><?=gettext("CHAP"); ?></option>
+			<option value='pap'<?php if($pconfig['paporchap'] == "pap") echo " selected=\"selected\""; ?>><?=gettext("PAP"); ?></option>
 		    </select>
                     <br />
                     <?=gettext("Specifies which protocol to use for authentication.");?><br />
@@ -397,9 +397,9 @@ function enable_change(enable_over) {
 		<tr>
 		  <td width="22%" valign="top" class="vncell"><?=gettext("L2TP DNS Servers"); ?></td>
 		  <td width="78%" class="vtable">
-		    <?=$mandfldhtml;?><input name="l2tp_dns1" type="text" class="formfld unknown" id="l2tp_dns1" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns1']);?>">
+		    <?=$mandfldhtml;?><input name="l2tp_dns1" type="text" class="formfld unknown" id="l2tp_dns1" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns1']);?>" />
 		   	<br />
-				<input name="l2tp_dns2" type="text" class="formfld unknown" id="l2tp_dns2" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns2']);?>">
+				<input name="l2tp_dns2" type="text" class="formfld unknown" id="l2tp_dns2" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns2']);?>" />
 			<br />
 		   <?=gettext("primary and secondary DNS servers assigned to L2TP clients"); ?><br />
 		  </td>
@@ -407,7 +407,7 @@ function enable_change(enable_over) {
 		<tr>
 		  <td width="22%" valign="top" class="vncell"><?=gettext("WINS Server"); ?></td>
 		  <td width="78%" valign="top" class="vtable">
-		      <input name="wins" class="formfld unknown" id="wins" size="20" value="<?=htmlspecialchars($pconfig['wins']);?>">
+		      <input name="wins" class="formfld unknown" id="wins" size="20" value="<?=htmlspecialchars($pconfig['wins']);?>" />
 		  </td>
 		</tr>
                 <tr>
@@ -465,7 +465,9 @@ function enable_change(enable_over) {
 </form>
 
 <script type="text/javascript">
+//<![CDATA[
 	enable_change(false);
+//]]>
 </script>
 
 <?php include("fend.inc"); ?>
-- 
cgit v1.1