diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/diag_packet_capture.php | 53 | ||||
| -rw-r--r-- | usr/local/www/diag_tables.php | 62 | ||||
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 162 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp_edit.php | 84 | ||||
| -rwxr-xr-x | usr/local/www/services_dnsmasq.php | 136 | ||||
| -rwxr-xr-x | usr/local/www/services_dnsmasq_domainoverride_edit.php | 22 | ||||
| -rwxr-xr-x | usr/local/www/services_dnsmasq_edit.php | 22 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_keys.php | 16 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_keys_edit.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/vpn_ipsec_mobile.php | 80 | ||||
| -rw-r--r-- | usr/local/www/vpn_l2tp.php | 36 | ||||
| -rw-r--r-- | usr/local/www/vpn_l2tp_users.php | 2 | ||||
| -rw-r--r-- | usr/local/www/vpn_l2tp_users_edit.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pppoe.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pppoe_edit.php | 116 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pptp.php | 112 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pptp_users.php | 10 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pptp_users_edit.php | 17 |
19 files changed, 489 insertions, 468 deletions
diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 116f3ab..f56be9b 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -192,7 +192,7 @@ include("fbegin.inc"); <?php ?> <?php foreach ($interfaces as $iface => $ifacename): ?> - <option value="<?=$iface;?>" <?php if ($selectedif == $iface) echo "selected"; ?>> + <option value="<?=$iface;?>" <?php if ($selectedif == $iface) echo "selected=\"selected\""; ?>> <?php echo $ifacename;?> </option> <?php endforeach; ?> @@ -203,7 +203,7 @@ include("fbegin.inc"); <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Promiscuous");?></td> <td width="51%" class="vtable"> - <input name="promiscuous" type="checkbox"<?php if($_POST['promiscuous']) echo " CHECKED"; ?>> + <input name="promiscuous" type="checkbox" <?php if($_POST['promiscuous']) echo "checked=\"checked\""; ?>/> <br/><?=gettext("If checked, the");?> <a target="_blank" href="http://www.freebsd.org/cgi/man.cgi?query=tcpdump&apropos=0&sektion=0&manpath=FreeBSD+8.3-stable&arch=default&format=html"><?= gettext("packet capture")?></a> <?= gettext("will be performed using promiscuous mode.");?> <br/><b><?=gettext("Note");?>: </b><?=gettext("Some network adapters do not support or work well in promiscuous mode.");?> </td> @@ -213,8 +213,8 @@ include("fbegin.inc"); <td colspan="2" width="83%" class="vtable"> <select name="fam"> <option value="">Any</option> - <option value="ip" <?php if ($fam == "ip") echo "selected"; ?>>IPv4 Only</option> - <option value="ip6" <?php if ($fam == "ip6") echo "selected"; ?>>IPv6 Only</option> + <option value="ip" <?php if ($fam == "ip") echo "selected=\"selected\""; ?>>IPv4 Only</option> + <option value="ip6" <?php if ($fam == "ip6") echo "selected=\"selected\""; ?>>IPv6 Only</option> </select> <br/><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?> </td> @@ -224,13 +224,13 @@ include("fbegin.inc"); <td colspan="2" width="83%" class="vtable"> <select name="proto"> <option value="">Any</option> - <option value="icmp" <?php if ($proto == "icmp") echo "selected"; ?>>ICMP</option> - <option value="icmp6" <?php if ($proto == "icmp6") echo "selected"; ?>>ICMPv6</option> - <option value="tcp" <?php if ($proto == "tcp") echo "selected"; ?>>TCP</option> - <option value="udp" <?php if ($proto == "udp") echo "selected"; ?>>UDP</option> - <option value="arp" <?php if ($proto == "arp") echo "selected"; ?>>ARP</option> - <option value="carp" <?php if ($proto == "carp") echo "selected"; ?>>CARP (VRRP)</option> - <option value="esp" <?php if ($proto == "esp") echo "selected"; ?>>ESP</option> + <option value="icmp" <?php if ($proto == "icmp") echo "selected=\"selected\""; ?>>ICMP</option> + <option value="icmp6" <?php if ($proto == "icmp6") echo "selected=\"selected\""; ?>>ICMPv6</option> + <option value="tcp" <?php if ($proto == "tcp") echo "selected=\"selected\""; ?>>TCP</option> + <option value="udp" <?php if ($proto == "udp") echo "selected=\"selected\""; ?>>UDP</option> + <option value="arp" <?php if ($proto == "arp") echo "selected=\"selected\""; ?>>ARP</option> + <option value="carp" <?php if ($proto == "carp") echo "selected=\"selected\""; ?>>CARP (VRRP)</option> + <option value="esp" <?php if ($proto == "esp") echo "selected=\"selected\""; ?>>ESP</option> </select> <br/><?=gettext("Select the protocol to capture, or Any.");?> </td> @@ -238,7 +238,7 @@ include("fbegin.inc"); <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Host Address");?></td> <td colspan="2" width="83%" class="vtable"> - <input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>"> + <input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>"/> <br/><?=gettext("This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.");?> <br/><?=gettext("This value can be a domain name or IP address, or subnet in CIDR notation.");?> <br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?> @@ -247,7 +247,7 @@ include("fbegin.inc"); <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Port");?></td> <td colspan="2" width="83%" class="vtable"> - <input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>"> + <input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>"/> <br/><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?> <br/><?=gettext("Leave blank if you do not want to filter by port.");?> </td> @@ -255,25 +255,25 @@ include("fbegin.inc"); <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Packet Length");?></td> <td colspan="2" width="83%" class="vtable"> - <input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>"> + <input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>"/> <br/><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?> </td> </tr> <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Count");?></td> <td colspan="2" width="83%" class="vtable"> - <input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>"> + <input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>"/> <br/><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br/>" . gettext("Enter 0 (zero) for no count limit.");?> </td> </tr> <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Level of Detail");?></td> <td colspan="2" width="83%" class="vtable"> - <select name="detail" type="text" class="formselect" id="detail" size="1"> - <option value="normal" <?php if ($detail == "normal") echo "selected"; ?>><?=gettext("Normal");?></option> - <option value="medium" <?php if ($detail == "medium") echo "selected"; ?>><?=gettext("Medium");?></option> - <option value="high" <?php if ($detail == "high") echo "selected"; ?>><?=gettext("High");?></option> - <option value="full" <?php if ($detail == "full") echo "selected"; ?>><?=gettext("Full");?></option> + <select name="detail" class="formselect" id="detail" size="1"> + <option value="normal" <?php if ($detail == "normal") echo "selected=\"selected\""; ?>><?=gettext("Normal");?></option> + <option value="medium" <?php if ($detail == "medium") echo "selected=\"selected\""; ?>><?=gettext("Medium");?></option> + <option value="high" <?php if ($detail == "high") echo "selected=\"selected\""; ?>><?=gettext("High");?></option> + <option value="full" <?php if ($detail == "full") echo "selected=\"selected\""; ?>><?=gettext("Full");?></option> </select> <br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") . "<br/><b>" . gettext("Note:") . "</b> " . @@ -283,7 +283,7 @@ include("fbegin.inc"); <tr> <td width="17%" valign="top" class="vncellreq"><?=gettext("Reverse DNS Lookup");?></td> <td colspan="2" width="83%" class="vtable"> - <input name="dnsquery" type="checkbox"<?php if($_POST['dnsquery']) echo " CHECKED"; ?>> + <input name="dnsquery" type="checkbox" <?php if($_POST['dnsquery']) echo "checked=\"checked\""; ?>/> <br/><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?> <br/><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?> </td> @@ -302,13 +302,13 @@ include("fbegin.inc"); $processisrunning = false; if (($action == gettext("Stop") or $action == "") and $processisrunning != true) - echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\"> "; + echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\"/> "; else { - echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\"> "; + echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\"/> "; } if (file_exists($fp.$fn) and $processisrunning != true) { - echo "<input type=\"submit\" name=\"viewbtn\" value=\"" . gettext("View Capture") . "\"> "; - echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">"; + echo "<input type=\"submit\" name=\"viewbtn\" value=\"" . gettext("View Capture") . "\"/> "; + echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\"/>"; echo "<br/>" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)); } ?> @@ -390,6 +390,7 @@ include("fbegin.inc"); <?php } } + echo "</font>"; ?> </td> </tr> @@ -400,3 +401,5 @@ include("fbegin.inc"); <?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php index 9bbcc46..fdfc99a 100644 --- a/usr/local/www/diag_tables.php +++ b/usr/local/www/diag_tables.php @@ -91,19 +91,22 @@ exec("/sbin/pfctl -t " . escapeshellarg($tablename) . " -T show", $entries); exec("/sbin/pfctl -sT", $tables); include("head.inc"); +?> +<body> +<?php include("fbegin.inc"); +if ($savemsg) print_info_box($savemsg); ?> -<?php if ($savemsg) print_info_box($savemsg); ?> -<form method='post'> +<form method='post' action='' > -<script language="javascript"> +<script type="text/javascript"> function method_change(entrytype) { window.location='diag_tables.php?type=' + entrytype; } function del_entry(entry) { - jQuery.ajax("diag_tables.php?type=<?php echo htmlspecialchars($tablename);?>&delete=" + entry, { + jQuery.ajax("diag_tables.php?type=<?php echo htmlspecialchars($tablename);?>&delete=" + entry, { complete: function(response) { if (200 == response.status) { // Escape all dots to not confuse jQuery selectors @@ -117,11 +120,11 @@ include("fbegin.inc"); </script> <?=gettext("Table:");?> -<select id='type' onChange='method_change(jQuery("#type").val());' name='type'> +<select id='type' onchange='method_change(jQuery("#type").val());' name='type'> <?php foreach ($tables as $table) { - echo "<option name='{$table}' value='{$table}'"; + echo "<option id='{$table}' value='{$table}'"; if ($tablename == $table) - echo " selected "; + echo " selected=\"selected\" "; echo ">{$table}</option>\n"; } ?> @@ -129,43 +132,44 @@ include("fbegin.inc"); <p/> +<?php + if( (is_array($entries)) && (count($entries) > 0) ) + if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) { + $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename)); + echo "<p/> <b>" . count($entries) . "</b> " . gettext("entries in this table.") . " " . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "' /> " . gettext(" the latest bogon data.") . "<br />" . $last_updated; + } + else + echo "<p/>" . gettext("Delete") . " <a href='diag_tables.php?deleteall=true&type=" . htmlspecialchars($tablename) . "'>" . gettext("all") . "</a> " . "<b>" . count($entries) . "</b> " . gettext("entries in this table."); + + else + if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) + echo "<p/>" . gettext("No entries exist in this table.") . " " . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "' /> " . gettext(" the latest bogon data."); + else + echo "<p/>" . gettext("No entries exist in this table."); +?> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td class="listhdrr"><?=gettext("IP Address");?></td> </tr> <?php $count = 0; foreach($entries as $entryA): ?> <?php $entry = trim($entryA); ?> - <tr id='<?=$entry?>'> + <tr id='table_row_<?=$count?>'> <td> <?php echo $entry; ?> </td> <td> <?php if ( ($tablename != "bogons") && ($tablename != "bogonsv6") ) { ?> - <a onClick='del_entry("<?=htmlspecialchars($entry)?>");'> - <img img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif"> - <?php } ?> + <a onclick='del_entry("<?=htmlspecialchars($entry)?>");'> + <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" alt='' /> </a> + <?php } ?> </td> </tr> <?php $count++; endforeach; ?> -<?php - if($count == 0) - if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) - echo "<p/>" . gettext("No entries exist in this table.") . "  " . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "'> " . gettext(" the latest bogon data."); - else - echo "<p/>" . gettext("No entries exist in this table."); -?> - -<?php - if($count > 0) - if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) { - $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename)); - echo "<p/> <b>$count</b> " . gettext("entries in this table.") . "  " . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "'> " . gettext(" the latest bogon data.") . "<br>" . "$last_updated"; - } - else - echo "<p/>" . gettext("Delete") . " <a href='diag_tables.php?deleteall=true&type=" . htmlspecialchars($tablename) . "'>" . gettext("all") . "</a> " . "<b>$count</b> " . gettext("entries in this table."); -?> - </table> +</form> <?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 7642cce..8cb2d9f 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -349,7 +349,7 @@ function print_info_box_np($msg, $name="apply",$value="", $showapply=false) { <img class="infoboxnpimg" src="/themes/{$g['theme']}/images/icons/icon_exclam.gif" alt="exclamation" /> </td> <td class="infoboxnptd2"> - <b>{$msg}</b> + {$msg} </td> {$savebutton} </tr> diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 3b136c9..a76c9c7 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -109,7 +109,7 @@ if($config['installedpackages']['olsrd']) { } if (!$_GET['if']) - $savemsg = "<b>" . gettext("The DHCP Server can only be enabled on interfaces configured with static IP addresses") . ".<p>" . gettext("Only interfaces configured with a static IP will be shown") . ".</p></b>"; + $savemsg = "<b>" . gettext("The DHCP Server can only be enabled on interfaces configured with static IP addresses") . ".</b><p><b>" . gettext("Only interfaces configured with a static IP will be shown") . ".</b></p>"; $iflist = get_configured_interface_with_descr(); @@ -562,10 +562,13 @@ include("head.inc"); ?> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> + <script type="text/javascript" src="/javascript/row_helper.js"> </script> <script type="text/javascript"> +//<![CDATA[ function itemtype_field(fieldname, fieldsize, n) { return '<select name="' + fieldname + n + '" class="formselect" id="' + fieldname + n + '"><?php $customitemtypes = array('text' => gettext('Text'), 'string' => gettext('String'), 'boolean' => gettext('Boolean'), @@ -585,6 +588,7 @@ include("head.inc"); rowname[2] = "value"; rowtype[2] = "textbox"; rowsize[2] = "40"; +//]]> </script> <script type="text/javascript" language="JavaScript"> @@ -669,7 +673,6 @@ include("head.inc"); } </script> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <form action="services_dhcp.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> @@ -683,8 +686,8 @@ include("head.inc"); exit; } ?> -<?php if (is_subsystem_dirty('staticmaps')): ?><p> -<?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br> +<?php if (is_subsystem_dirty('staticmaps')): ?><p/> +<?php print_info_box_np(gettext("The static mapping 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="0" cellspacing="0"> <tr><td> @@ -723,7 +726,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vtable"> </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 DHCP server on " . "%s " . "interface"),htmlspecialchars($iflist[$if]));?></strong></td> @@ -736,15 +739,15 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> - <input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked"; ?>> - <strong><?=gettext("Deny unknown clients");?></strong><br> + <input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Deny unknown clients");?></strong><br /> <?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?></td> </tr> <?php if (is_numeric($pool) || ($act == "newpool")): ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Pool Description");?></td> <td width="78%" class="vtable"> - <input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>"> + <input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>"/> </td> </tr> <?php endif; ?> @@ -796,7 +799,7 @@ include("head.inc"); for ($i = 32; $i > 0; $i--) { if($i <> 31) { echo "<option value=\"{$i}\" "; - if ($i == $pconfig['netmask']) echo "selected"; + if ($i == $pconfig['netmask']) echo "selected=\"selected\""; echo ">" . $i . "</option>"; } } @@ -808,8 +811,8 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td> <td width="78%" class="vtable"> - <input name="range_from" type="text" class="formfld unknown" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range_from']);?>"> - <?=gettext("to"); ?> <input name="range_to" type="text" class="formfld unknown" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range_to']);?>"> + <input name="range_from" type="text" class="formfld unknown" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range_from']);?>"/> + <?=gettext("to"); ?> <input name="range_to" type="text" class="formfld unknown" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range_to']);?>"/> </td> </tr> <?php if (!is_numeric($pool) && !($act == "newpool")): ?> @@ -826,7 +829,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"></td> - <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -844,11 +847,11 @@ include("head.inc"); <td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&pool=<?=$i;?>';"> <?=htmlspecialchars($poolent['descr']);?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" nowrap="nowrap" class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&pool=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td> - <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=delpool&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&pool=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" alt="" width="17" height="17" border="0"/></a></td> + <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=delpool&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -862,7 +865,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"></td> - <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -874,56 +877,56 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td> <td width="78%" class="vtable"> - <input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br> - <input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>"> + <input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"/><br /> + <input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>"/> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td> <td width="78%" class="vtable"> - <input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br> - <input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br> + <input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"/><br /> + <input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"/><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> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td> <td width="78%" class="vtable"> - <input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br> + <input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"/><br /> <?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td> <td width="78%" class="vtable"> - <input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br> + <input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"/><br /> <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td> <td width="78%" class="vtable"> - <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br> + <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"/><br /> <?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td> <td width="78%" class="vtable"> - <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"> - <?=gettext("seconds");?><br> + <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"/> + <?=gettext("seconds");?><br /> <?=gettext("This is used for clients that do not ask for a specific " . - "expiration time."); ?><br> + "expiration time."); ?><br /> <?=gettext("The default is 7200 seconds.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td> <td width="78%" class="vtable"> - <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"> - <?=gettext("seconds");?><br> + <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"/> + <?=gettext("seconds");?><br /> <?=gettext("This is the maximum lease time for clients that ask". - " for a specific expiration time."); ?><br> + " for a specific expiration time."); ?><br /> <?=gettext("The default is 86400 seconds.");?> </td> </tr> @@ -931,8 +934,8 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td> <td width="78%" class="vtable"> - <input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br> - <?=gettext("Leave blank to disable. Enter the interface IP address of the other machine. Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?> + <input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"/><br /> + <?=gettext("Leave blank to disable. Enter the interface IP address of the other machine. Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?> </td> </tr> <?php endif; ?> @@ -943,7 +946,7 @@ include("head.inc"); <table> <tr> <td> - <input valign="middle" type="checkbox" value="yes" name="staticarp" id="staticarp" <?php if($pconfig['staticarp']) echo " checked"; ?>> + <input style="vertical-align:middle" type="checkbox" value="yes" name="staticarp" id="staticarp" <?php if($pconfig['staticarp']) echo "checked=\"checked\""; ?>/> </td> <td><b><?=gettext("Enable Static ARP entries");?></b></td> </tr> @@ -964,7 +967,7 @@ include("head.inc"); <table> <tr> <td> - <input name="dhcpleaseinlocaltime" type="checkbox" id="dhcpleaseinlocaltime" value="yes" <?php if ($pconfig['dhcpleaseinlocaltime']) echo "checked"; ?>> + <input name="dhcpleaseinlocaltime" type="checkbox" id="dhcpleaseinlocaltime" value="yes" <?php if ($pconfig['dhcpleaseinlocaltime']) echo "checked=\"checked\""; ?>/> </td> <td> <strong> @@ -987,13 +990,13 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td> <td width="78%" class="vtable"> <div id="showddnsbox"> - <input type="button" onClick="show_ddns_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Dynamic DNS");?></a> + <input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Dynamic DNS");?> </div> <div id="showddns" style="display:none"> - <input valign="middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked"; ?>> + <input style="vertical-align=middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo "checked=\"checked\""; ?>/> <b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br /> - <p> - <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br /> + <p/> + <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"/><br /> <?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br /> <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?> </div> @@ -1003,12 +1006,12 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("MAC Address Control");?></td> <td width="78%" class="vtable"> <div id="showmaccontrolbox"> - <input type="button" onClick="show_maccontrol_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show MAC Address Control");?></a> + <input type="button" onclick="show_maccontrol_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show MAC Address Control");?> </div> <div id="showmaccontrol" style="display:none"> - <input name="mac_allow" type="text" class="formfld unknown" id="mac_allow" size="20" value="<?=htmlspecialchars($pconfig['mac_allow']);?>"><br /> + <input name="mac_allow" type="text" class="formfld unknown" id="mac_allow" size="20" value="<?=htmlspecialchars($pconfig['mac_allow']);?>"/><br /> <?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF - <input name="mac_deny" type="text" class="formfld unknown" id="mac_deny" size="20" value="<?=htmlspecialchars($pconfig['mac_deny']);?>"><br /> + <input name="mac_deny" type="text" class="formfld unknown" id="mac_deny" size="20" value="<?=htmlspecialchars($pconfig['mac_deny']);?>"/><br /> <?=gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF </div> </td> @@ -1017,11 +1020,11 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td> <td width="78%" class="vtable"> <div id="showntpbox"> - <input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?></a> + <input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?> </div> <div id="showntp" style="display:none"> - <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br> - <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>"> + <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"/><br /> + <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>"/> </div> </td> </tr> @@ -1029,10 +1032,10 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td> <td width="78%" class="vtable"> <div id="showtftpbox"> - <input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?></a> + <input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?> </div> <div id="showtftp" style="display:none"> - <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br> + <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"/><br /> <?=gettext("Leave blank to disable. Enter a full hostname or IP for the TFTP server.");?> </div> </td> @@ -1041,10 +1044,10 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td> <td width="78%" class="vtable"> <div id="showldapbox"> - <input type="button" onClick="show_ldap_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show LDAP configuration");?></a> + <input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show LDAP configuration");?> </div> <div id="showldap" style="display:none"> - <input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br> + <input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"/><br /> <?=gettext("Leave blank to disable. Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?> </div> </td> @@ -1053,20 +1056,20 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td> <td width="78%" class="vtable"> <div id="shownetbootbox"> - <input type="button" onClick="show_netboot_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Network booting");?></a> + <input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Network booting");?> </div> <div id="shownetboot" style="display:none"> - <input valign="middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked"; ?>> + <input style="vertical-align=middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo "checked=\"checked\""; ?>/> <b><?=gettext("Enables network booting.");?></b> - <p> + <p/> <?=gettext("Enter the IP of the"); ?> <b><?=gettext("next-server"); ?></b> - <input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>"> + <input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>"/> <?=gettext("and the filename");?> - <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"><br> + <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"/><br /> <?=gettext("Note: You need both a filename and a boot server configured for this to work!");?> - <p> + <p/> <?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?> - <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"><br> + <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"/><br /> <?=gettext("Note: string-format: iscsi:(servername):(protocol):(port):(LUN):targetname");?> </div> </td> @@ -1076,10 +1079,13 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td> <td width="78%" class="vtable"> <div id="shownumbervaluebox"> - <input type="button" onClick="show_shownumbervalue()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Additional BOOTP/DHCP Options");?></a> + <input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Additional BOOTP/DHCP Options");?> </div> <div id="shownumbervalue" style="display:none"> <table id="maintable"> + <tfoot> + <tr><td></td></tr> + </tfoot> <tbody> <tr> <td colspan="3"> @@ -1112,7 +1118,7 @@ include("head.inc"); <?php foreach ($customitemtypes as $typename => $typedescr) { echo "<option value=\"{$typename}\" "; - if ($itemtype == $typename) echo "selected"; + if ($itemtype == $typename) echo "selected=\"selected\""; echo ">" . $typedescr . "</option>"; } ?> @@ -1122,14 +1128,12 @@ include("head.inc"); <input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld unknown" id="value<?php echo $counter; ?>" size="40" value="<?=htmlspecialchars($value);?>" /> </td> <td> - <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" /></a> + <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" /></a> </td> </tr> <?php $counter++; ?> <?php endforeach; ?> </tbody> - <tfoot> - </tfoot> </table> <a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#"> <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" /> @@ -1149,25 +1153,25 @@ include("head.inc"); <td width="22%" valign="top"> </td> <td width="78%"> <?php if ($act == "newpool"): ?> - <input type="hidden" name="act" value="newpool"> + <input type="hidden" name="act" value="newpool"/> <?php endif; ?> <?php if (is_numeric($pool)): ?> - <input type="hidden" name="pool" value="<?php echo $pool; ?>"> + <input type="hidden" name="pool" value="<?php echo $pool; ?>"/> <?php endif; ?> - <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)"> + <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>"/> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)"/> </td> </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> + <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /> </strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " . "General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " . "forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " . - "be assigned to clients by the DHCP server."); ?><br> - <br> + "be assigned to clients by the DHCP server."); ?><br /> + <br /> <?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " . - "DHCP leases"); ?></a> <?=gettext("page."); ?><br> + "DHCP leases"); ?></a> <?=gettext("page."); ?><br /> </span></p> </td> </tr> @@ -1188,7 +1192,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"></td> - <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -1197,28 +1201,28 @@ include("head.inc"); <?php $i = 0; foreach ($a_maps as $mapent): ?> <?php if($mapent['mac'] <> "" or $mapent['ipaddr'] <> ""): ?> <tr> - <td align="center" class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> + <td align="center" class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> <?php if (isset($mapent['arp_table_static_entry'])): ?> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_alert.gif" alt="ARP Table Static Entry" width="17" height="17" border="0"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_alert.gif" alt="ARP Table Static Entry" width="17" height="17" border="0"/> <?php endif; ?> </td> - <td class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> + <td class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['mac']);?> </td> - <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> + <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['ipaddr']);?> </td> - <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> + <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['hostname']);?> </td> - <td class="listbg" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> + <td class="listbg" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['descr']);?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" nowrap="nowrap" class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td> - <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" alt="" width="17" height="17" border="0"/></a></td> + <td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -1232,7 +1236,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"></td> - <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -1244,7 +1248,7 @@ include("head.inc"); </tr> </table> </form> -<script language="JavaScript"> +<script type="text/JavaScript"> <!-- enable_change(false); //--> diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index f318bc4..a132478 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -305,6 +305,8 @@ include("head.inc"); ?> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> + <script type="text/javascript" language="JavaScript"> function show_ddns_config() { document.getElementById("showddnsbox").innerHTML=''; @@ -325,7 +327,6 @@ include("head.inc"); } </script> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_dhcp_edit.php" method="post" name="iform" id="iform"> @@ -336,22 +337,22 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("MAC address");?></td> <td width="78%" class="vtable"> - <input name="mac" type="text" class="formfld unknown" id="mac" size="30" value="<?=htmlspecialchars($pconfig['mac']);?>"> + <input name="mac" type="text" class="formfld unknown" id="mac" size="30" value="<?=htmlspecialchars($pconfig['mac']);?>"/> <?php $ip = getenv('REMOTE_ADDR'); $mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`; $mac = str_replace("\n","",$mac); ?> - <a OnClick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a> - <br> + <a onclick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a> + <br /> <span class="vexpl"><?=gettext("Enter a MAC address in the following format: ". "xx:xx:xx:xx:xx:xx");?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td> <td width="78%" class="vtable"> - <input name="ipaddr" type="text" class="formfld unknown" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>"> - <br> + <input name="ipaddr" type="text" class="formfld unknown" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>"/> + <br /> <?=gettext("If an IPv4 address is entered, the address must be outside of the pool.");?> <br/> <?=gettext("If no IPv4 address is given, one will be dynamically allocated from the pool.");?> @@ -360,90 +361,90 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td> <td width="78%" class="vtable"> - <input name="hostname" type="text" class="formfld unknown" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>"> - <br> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td> + <input name="hostname" type="text" class="formfld unknown" id="hostname2" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>"/> + <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td> </tr> <?php if($netboot_enabled) { ?> <tr> <td width="22%" valign="top" class="vncell">Netboot Filename</td> <td width="78%" class="vtable"> - <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"> - <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td> + <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"/> + <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td> </tr> <tr> <td width="22%" valign="top" class="vncell">Root Path</td> <td width="78%" class="vtable"> - <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"> - <br> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td> + <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"/> + <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td> </tr> <?php } ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td width="78%" class="vtable"> - <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> - <br> <span class="vexpl"><?=gettext("You may enter a description here ". + <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"/> + <br /> <span class="vexpl"><?=gettext("You may enter a description here ". "for your reference (not parsed).");?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("ARP Table Static Entry");?></td> <td width="78%" class="vtable"> - <input name="arp_table_static_entry" id="arp_table_static_entry" type="checkbox" value="yes" <?php if ($pconfig['arp_table_static_entry']) echo "checked"; ?>> - <br> <span class="vexpl"><?=gettext("Create an ARP Table Static Entry for this MAC & IP Address pair. ". + <input name="arp_table_static_entry" id="arp_table_static_entry" type="checkbox" value="yes" <?php if ($pconfig['arp_table_static_entry']) echo "checked=\"checked\""; ?>/> + <br /> <span class="vexpl"><?=gettext("Create an ARP Table Static Entry for this MAC & IP Address pair. ". "");?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td> <td width="78%" class="vtable"> - <input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br> - <input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>"> + <input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"/><br /> + <input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>"/> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td> <td width="78%" class="vtable"> - <input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br> - <input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br> + <input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"/><br /> + <input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"/><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> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td> <td width="78%" class="vtable"> - <input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br> + <input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"/><br /> <?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td> <td width="78%" class="vtable"> - <input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br> + <input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"/><br /> <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td> <td width="78%" class="vtable"> - <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br> + <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"/><br /> <?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td> <td width="78%" class="vtable"> - <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"> - <?=gettext("seconds");?><br> + <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"/> + <?=gettext("seconds");?><br /> <?=gettext("This is used for clients that do not ask for a specific " . - "expiration time."); ?><br> + "expiration time."); ?><br /> <?=gettext("The default is 7200 seconds.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td> <td width="78%" class="vtable"> - <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"> - <?=gettext("seconds");?><br> + <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"/> + <?=gettext("seconds");?><br /> <?=gettext("This is the maximum lease time for clients that ask". - " for a specific expiration time."); ?><br> + " for a specific expiration time."); ?><br /> <?=gettext("The default is 86400 seconds.");?> </td> </tr> @@ -451,13 +452,13 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td> <td width="78%" class="vtable"> <div id="showddnsbox"> - <input type="button" onClick="show_ddns_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Dynamic DNS");?></a> + <input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show Dynamic DNS");?> </div> <div id="showddns" style="display:none"> - <input valign="middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked"; ?>> + <input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo "checked=\"checked\""; ?>/> <b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br /> - <p> - <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br /> + <p/> + <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"/><br /> <?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br /> <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?> </div> @@ -467,11 +468,11 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td> <td width="78%" class="vtable"> <div id="showntpbox"> - <input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?></a> + <input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?> </div> <div id="showntp" style="display:none"> - <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br> - <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>"> + <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"/><br /> + <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>"/> </div> </td> </tr> @@ -479,23 +480,22 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td> <td width="78%" class="vtable"> <div id="showtftpbox"> - <input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?></a> + <input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?> </div> <div id="showtftp" style="display:none"> - <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br> + <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"/><br /> <?=gettext("Leave blank to disable. Enter a full hostname or IP for the TFTP server.");?> </div> </td> </tr> - <tr> <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"/> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"/> <?php if (isset($id) && $a_maps[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"/> <?php endif; ?> - <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>"> + <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>"/> </td> </tr> </table> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 59f55f2..331aecf 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -149,7 +149,9 @@ include("head.inc"); ?> -<script language="JavaScript"> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> + +<script type="text/JavaScript"> <!-- function enable_change(enable_over) { var endis; @@ -166,13 +168,12 @@ function show_advanced_dns() { //--> </script> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <form action="services_dnsmasq.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?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 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> @@ -181,15 +182,15 @@ function show_advanced_dns() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td> <td width="78%" 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> + <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked=\"checked\"";?> onclick="enable_change(false)"/> + <strong><?=gettext("Enable DNS forwarder");?><br /> </strong></p></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td> <td width="78%" 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> + <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked=\"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.". @@ -200,8 +201,8 @@ function show_advanced_dns() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td> <td width="78%" 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> + <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked=\"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". @@ -211,8 +212,8 @@ function show_advanced_dns() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td> <td width="78%" class="vtable"><p> - <input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked";?>> - <strong><?=gettext("Resolve DHCP mappings first");?><br> + <input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked=\"checked\"";?>/> + <strong><?=gettext("Resolve DHCP mappings first");?><br /> </strong><?php printf(gettext("If this option is set, then DHCP mappings will ". "be resolved before the manual list of names below. This only ". "affects the name given for a reverse lookup (PTR)."));?></p> @@ -221,8 +222,8 @@ function show_advanced_dns() { <tr> <td rowspan="3" width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td> <td width="78%" class="vtable"><p> - <input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked";?>> - <strong><?=gettext("Query DNS servers sequentially");?><br> + <input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked=\"checked\"";?>/> + <strong><?=gettext("Query DNS servers sequentially");?><br /> </strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". "query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ". "rather than all at once in parallel. ". @@ -231,8 +232,8 @@ function show_advanced_dns() { </tr> <tr> <td width="78%" class="vtable"><p> - <input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked";?>> - <strong><?=gettext("Require domain");?><br> + <input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked=\"checked\"";?>/> + <strong><?=gettext("Require domain");?><br /> </strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". "not forward A or AAAA queries for plain names, without dots or domain parts, to upstream name servers. ". "If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. ". @@ -241,8 +242,8 @@ function show_advanced_dns() { </tr> <tr> <td width="78%" class="vtable"><p> - <input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked";?>> - <strong><?=gettext("Do not forward private reverse lookups");?><br> + <input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked=\"checked\"";?>/> + <strong><?=gettext("Do not forward private reverse lookups");?><br /> </strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". "not forward reverse DNS lookups (PTR) for private addresses (RFC 1918) to upstream name servers. ". "Any entries in the Domain Overrides section forwarding private \"n.n.n.in-addr.arpa\" names to a specific server are still forwarded. ". @@ -253,7 +254,7 @@ function show_advanced_dns() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Listen Port");?></td> <td width="78%" class="vtable"><p> - <input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?>> + <input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?>/> <br /><br /> <?=gettext("The port used for responding to DNS queries. It should normally be left blank unless another service needs to bind to TCP/UDP port 53.");?></p> </td> @@ -267,7 +268,7 @@ function show_advanced_dns() { ?> <?=gettext("Interface IPs used by the DNS Forwarder for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. The default behavior is to respond to queries on every available IPv4 and IPv6 address.");?> <br /><br /> - <select id="interface" name="interface[]" multiple="true" class="formselect" size="<?php echo $size; ?>"> + <select id="interface" name="interface[]" multiple="multiple" class="formselect" size="<?php echo $size; ?>"> <option value="" <?php if (empty($pconfig['interface'])) echo 'selected="selected"'; ?>>All</option> <?php foreach ($interface_addresses as $laddr): $selected = ""; @@ -284,7 +285,7 @@ function show_advanced_dns() { </tr> <tr> <td width="78%" class="vtable"><p> - <input name="strictbind" type="checkbox" id="strictbind" value="yes" <?php if ($pconfig['strictbind'] == "yes") echo "checked";?>> + <input name="strictbind" type="checkbox" id="strictbind" value="yes" <?php if ($pconfig['strictbind'] == "yes") echo "checked=\"checked\"";?>/> <strong><?=gettext("Strict Interface Binding");?></strong> <br /> <?= gettext("If this option is set, the DNS forwarder will only bind to the interfaces containing the IP addresses selected above, rather than binding to all interfaces and discarding queries to other addresses."); ?> @@ -295,26 +296,25 @@ function show_advanced_dns() { </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Advanced");?></td> - <td width="78%" class="vtable"><p> + <td width="78%" class="vtable"> <div id="showadvbox" <?php if ($pconfig['custom_options']) echo "style='display:none'"; ?>> - <input type="button" onClick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> + <input type="button" onclick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?> </div> <div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>> - <strong><?=gettext("Advanced");?><br></strong> + <strong><?=gettext("Advanced");?><br /></strong> <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br/> <?=gettext("Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline"); ?><br/> </div> - </p> </td> </tr> <tr> <td colspan="2"> - <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> -<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> +<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". @@ -325,10 +325,10 @@ function show_advanced_dns() { " 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> +"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br /> </span></p> - <br> + <br /> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont"> <tr> <td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td> @@ -351,12 +351,25 @@ function show_advanced_dns() { <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> + <td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> </tr> </thead> + <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" alt="" width="17" height="17" border="0"/></a></td> + </tr> + </table> + </td> + </tr> + </tfoot> <tbody> <?php $i = 0; foreach ($a_hosts as $hostent): ?> <tr> @@ -372,13 +385,14 @@ function show_advanced_dns() { <td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <?=htmlspecialchars($hostent['descr']);?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" nowrap="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> + <td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" alt="" 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" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> + </td> </tr> <?php if ($hostent['aliases']['item'] && is_array($hostent['aliases']['item'])): ?> <?php foreach ($hostent['aliases']['item'] as $alias): ?> @@ -395,39 +409,24 @@ function show_advanced_dns() { <td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <?=htmlspecialchars($alias['description']);?> </td> - <td valign="middle" nowrap class="list"> - <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 valign="middle" nowrap="nowrap" class="list"> + <a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" alt="" width="17" height="17" border="0"/></a> </td> </tr> <?php endforeach; ?> <?php endif; ?> <?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> <br/> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont"> <tr> <td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td> </tr> -<tr> <tr> <td><p><?=gettext("Entries in this area override an entire domain by specifying an". " authoritative DNS server to be queried for that domain.");?></p></td> </tr> -</tr> </table> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable"> <thead> @@ -438,13 +437,26 @@ function show_advanced_dns() { <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> + <td width="17" height="17"></td> + <td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> </tr> </thead> + <tfoot> + <tr> + <td class="list" colspan="3"></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17" height="17"></td> + <td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" width="17" height="17" border="0"/></a></td> + </tr> + </table> + </td> + </tr> + </tfoot> <tbody> <?php $i = 0; foreach ($a_domainOverrides as $doment): ?> <tr> @@ -457,27 +469,15 @@ function show_advanced_dns() { <td class="listbg"> <?=htmlspecialchars($doment['descr']);?> </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> - <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> + <td valign="middle" nowrap="nowrap" class="list"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" alt="" width="17" height="17" border="0"/></a> + <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" alt="" width="17" height="17" border="0"/></a></td> </tr> - <?php $i++; endforeach; ?> + <?php $i++; endforeach; + if ($i == 0) echo "<tr><td></td></tr>"; ?> </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"> +<script type="text/JavaScript"> <!-- enable_change(false); //--> diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php index c228353..3cf2fc3 100755 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -129,40 +129,42 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"> - <br> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br> + <?=$mandfldhtml;?><input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"/> + <br /> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br /> <?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em> </span></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>"> - <br> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br> + <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>"/> + <br /> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br /> <?=gettext("e.g."); ?> <em>192.168.100.100</em><br/><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br/><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Source IP");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>"> - <br> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br> + <?=$mandfldhtml;?><input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>"/> + <br /> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br /> <?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td width="78%" class="vtable"> - <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> - <br> <span class="vexpl"><?=gettext("You may enter a description here". + <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"/> + <br /> <span class="vexpl"><?=gettext("You may enter a description here". " for your reference (not parsed).");?></span></td> </tr> <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"/> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"/> <?php if (isset($id) && $a_domainOverrides[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"/> <?php endif; ?> </td> </tr> </table> </form> <?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php index e38f977..33a7918 100755 --- a/usr/local/www/services_dnsmasq_edit.php +++ b/usr/local/www/services_dnsmasq_edit.php @@ -196,30 +196,30 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td> <td width="78%" class="vtable"> - <input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>"> - <br> <span class="vexpl"><?=gettext("Name of the host, without". - " domain part"); ?><br> + <input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>"/> + <br /> <span class="vexpl"><?=gettext("Name of the host, without". + " domain part"); ?><br /> <?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td> <td width="78%" class="vtable"> - <input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"> - <br> <span class="vexpl"><?=gettext("Domain of the host"); ?><br> + <input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"/> + <br /> <span class="vexpl"><?=gettext("Domain of the host"); ?><br /> <?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td> <td width="78%" class="vtable"> - <input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>"> - <br> <span class="vexpl"><?=gettext("IP address of the host"); ?><br> + <input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>"/> + <br /> <span class="vexpl"><?=gettext("IP address of the host"); ?><br /> <?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td width="78%" class="vtable"> - <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> - <br> <span class="vexpl"><?=gettext("You may enter a description here". + <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"/> + <br /> <span class="vexpl"><?=gettext("You may enter a description here". " for your reference (not parsed).");?></span></td> </tr> <tr> @@ -282,9 +282,9 @@ include("head.inc"); <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"/> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"/> <?php if (isset($id) && $a_hosts[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"/> <?php endif; ?> </td> </tr> diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php index bf2582c..f93f313 100644 --- a/usr/local/www/vpn_ipsec_keys.php +++ b/usr/local/www/vpn_ipsec_keys.php @@ -82,7 +82,7 @@ include("head.inc"); if ($savemsg) print_info_box($savemsg); if (is_subsystem_dirty('ipsec')) - print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect.")); + print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect.")); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> @@ -105,8 +105,8 @@ if (is_subsystem_dirty('ipsec')) <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td width="20" heigth="17"></td> - <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td> + <td width="20" height="17"></td> + <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -119,7 +119,7 @@ if (is_subsystem_dirty('ipsec')) <td class="listr gray"> <?=htmlspecialchars($secretent['pre-shared-key']);?> </td> - <td class="list" nowrap><a href="system_usermanager.php?act=edit&id=<?=$secretent['id'];?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0"></a> + <td class="list" nowrap="nowrap"><a href="system_usermanager.php?act=edit&id=<?=$secretent['id'];?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" alt="" width="17" height="17" border="0"/></a> </td> </tr> <?php $i++; endforeach; ?> @@ -132,8 +132,8 @@ if (is_subsystem_dirty('ipsec')) <td class="listr"> <?=htmlspecialchars($secretent['pre-shared-key']);?> </td> - <td class="list" nowrap> <a href="vpn_ipsec_keys_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0"></a> - <a href="vpn_ipsec_keys.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Pre-Shared Key?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete key"); ?>" width="17" height="17" border="0"></a></td> + <td class="list" nowrap="nowrap"> <a href="vpn_ipsec_keys_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" alt="" width="17" height="17" border="0"/></a> + <a href="vpn_ipsec_keys.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Pre-Shared Key?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete key"); ?>" alt="" width="17" height="17" border="0"/></a></td> </tr> <?php $i++; endforeach; ?> <tr> @@ -141,8 +141,8 @@ if (is_subsystem_dirty('ipsec')) <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td width="20" heigth="17"></td> - <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td> + <td width="20" height="17"></td> + <td><a href="vpn_ipsec_keys_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php index 5a04c08..4863943 100644 --- a/usr/local/www/vpn_ipsec_keys_edit.php +++ b/usr/local/www/vpn_ipsec_keys_edit.php @@ -126,26 +126,28 @@ include("head.inc"); <tr> <td valign="top" class="vncellreq"><?=gettext("Identifier"); ?></td> <td class="vtable"> - <?=$mandfldhtml;?><input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=htmlspecialchars($pconfig['ident']);?>"> - <br> + <?=$mandfldhtml;?><input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=htmlspecialchars($pconfig['ident']);?>"/> + <br /> <?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address"); ?>. </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Pre-Shared Key"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="psk" type="text" class="formfld unknown" id="psk" size="40" value="<?=htmlspecialchars($pconfig['psk']);?>"> + <?=$mandfldhtml;?><input name="psk" type="text" class="formfld unknown" id="psk" size="40" value="<?=htmlspecialchars($pconfig['psk']);?>"/> </td> </tr> <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"/> <?php if (isset($id) && $a_secret[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"/> <?php endif; ?> </td> </tr> </table> </form> <?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index 30927c2..84bf198 100755 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -246,7 +246,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<script language="JavaScript"> +<script type="text/JavaScript"> <!-- function pool_change() { @@ -327,12 +327,12 @@ function login_banner_change() { if ($savemsg) print_info_box($savemsg); if (isset($config['ipsec']['enable']) && is_subsystem_dirty('ipsec')) - print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect.")); + print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect.")); foreach ($a_phase1 as $ph1ent) if (isset($ph1ent['mobile'])) $ph1found = true; if ($pconfig['enable'] && !$ph1found) - print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br>" . gettext("Please click Create to define one."),gettext("create"),gettext("Create Phase1")); + print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br />" . gettext("Please click Create to define one."),gettext("create"),gettext("Create Phase1")); if ($input_errors) print_input_errors($input_errors); ?> @@ -360,7 +360,7 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['enable'],$chk); ?> - <input name="enable" type="checkbox" id="enable" value="yes" <?=$chk;?>> + <input name="enable" type="checkbox" id="enable" value="yes" <?=$chk;?>/> </td> <td> <strong><?=gettext("Enable IPsec Mobile Client Support"); ?></strong> @@ -381,14 +381,14 @@ function login_banner_change() { <td width="22%" valign="top" class="vncellreq"><?=gettext("User Authentication"); ?></td> <td width="78%" class="vtable"> <?=gettext("Source"); ?>: - <select name="user_source[]" class="formselect" id="user_source" multiple="true" size="3"> + <select name="user_source[]" class="formselect" id="user_source" multiple="multiple" size="3"> <?php $authmodes = explode(",", $pconfig['user_source']); $auth_servers = auth_get_authserver_list(); foreach ($auth_servers as $auth_server) { $selected = ""; if (in_array($auth_server['name'], $authmodes)) - $selected = "selected"; + $selected = "selected=\"selected\""; echo "<option value='{$auth_server['name']}' {$selected}>{$auth_server['name']}</option>\n"; } ?> @@ -401,7 +401,7 @@ function login_banner_change() { <?=gettext("Source"); ?>: <select name="group_source" class="formselect" id="group_source"> <option value="none"><?=gettext("none"); ?></option> - <option value="system" <?php if ($pconfig['group_source'] == "system") echo "selected"; ?> ><?=gettext("system"); ?></option> + <option value="system" <?php if ($pconfig['group_source'] == "system") echo "selected=\"selected\""; ?> ><?=gettext("system"); ?></option> </select> </td> </tr> @@ -420,10 +420,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['pool_enable'],$chk); ?> - <input name="pool_enable" type="checkbox" id="pool_enable" value="yes" <?=$chk;?> onClick="pool_change()"> + <input name="pool_enable" type="checkbox" id="pool_enable" value="yes" <?=$chk;?> onclick="pool_change()"/> </td> <td> - <?=gettext("Provide a virtual IP address to clients"); ?><br> + <?=gettext("Provide a virtual IP address to clients"); ?><br /> </td> </tr> </table> @@ -431,11 +431,11 @@ function login_banner_change() { <tr> <td> <?=gettext("Network"); ?>: - <input name="pool_address" type="text" class="formfld unknown" id="pool_address" size="20" value="<?=htmlspecialchars($pconfig['pool_address']);?>"> + <input name="pool_address" type="text" class="formfld unknown" id="pool_address" size="20" value="<?=htmlspecialchars($pconfig['pool_address']);?>"/> / <select name="pool_netbits" class="formselect" id="pool_netbits"> <?php for ($i = 32; $i >= 0; $i--): ?> - <option value="<?=$i;?>" <?php if ($i == $pconfig['pool_netbits']) echo "selected"; ?>> + <option value="<?=$i;?>" <?php if ($i == $pconfig['pool_netbits']) echo "selected=\"selected\""; ?>> <?=$i;?> </option> <?php endfor; ?> @@ -452,10 +452,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['net_list_enable'],$chk); ?> - <input name="net_list_enable" type="checkbox" id="net_list_enable" value="yes" <?=$chk;?>> + <input name="net_list_enable" type="checkbox" id="net_list_enable" value="yes" <?=$chk;?>/> </td> <td> - <?=gettext("Provide a list of accessible networks to clients"); ?><br> + <?=gettext("Provide a list of accessible networks to clients"); ?><br /> </td> </tr> </table> @@ -468,11 +468,11 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['save_passwd_enable'],$chk); ?> - <input name="save_passwd_enable" type="checkbox" id="save_passwd_enable" value="yes" <?=$chk;?>> + <input name="save_passwd_enable" type="checkbox" id="save_passwd_enable" value="yes" <?=$chk;?>/> </td> <td> - <?=gettext("Allow clients to save Xauth passwords (Cisco VPN client only)."); ?><br> - <?=gettext("NOTE: With iPhone clients, this does not work when deployed via the iPhone configuration utility, only by manual entry."); ?><br> + <?=gettext("Allow clients to save Xauth passwords (Cisco VPN client only)."); ?><br /> + <?=gettext("NOTE: With iPhone clients, this does not work when deployed via the iPhone configuration utility, only by manual entry."); ?><br /> </td> </tr> </table> @@ -485,17 +485,17 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['dns_domain_enable'],$chk); ?> - <input name="dns_domain_enable" type="checkbox" id="dns_domain_enable" value="yes" <?=$chk;?> onClick="dns_domain_change()"> + <input name="dns_domain_enable" type="checkbox" id="dns_domain_enable" value="yes" <?=$chk;?> onclick="dns_domain_change()"/> </td> <td> - <?=gettext("Provide a default domain name to clients"); ?><br> + <?=gettext("Provide a default domain name to clients"); ?><br /> </td> </tr> </table> <table border="0" cellspacing="2" cellpadding="0"> <tr> <td> - <input name="dns_domain" type="text" class="formfld unknown" id="dns_domain" size="30" value="<?=htmlspecialchars($pconfig['dns_domain']);?>"> + <input name="dns_domain" type="text" class="formfld unknown" id="dns_domain" size="30" value="<?=htmlspecialchars($pconfig['dns_domain']);?>"/> </td> </tr> </table> @@ -508,10 +508,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['dns_split_enable'],$chk); ?> - <input name="dns_split_enable" type="checkbox" id="dns_split_enable" value="yes" <?=$chk;?> onClick="dns_split_change()"> + <input name="dns_split_enable" type="checkbox" id="dns_split_enable" value="yes" <?=$chk;?> onclick="dns_split_change()"/> </td> <td> - <?=gettext("Provide a list of split DNS domain names to clients. Enter a comma separated list."); ?><br> + <?=gettext("Provide a list of split DNS domain names to clients. Enter a comma separated list."); ?><br /> <?=gettext("NOTE: If left blank, and a default domain is set, it will be used for this value."); ?> </td> </tr> @@ -519,7 +519,7 @@ function login_banner_change() { <table border="0" cellspacing="2" cellpadding="0"> <tr> <td> - <input name="dns_split" type="text" class="formfld unknown" id="dns_split" size="30" value="<?=htmlspecialchars($pconfig['dns_split']);?>"> + <input name="dns_split" type="text" class="formfld unknown" id="dns_split" size="30" value="<?=htmlspecialchars($pconfig['dns_split']);?>"/> </td> </tr> </table> @@ -532,10 +532,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['dns_server_enable'],$chk); ?> - <input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=$chk;?> onClick="dns_server_change()"> + <input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=$chk;?> onclick="dns_server_change()"/> </td> <td> - <?=gettext("Provide a DNS server list to clients"); ?><br> + <?=gettext("Provide a DNS server list to clients"); ?><br /> </td> </tr> </table> @@ -543,25 +543,25 @@ function login_banner_change() { <tr> <td> <?=gettext("Server"); ?> #1: - <input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=htmlspecialchars($pconfig['dns_server1']);?>"> + <input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=htmlspecialchars($pconfig['dns_server1']);?>"/> </td> </tr> <tr> <td> <?=gettext("Server"); ?> #2: - <input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=htmlspecialchars($pconfig['dns_server2']);?>"> + <input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=htmlspecialchars($pconfig['dns_server2']);?>"/> </td> </tr> <tr> <td> <?=gettext("Server"); ?> #3: - <input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=htmlspecialchars($pconfig['dns_server3']);?>"> + <input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=htmlspecialchars($pconfig['dns_server3']);?>"/> </td> </tr> <tr> <td> <?=gettext("Server"); ?> #4: - <input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=htmlspecialchars($pconfig['dns_server4']);?>"> + <input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=htmlspecialchars($pconfig['dns_server4']);?>"/> </td> </tr> </table> @@ -574,10 +574,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['wins_server_enable'],$chk); ?> - <input name="wins_server_enable" type="checkbox" id="wins_server_enable" value="yes" <?=$chk;?> onClick="wins_server_change()"> + <input name="wins_server_enable" type="checkbox" id="wins_server_enable" value="yes" <?=$chk;?> onclick="wins_server_change()"/> </td> <td> - <?=gettext("Provide a WINS server list to clients"); ?><br> + <?=gettext("Provide a WINS server list to clients"); ?><br /> </td> </tr> </table> @@ -585,13 +585,13 @@ function login_banner_change() { <tr> <td> <?=gettext("Server"); ?> #1: - <input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=htmlspecialchars($pconfig['wins_server1']);?>"> + <input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=htmlspecialchars($pconfig['wins_server1']);?>"/> </td> </tr> <tr> <td> <?=gettext("Server"); ?> #2: - <input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=htmlspecialchars($pconfig['wins_server2']);?>"> + <input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=htmlspecialchars($pconfig['wins_server2']);?>"/> </td> </tr> </table> @@ -604,10 +604,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['pfs_group_enable'],$chk); ?> - <input name="pfs_group_enable" type="checkbox" id="pfs_group_enable" value="yes" <?=$chk;?> onClick="pfs_group_change()"> + <input name="pfs_group_enable" type="checkbox" id="pfs_group_enable" value="yes" <?=$chk;?> onclick="pfs_group_change()"/> </td> <td> - <?=gettext("Provide the Phase2 PFS group to clients ( overrides all mobile phase2 settings )"); ?><br> + <?=gettext("Provide the Phase2 PFS group to clients ( overrides all mobile phase2 settings )"); ?><br /> </td> </tr> </table> @@ -617,7 +617,7 @@ function login_banner_change() { <?=gettext("Group"); ?>: <select name="pfs_group" class="formselect" id="pfs_group"> <?php foreach ($p2_pfskeygroups as $keygroup => $keygroupname): ?> - <option value="<?=$keygroup;?>" <?php if ($pconfig['pfs_group'] == $keygroup) echo "selected"; ?>> + <option value="<?=$keygroup;?>" <?php if ($pconfig['pfs_group'] == $keygroup) echo "selected=\"selected\""; ?>> <?=htmlspecialchars($keygroupname);?> </option> <?php endforeach; ?> @@ -634,10 +634,10 @@ function login_banner_change() { <tr> <td> <?php set_checked($pconfig['login_banner_enable'],$chk); ?> - <input name="login_banner_enable" type="checkbox" id="login_banner_enable" value="yes" <?=$chk;?> onClick="login_banner_change()"> + <input name="login_banner_enable" type="checkbox" id="login_banner_enable" value="yes" <?=$chk;?> onclick="login_banner_change()"/> </td> <td> - <?=gettext("Provide a login banner to clients"); ?><br> + <?=gettext("Provide a login banner to clients"); ?><br /> </td> </tr> </table> @@ -654,7 +654,7 @@ function login_banner_change() { <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> + <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"/> </td> </tr> </table> @@ -663,7 +663,7 @@ function login_banner_change() { </tr> </table> </form> -<script language="JavaScript"> +<script type="text/JavaScript"> pool_change(); dns_domain_change(); dns_split_change(); @@ -683,7 +683,7 @@ login_banner_change(); function set_checked($var,& $chk) { if($var) - $chk = 'checked'; + $chk = 'checked="checked"'; else $chk = ''; } diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index cedcef5..f77ed5c 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -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,14 +348,14 @@ 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"; + $selected = ""; + echo "<option value=\"{$x}\" {$selected}>{$x}</option>\n"; } ?> </select> - <br><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0 + <br /><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0 </td> </tr> <tr> @@ -365,20 +365,20 @@ 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"; + $selected = ""; + echo "<option value=\"{$x}\" {$selected}>{$x}</option>\n"; } ?> </select> - <br><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?> + <br /><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?> </td> </tr> <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,17 +397,17 @@ 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']);?>"> - <br> - <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> + <?=$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']);?>" /> + <br /> + <?=gettext("primary and secondary DNS servers assigned to L2TP clients"); ?><br /> </td> </tr> <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> diff --git a/usr/local/www/vpn_l2tp_users.php b/usr/local/www/vpn_l2tp_users.php index 58a2ebb..b8d7b8f 100644 --- a/usr/local/www/vpn_l2tp_users.php +++ b/usr/local/www/vpn_l2tp_users.php @@ -112,7 +112,7 @@ include("head.inc"); <?php if($secretent['ip'] == "") $secretent['ip'] = "Dynamic"; ?> <?=htmlspecialchars($secretent['ip']);?> </td> - <td class="list" nowrap> <a href="vpn_l2tp_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit user" width="17" height="17" border="0" alt="" /></a> + <td class="list" nowrap="nowrap"> <a href="vpn_l2tp_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit user" width="17" height="17" border="0" alt="" /></a> <a href="vpn_l2tp_users.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this user?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete user"); ?>" width="17" height="17" border="0" alt="" /></a></td> </tr> <?php $i++; endforeach; ?> diff --git a/usr/local/www/vpn_l2tp_users_edit.php b/usr/local/www/vpn_l2tp_users_edit.php index 28e9707..bae2a10 100644 --- a/usr/local/www/vpn_l2tp_users_edit.php +++ b/usr/local/www/vpn_l2tp_users_edit.php @@ -156,6 +156,7 @@ include("head.inc"); <td width="78%" class="vtable"> <?=$mandfldhtml;?><input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" /> </td> + </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td> <td width="78%" class="vtable"> diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index b91e6d2..128e22c 100755 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -95,7 +95,7 @@ include("head.inc"); <form action="vpn_pppoe.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('vpnpppoe')): ?><p> -<?php print_info_box_np(gettext("The PPPoE entry list has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?> +<?php print_info_box_np(gettext("The PPPoE entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?> <?php endif; ?> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> @@ -108,7 +108,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"> </td> - <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>"></a></td> + <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt=""/></a></td> </tr> </table> </td> @@ -127,11 +127,11 @@ include("head.inc"); <td class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <?=htmlspecialchars($pppoe['descr']);?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" nowrap="nowrap" class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit pppoe instance"); ?>"></a></td> - <td><a href="vpn_pppoe.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>"></a></td> + <td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit pppoe instance"); ?>" alt=""/></a></td> + <td><a href="vpn_pppoe.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>"alt=""/></a></td> </tr> </table> </td> @@ -143,7 +143,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td valign="middle" width="17"> </td> - <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>"></a></td> + <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt=""/></a></td> </td> </tr> </table> diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php index 5690818..5f17221 100755 --- a/usr/local/www/vpn_pppoe_edit.php +++ b/usr/local/www/vpn_pppoe_edit.php @@ -4,7 +4,7 @@ part of pfSense Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2010 Ermal Luçi + Copyright (C) 2010 Ermal Luçi All rights reserved. Redistribution and use in source and binary forms, with or without @@ -263,7 +263,7 @@ include("head.inc"); rowsize[2] = "10"; </script> -<script language="JavaScript"> +<script type="text/JavaScript"> <!-- function get_radio_value(obj) { @@ -362,13 +362,13 @@ function enable_change(enable_over) { <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> <input name="mode" type="radio" onclick="enable_change(false)" value="off" - <?php if ($pconfig['mode'] != "server") echo "checked";?>> + <?php if ($pconfig['mode'] != "server") echo "checked=\"checked\"";?>/> <?=gettext("Off"); ?></td> </tr> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> - <input type="radio" name="mode" value="server" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "server") echo "checked"; ?>> + <input type="radio" name="mode" value="server" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "server") echo "checked=\"checked\""; ?>/> <?=gettext("Enable PPPoE server"); ?></td> </tr> @@ -382,11 +382,11 @@ function enable_change(enable_over) { 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; ?> - </select> <br> + </select> <br /> </td> </tr> @@ -397,14 +397,14 @@ function enable_change(enable_over) { <?php for($x=0; $x<33; $x++) { if($x == $pconfig['pppoe_subnet']) - $SELECTED = " SELECTED"; + $selected = "selected=\"selected\""; else - $SELECTED = ""; - echo "<option value=\"{$x}\"{$SELECTED}>{$x}</option>\n"; + $selected = ""; + echo "<option value=\"{$x}\" {$selected}>{$x}</option>\n"; } ?> </select> - <br><?=gettext("Hint"); ?>: 24 <?=gettext("is"); ?> 255.255.255.0 + <br /><?=gettext("Hint"); ?>: 24 <?=gettext("is"); ?> 255.255.255.0 </td> </tr> <tr> @@ -414,20 +414,20 @@ function enable_change(enable_over) { <?php for($x=0; $x<255; $x++) { if($x == $pconfig['n_pppoe_units']) - $SELECTED = " SELECTED"; + $selected = "selected=\"selected\""; else - $SELECTED = ""; - echo "<option value=\"{$x}\"{$SELECTED}>{$x}</option>\n"; + $selected = ""; + echo "<option value=\"{$x}\" {$selected}>{$x}</option>\n"; } ?> </select> - <br><?=gettext("Hint: 10 is ten PPPoE clients"); ?> + <br /><?=gettext("Hint: 10 is ten PPPoE clients"); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Server address"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"> + <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"/> <br/> <?=gettext("Enter the IP address the PPPoE server should give to clients for use as their \"gateway\""); ?>. <br/> @@ -439,95 +439,95 @@ function enable_change(enable_over) { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address range"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>"> - <br> - <?=gettext("Specify the starting address for the client IP address subnet"); ?>.<br> + <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>"/> + <br /> + <?=gettext("Specify the starting address for the client IP address subnet"); ?>.<br /> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> + <?=$mandfldhtml;?><input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"/> <br/> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("DNS servers"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="pppoe_dns1" type="text" class="formfld unknown" id="pppoe_dns1" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns1']);?>"> - <br> - <input name="pppoe_dns2" type="text" class="formfld unknown" id="pppoe_dns2" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns2']);?>"> - <br> - <?=gettext("If entered they will be given to all PPPoE clients, else LAN DNS and one WAN DNS will go to all clients"); ?><br> + <?=$mandfldhtml;?><input name="pppoe_dns1" type="text" class="formfld unknown" id="pppoe_dns1" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns1']);?>"/> + <br /> + <input name="pppoe_dns2" type="text" class="formfld unknown" id="pppoe_dns2" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns2']);?>"/> + <br /> + <?=gettext("If entered they will be given to all PPPoE clients, else LAN DNS and one WAN DNS will go to all clients"); ?><br /> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS"); ?></td> <td width="78%" class="vtable"> - <input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked"; ?>> - <strong><?=gettext("Use a RADIUS server for authentication"); ?><br> + <input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Use a RADIUS server for authentication"); ?><br /> </strong><?=gettext("When set, all users will be authenticated using " . "the RADIUS server specified below. The local user database " . - "will not be used"); ?>.<br> - <br> - <input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked"; ?>> - <strong><?=gettext("Enable RADIUS accounting"); ?> <br> - <br> - </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br> - <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked"; ?>> - <strong><?=gettext("Use Backup RADIUS Server"); ?></strong><br> + "will not be used"); ?>.<br /> + <br /> + <input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Enable RADIUS accounting"); ?> <br /> + <br /> + </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br /> + <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Use Backup RADIUS Server"); ?></strong><br /> <?=gettext("When set, if primary server fails all requests will be sent via backup server"); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("NAS IP Address"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="radius_nasip" type="text" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>"> - <br><?=gettext("RADIUS server NAS IP Address"); ?><br> + <?=$mandfldhtml;?><input name="radius_nasip" type="text" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>"/> + <br /><?=gettext("RADIUS server NAS IP Address"); ?><br /> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("RADIUS Accounting Update"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="radius_acct_update" type="text" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>"> - <br><?=gettext("RADIUS accounting update period in seconds"); ?> + <?=$mandfldhtml;?><input name="radius_acct_update" type="text" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>"/> + <br /><?=gettext("RADIUS accounting update period in seconds"); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS issued IPs"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips"<?php if($pconfig['radiusissueips']) echo " CHECKED"; ?>> - <br><?=gettext("Issue IP Addresses via RADIUS server"); ?>.</td> + <input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips" <?php if($pconfig['radiusissueips']) echo "checked=\"checked\""; ?>/> + <br /><?=gettext("Issue IP Addresses via RADIUS server"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS server Primary"); ?></td> <td width="78%" class="vtable"> - <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>"> - <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>"> - <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>"> - <br><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the RADIUS server."); ?><br> - <br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td> + <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>"/> + <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>"/> + <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>"/> + <br /><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the RADIUS server."); ?><br /> + <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS primary shared secret"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>"> - <br><?=gettext("Enter the shared secret that will be used to authenticate " . + <input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>"/> + <br /><?=gettext("Enter the shared secret that will be used to authenticate " . "to the RADIUS server"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS server Secondary"); ?></td> <td width="78%" class="vtable"> - <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>"> - <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>"> - <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>"> - <br><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the backup RADIUS server."); ?><br> - <br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td> + <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>"/> + <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>"/> + <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>"/> + <br /><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the backup RADIUS server."); ?><br /> + <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS secondary shared secret"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>"> - <br> + <input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>"/> + <br /> <?=gettext("Enter the shared secret that will be used to authenticate " . "to the RADIUS server"); ?>.</td> </tr> @@ -585,18 +585,18 @@ function enable_change(enable_over) { <td width="22%" valign="top"> </td> <td width="78%"> <?php if (isset($id)) - echo "<input type='hidden' name='id' id='id' value='{$id}' >"; + echo "<input type='hidden' name='id' id='id' value='{$id}' />"; ?> <?php if (isset($pconfig['pppoeid'])) - echo "<input type='hidden' name='pppoeid' id='pppoeid' value='{$pppoeid}' >"; + echo "<input type='hidden' name='pppoeid' id='pppoeid' value='{$pppoeid}' />"; ?> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)"/> - <a href="vpn_pppoe.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>"></a> + <a href="vpn_pppoe.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>"/></a> </td> </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br /> </strong></span><?=gettext("don't forget to add a firewall rule to permit " . "traffic from PPPoE clients"); ?>!</span></td> </tr> diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index a5da316..f372e38 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -201,7 +201,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<script language="JavaScript"> +<script type="text/JavaScript"> <!-- function get_radio_value(obj) { @@ -315,25 +315,28 @@ function enable_change(enable_over) { <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> <input name="mode" type="radio" onclick="enable_change(false)" value="off" - <?php if (($pconfig['mode'] != "server") && ($pconfig['mode'] != "redir")) echo "checked";?>> + <?php if (($pconfig['mode'] != "server") && ($pconfig['mode'] != "redir")) echo "checked=\"checked\"";?>/> <?=gettext("Off"); ?></td> + </tr> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> - <input type="radio" name="mode" value="redir" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "redir") echo "checked" ?>> + <input type="radio" name="mode" value="redir" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "redir") echo "checked=\"checked\"" ?>/> <?=gettext("Redirect incoming PPTP connections to");?>:</td> + </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("PPTP redirection");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="redir" type="text" class="formfld unknown" id="redir" size="20" value="<?=htmlspecialchars($pconfig['redir']);?>"> - <br> + <?=$mandfldhtml;?><input name="redir" type="text" class="formfld unknown" id="redir" size="20" value="<?=htmlspecialchars($pconfig['redir']);?>"/> + <br /> <?=gettext("Enter the IP address of a host which will accept incoming " . "PPTP connections"); ?>.</td> + </tr> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> - <input type="radio" name="mode" value="server" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "server") echo "checked"; ?>> + <input type="radio" name="mode" value="server" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "server") echo "checked=\"checked\""; ?>/> <?=gettext("Enable PPTP server"); ?></td> </tr> <tr> @@ -344,20 +347,20 @@ function enable_change(enable_over) { $toselect = ($pconfig['n_pptp_units'] > 0) ? $pconfig['n_pptp_units'] : 16; for($x=1; $x<255; $x++) { if($x == $toselect) - $SELECTED = " SELECTED"; + $selected = "selected=\"selected\""; else - $SELECTED = ""; - echo "<option value=\"{$x}\"{$SELECTED}>{$x}</option>\n"; + $selected = ""; + echo "<option value=\"{$x}\" {$selected}>{$x}</option>\n"; } ?> </select> - <br><?=gettext("Hint: 10 is ten PPTP clients"); ?> + <br /><?=gettext("Hint: 10 is ten PPTP clients"); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Server address"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"> + <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"/> <br/> <?=gettext("Enter the IP address the PPTP server should give to clients for use as their \"gateway\""); ?>. <br/> @@ -370,91 +373,92 @@ function enable_change(enable_over) { <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address " . "range"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>"> - <br> - <?=gettext("Specify the starting address for the client IP subnet"); ?>.<br> + <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>"/> + <br /> + <?=gettext("Specify the starting address for the client IP subnet"); ?>.<br /> + </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("PPTP DNS Servers"); ?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="pptp_dns1" type="text" class="formfld unknown" id="pptp_dns1" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns1']);?>"> - <br> - <input name="pptp_dns2" type="text" class="formfld unknown" id="pptp_dns2" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns2']);?>"> - <br> - <?=gettext("primary and secondary DNS servers assigned to PPTP clients"); ?><br> + <?=$mandfldhtml;?><input name="pptp_dns1" type="text" class="formfld unknown" id="pptp_dns1" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns1']);?>"/> + <br /> + <input name="pptp_dns2" type="text" class="formfld unknown" id="pptp_dns2" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns2']);?>"/> + <br /> + <?=gettext("primary and secondary DNS servers assigned to PPTP clients"); ?><br /> + </td> </tr> <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> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS"); ?></td> <td width="78%" class="vtable"> - <input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked"; ?>> - <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br> + <input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br /> <?=gettext("When set, all users will be authenticated using " . "the RADIUS server specified below. The local user database " . - "will not be used"); ?>.<br> - <br> - <input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked"; ?>> - <strong><?=gettext("Enable RADIUS accounting"); ?> <br> - </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br> - <br> - <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked"; ?>> - <strong><?=gettext("Secondary RADIUS server for failover authentication"); ?></strong><br> - <?=gettext("When set, all requests will go to the secondary server when primary fails"); ?><br> - <br> - <input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips"<?php if($pconfig['radiusissueips']) echo " CHECKED"; ?>> + "will not be used"); ?>.<br /> + <br /> + <input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Enable RADIUS accounting"); ?> <br /> + </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br /> + <br /> + <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Secondary RADIUS server for failover authentication"); ?></strong><br /> + <?=gettext("When set, all requests will go to the secondary server when primary fails"); ?><br /> + <br /> + <input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips" <?php if($pconfig['radiusissueips']) echo "checked=\"checked\""; ?>/> <strong><?=gettext("RADIUS issued IPs"); ?></strong> - <br><?=gettext("Issue IP addresses via RADIUS server"); ?>. + <br /><?=gettext("Issue IP addresses via RADIUS server"); ?>. </td> - </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS NAS IP"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radius_nasip" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>"> + <input name="radius_nasip" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>"/> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS Accounting Update"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radius_acct_update" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>"> + <input name="radius_acct_update" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>"/> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS Server"); ?> </td> <td width="78%" class="vtable"> - <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>"> - <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>"> - <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>"> - <br> + <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>"/> + <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>"/> + <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>"/> + <br /> <?=gettext("Enter the IP address, RADIUS port, and RADIUS accounting port of the RADIUS server"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS shared secret"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>"> - <br> + <input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>"/> + <br /> <?=gettext("Enter the shared secret that will be used to authenticate " . "to the RADIUS server"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Secondary RADIUS server"); ?> </td> <td width="78%" class="vtable"> - <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>"> - <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>"> - <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>"> - <br> + <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>"/> + <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>"/> + <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>"/> + <br /> <?=gettext("Enter the IP address, RADIUS port, and RADIUS accounting port of the RADIUS server"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Secondary RADIUS shared secret"); ?></td> <td width="78%" valign="top" class="vtable"> - <input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>"> - <br> + <input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>"/> + <br /> <?=gettext("Enter the shared secret that will be used to authenticate " . "to the secondary RADIUS server"); ?>.</td> </tr> @@ -464,8 +468,8 @@ function enable_change(enable_over) { <tr> <td width="22%" valign="middle"> </td> <td width="78%" class="vtable"> - <input name="req128" type="checkbox" id="req128" value="yes" <?php if ($pconfig['req128']) echo "checked"; ?>> - <strong><?=gettext("Require 128-bit encryption"); ?></strong><br> + <input name="req128" type="checkbox" id="req128" value="yes" <?php if ($pconfig['req128']) echo "checked=\"checked\""; ?>/> + <strong><?=gettext("Require 128-bit encryption"); ?></strong><br /> <?=gettext("When set, only 128-bit encryption will be accepted. Otherwise " . "40-bit and 56-bit encryption will be accepted as well. Note that " . "encryption will always be forced on PPTP connections (i.e. " . @@ -474,12 +478,12 @@ 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> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br /> </strong></span><?=gettext("don't forget to ");?><a href="firewall_rules.php?if=pptp"><?=gettext("add a firewall rule"); ?></a> <?=gettext("to permit ". "traffic from PPTP clients");?>!</span></td> </tr> @@ -489,7 +493,7 @@ function enable_change(enable_over) { </tr> </table> </form> -<script language="JavaScript"> +<script type="text/JavaScript"> <!-- enable_change(false); //--> diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php index 29a3b40..068fb91 100755 --- a/usr/local/www/vpn_pptp_users.php +++ b/usr/local/www/vpn_pptp_users.php @@ -81,7 +81,7 @@ include("head.inc"); <?php if (isset($config['pptpd']['radius']['enable'])) print_info_box(gettext("Warning: RADIUS is enabled. The local user database will not be used.")); ?> <?php if (is_subsystem_dirty('pptpusers')): ?><p> -<?php print_info_box_np(gettext("The PPTP user list has been modified").".<br>".gettext("You must apply the changes in order for them to take effect").".<br><b>".gettext("Warning: this will terminate all current PPTP sessions")."!</b>");?><br> +<?php print_info_box_np(gettext("The PPTP user list has been modified").".<br />".gettext("You must apply the changes in order for them to take effect").".<br /><b>".gettext("Warning: this will terminate all current PPTP sessions")."!</b>");?><br /> <?php endif; ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> @@ -102,7 +102,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td width="17"></td> - <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user");?>" width="17" height="17" border="0"></a></td> + <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user");?>" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> @@ -115,8 +115,8 @@ include("head.inc"); <td class="listr"> <?=htmlspecialchars($secretent['ip']);?> </td> - <td class="list" nowrap> <a href="vpn_pptp_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit user");?>" width="17" height="17" border="0"></a> - <a href="vpn_pptp_users.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this user?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete user");?>" width="17" height="17" border="0"></a></td> + <td class="list" nowrap="nowrap"> <a href="vpn_pptp_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit user");?>" alt="" width="17" height="17" border="0"/></a> + <a href="vpn_pptp_users.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this user?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete user");?>" alt="" width="17" height="17" border="0"/></a></td> </tr> <?php $i++; endforeach; ?> <tr> @@ -125,7 +125,7 @@ include("head.inc"); <table border="0" cellspacing="0" cellpadding="1"> <tr> <td width="17"></td> - <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user");?>" width="17" height="17" border="0"></a></td> + <td><a href="vpn_pptp_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user");?>" alt="" width="17" height="17" border="0"/></a></td> </tr> </table> </td> diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php index cf375e8..e058442 100755 --- a/usr/local/www/vpn_pptp_users_edit.php +++ b/usr/local/www/vpn_pptp_users_edit.php @@ -146,29 +146,30 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>"> + <?=$mandfldhtml;?><input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>"/> </td> + </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td> <td width="78%" class="vtable"> - <?=$mandfldhtml;?><input name="password" type="password" class="formfld pwd" id="password" size="20"> - <br><?=$mandfldhtml;?><input name="password2" type="password" class="formfld pwd" id="password2" size="20"> - (<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]): ?><br> + <?=$mandfldhtml;?><input name="password" type="password" class="formfld pwd" id="password" size="20"/> + <br /><?=$mandfldhtml;?><input name="password2" type="password" class="formfld pwd" id="password2" size="20"/> + (<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]): ?><br /> <span class="vexpl"><?=gettext("If you want to change the users' password, ". "enter it here twice.");?></span><?php endif; ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td> <td width="78%" class="vtable"> - <input name="ip" type="text" class="formfld unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>"> - <br><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td> + <input name="ip" type="text" class="formfld unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>"/> + <br /><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td> </tr> <tr> <td class="vncell" width="22%" valign="top"> </td> <td class="vncell" width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"/> <?php if (isset($id) && $a_secret[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"/> <?php endif; ?> </td> </tr> |
