diff options
author | Colin Fleming <cj_fleming@sky.com> | 2014-04-04 17:30:04 +0100 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2014-04-04 17:30:04 +0100 |
commit | 3565970f208bb71023c24c720f614ad03d7c3e9d (patch) | |
tree | 9985e6caf733bafc45cf6a4d4026ab5815b66280 /usr/local/www/services_dhcpv6_relay.php | |
parent | a4b1bf88bbdc0b05f39c5dcca245ccf3f0563f7d (diff) | |
download | pfsense-3565970f208bb71023c24c720f614ad03d7c3e9d.zip pfsense-3565970f208bb71023c24c720f614ad03d7c3e9d.tar.gz |
Tidy up "services_dhcpv6_realy.php" XHTML
Add "closehead" variable and manually close HEAD
Add CDATA sections to scripts
Add summary to tables
Add missing closing FORM if DHCPV6 is running
Update HTML Boolean operators
Close INPUT
Diffstat (limited to 'usr/local/www/services_dhcpv6_relay.php')
-rw-r--r-- | usr/local/www/services_dhcpv6_relay.php | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/usr/local/www/services_dhcpv6_relay.php b/usr/local/www/services_dhcpv6_relay.php index 5b1e4ea..0666297 100644 --- a/usr/local/www/services_dhcpv6_relay.php +++ b/usr/local/www/services_dhcpv6_relay.php @@ -98,6 +98,7 @@ if ($_POST) { } } +$closehead = false; $pgtitle = array(gettext("Services"),gettext("DHCPv6 Relay")); $shortcut_section = "dhcp6"; include("head.inc"); @@ -105,7 +106,7 @@ include("head.inc"); ?> <script type="text/javascript"> -<!-- +//<![CDATA[ function enable_change(enable_over) { if (document.iform.enable.checked || enable_over) { document.iform.server.disabled = 0; @@ -117,9 +118,9 @@ function enable_change(enable_over) { document.iform.agentoption.disabled = 1; } } -//--> +//]]> </script> - +</head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> @@ -127,16 +128,16 @@ function enable_change(enable_over) { <?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="dhcpv6 relay"> <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> <?php if ($dhcpd_enabled) { echo "<td>DHCPv6 Server is currently enabled. Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface."; - echo "</td></tr></table></div></td></tr></table></body>"; + echo "</td></tr></table></div></td></tr></table></form></body>"; echo "</html>"; include("fend.inc"); exit; @@ -148,21 +149,21 @@ function enable_change(enable_over) { <tr> <td width="22%" valign="top" class="vncellreq">Enable</td> <td width="78%" class="vtable"> - <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)"> + <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" /> <strong><?php printf(gettext("Enable DHCPv6 relay on interface"));?></strong> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq">Interface(s)</td> <td width="78%" class="vtable"> - <select id="interface" name="interface[]" multiple="true" class="formselect" size="3"> + <select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3"> <?php foreach ($iflist as $ifent => $ifdesc) { if (!is_ipaddrv6(get_interface_ipv6($ifent))) continue; - echo "<option value='{$ifent}'"; + echo "<option value=\"{$ifent}\""; if (in_array($ifent, $pconfig['interface'])) - echo "selected"; + echo " selected=\"selected\""; echo ">{$ifdesc}</option>\n"; } ?> @@ -173,14 +174,14 @@ function enable_change(enable_over) { <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> -<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked"; ?>> +<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br /> <?php printf(gettext("If this is checked, the DHCPv6 relay will append the circuit ID (%s interface number) and the agent ID to the DHCPv6 request."), $g['product_name']); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Destination server");?></td> <td width="78%" class="vtable"> - <input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>"> + <input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" /> <br /> <?=gettext("This is the IPv6 address of the server to which DHCPv6 requests are relayed. You can enter multiple server IPv6 addresses, separated by commas. ");?> </td> @@ -188,7 +189,7 @@ function enable_change(enable_over) { <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" /> </td> </tr> </table> @@ -198,9 +199,9 @@ function enable_change(enable_over) { </table> </form> <script type="text/javascript"> -<!-- +//<![CDATA[ enable_change(false); -//--> +//]]> </script> <?php include("fend.inc"); ?> </body> |