diff options
| author | Colin Fleming <cj_fleming@sky.com> | 2013-11-04 21:15:30 +0000 |
|---|---|---|
| committer | Colin Fleming <cj_fleming@sky.com> | 2013-11-04 21:15:30 +0000 |
| commit | 0049162546374dff2084615f09fbb538eada0bc1 (patch) | |
| tree | 2f7aad922315d99b0611d48e6f9b5fe2a9ac7f80 /usr/local/www/diag_logs_settings.php | |
| parent | 8a0ae97fa0e249aa13538103e662aa6191ebde65 (diff) | |
| download | pfsense-0049162546374dff2084615f09fbb538eada0bc1.zip pfsense-0049162546374dff2084615f09fbb538eada0bc1.tar.gz | |
Tidy up "diag_logs_settings.php" XHTML
Add "closehead" PHP variable and close the HEAD statement
Add CDATA to script statement
Add SUMMARY to table statement
Tidy up HTML Boolean operators
Close BR and INPUT statements
Remove duplicate closing table cell statement
Diffstat (limited to 'usr/local/www/diag_logs_settings.php')
| -rwxr-xr-x | usr/local/www/diag_logs_settings.php | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 9c84f84..b1eef64 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -164,13 +164,14 @@ if ($_POST) { } $pgtitle = array(gettext("Status"), gettext("System logs"), gettext("Settings")); +$closehead = false; include("head.inc"); ?> -<script language="JavaScript"> -<!-- +<script type="text/javascript"> +//<![CDATA[ function enable_change(enable_over) { if (document.iform.enable.checked || enable_over) { document.iform.remoteserver.disabled = 0; @@ -230,15 +231,15 @@ function check_everything() { document.iform.system.disabled = 0; } } -// --> +//]]> </script> - +</head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <form action="diag_logs_settings.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="logs settings"> <tr><td> <?php $tab_array = array(); @@ -259,63 +260,63 @@ function check_everything() { <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("General Logging Options");?></td> </tr> <tr> <td width="22%" valign="top" class="vtable">Forward/Reverse Display</td> - <td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>> + <td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Show log entries in reverse order (newest entries on top)");?></strong></td> </tr> <tr> <td width="22%" valign="top" class="vtable">GUI Log Entries to Display</td> <td width="78%" class="vtable"> - <input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"><br/> + <input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>" /><br/> <?=gettext("Hint: This is only the number of log entries displayed in the GUI. It does not affect how many entries are contained in the actual log files.") ?></td> </tr> <tr> <td valign="top" class="vtable">Log Firewall Default Blocks</td> <td class="vtable"> - <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>> + <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Log packets blocked by the default rule");?></strong><br/> <?=gettext("Hint: packets that are blocked by the implicit default block rule will not be logged if you uncheck this option. Per-rule logging options are still respected.");?> <br/> - <input name="logbogons" type="checkbox" id="logbogons" value="yes" <?php if ($pconfig['logbogons']) echo "checked"; ?>> + <input name="logbogons" type="checkbox" id="logbogons" value="yes" <?php if ($pconfig['logbogons']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Log packets blocked by 'Block Bogon Networks' rules");?></strong><br/> <br/> - <input name="logprivatenets" type="checkbox" id="logprivatenets" value="yes" <?php if ($pconfig['logprivatenets']) echo "checked"; ?>> + <input name="logprivatenets" type="checkbox" id="logprivatenets" value="yes" <?php if ($pconfig['logprivatenets']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Log packets blocked by 'Block Private Networks' rules");?></strong><br/> </td> </tr> <tr> <td valign="top" class="vtable">Web Server Log</td> - <td class="vtable"> <input name="loglighttpd" type="checkbox" id="loglighttpd" value="yes" <?php if ($pconfig['loglighttpd']) echo "checked"; ?>> - <strong><?=gettext("Log errors from the web server process.");?></strong><br> + <td class="vtable"> <input name="loglighttpd" type="checkbox" id="loglighttpd" value="yes" <?php if ($pconfig['loglighttpd']) echo "checked=\"checked\""; ?> /> + <strong><?=gettext("Log errors from the web server process.");?></strong><br/> <?=gettext("Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log.");?></td> </tr> <tr> <td valign="top" class="vtable">Raw Logs</td> - <td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>> - <strong><?=gettext("Show raw filter logs");?></strong><br> + <td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked=\"checked\""; ?> /> + <strong><?=gettext("Show raw filter logs");?></strong><br/> <?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.");?></td> </tr> <tr> <td valign="top" class="vtable">Filter descriptions</td> <td class="vtable"> <select name="filterdescriptions" id="filterdescriptions" > - <option value="0"<?=!isset($pconfig['filterdescriptions'])?" selected":""?>>Dont load descriptions</option> - <option value="1"<?=($pconfig['filterdescriptions'])==="1"?" selected":""?>>Display as column</option> - <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected":""?>>Display as second row</option> + <option value="0"<?=!isset($pconfig['filterdescriptions'])?" selected=\"selected\"":""?>>Dont load descriptions</option> + <option value="1"<?=($pconfig['filterdescriptions'])==="1"?" selected=\"selected\"":""?>>Display as column</option> + <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected=\"selected\"":""?>>Display as second row</option> </select> <strong><?=gettext("Show the applied rule description below or in the firewall log rows.");?></strong> <br/> - <?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rule sets.");?></td> + <?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rule sets.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vtable">Local Logging</td> - <td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)"> + <td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" /> <?php if ($g['platform'] == "pfSense"): ?> <strong><?=gettext("Disable writing log files to the local disk");?></strong></td> <?php else: ?> @@ -364,24 +365,24 @@ function check_everything() { </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Enable Remote Logging");?></td> - <td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)"> + <td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" /> <strong><?=gettext("Send log messages to remote syslog server");?></strong></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Servers");?></td> <td width="78%" class="vtable"> - <table> + <table summary="remtote syslog servers"> <tr> <td><?=gettext("Server") . " 1";?></td> - <td><input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>"></td> + <td><input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>" /></td> </tr> <tr> <td><?=gettext("Server") . " 2";?></td> - <td><input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>"></td> + <td><input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>" /></td> </tr> <tr> <td><?=gettext("Server") . " 3";?></td> - <td><input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>"></td> + <td><input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>" /></td> </tr> <tr> <td> </td> @@ -392,34 +393,34 @@ function check_everything() { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Contents");?></td> <td width="78%" class="vtable"> - <input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked"; ?> onclick="check_everything();"> + <input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked=\"checked\""; ?> onclick="check_everything();" /> <?=gettext("Everything");?><br/><br/> - <input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>> + <input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked=\"checked\""; ?> /> <?=gettext("System events");?><br/> - <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>> + <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked=\"checked\""; ?> /> <?=gettext("Firewall events");?><br/> - <input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>> + <input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked=\"checked\""; ?> /> <?=gettext("DHCP service events");?><br/> - <input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>> + <input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked=\"checked\""; ?> /> <?=gettext("Portal Auth events");?><br/> - <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>> + <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked=\"checked\""; ?> /> <?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br/> - <input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked"; ?>> + <input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked=\"checked\""; ?> /> <?=gettext("Gateway Monitor events");?><br/> - <input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked"; ?>> + <input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked=\"checked\""; ?> /> <?=gettext("Server Load Balancer events");?><br/> - <input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked"; ?>> + <input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked=\"checked\""; ?> /> <?=gettext("Wireless events");?><br/> </td> </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)"> + <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)" /> </td> </tr> <tr> <td width="22%" height="53" valign="top"> </td> - <td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br> + <td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br/> <?=gettext("syslog sends UDP datagrams to port 514 on the specified " . "remote syslog server, unless another port is specified. Be sure to set syslogd on the " . "remote server to accept syslog messages from");?> <?=$g['product_name']?>. @@ -430,11 +431,11 @@ function check_everything() { </td></tr> </table> </form> -<script language="JavaScript"> -<!-- +<script type="text/javascript"> +//<![CDATA[ enable_change(false); -//--> +//]]> </script> <?php include("fend.inc"); ?> </body> -</html> +</html>
\ No newline at end of file |
