Skip to content

Commit e34a7ab

Browse files
jim-pjim-p
committed
Reformat syslog settings, cleanup whitespace, reword some awkward English, add more detail.
1 parent 4a8a90f commit e34a7ab

File tree

1 file changed

+112
-110
lines changed

1 file changed

+112
-110
lines changed

‎usr/local/www/diag_logs_settings.php

+112-110
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
POSSIBILITY OF SUCH DAMAGE.
3232
*/
3333

34-
/*
34+
/*
3535
pfSense_MODULE: system
3636
*/
3737

@@ -102,7 +102,7 @@
102102
$config['syslog']['apinger'] = $_POST['apinger'] ? true : false;
103103
$config['syslog']['relayd'] = $_POST['relayd'] ? true : false;
104104
$config['syslog']['hostapd'] = $_POST['hostapd'] ? true : false;
105-
$config['syslog']['logall'] = $_POST['logall'] ? true : false;
105+
$config['syslog']['logall'] = $_POST['logall'] ? true : false;
106106
$config['syslog']['system'] = $_POST['system'] ? true : false;
107107
$config['syslog']['disablelocallogging'] = $_POST['disablelocallogging'] ? true : false;
108108
$config['syslog']['enable'] = $_POST['enable'] ? true : false;
@@ -201,7 +201,7 @@ function check_everything() {
201201
<?php if ($input_errors) print_input_errors($input_errors); ?>
202202
<?php if ($savemsg) print_info_box($savemsg); ?>
203203
<table width="100%" border="0" cellpadding="0" cellspacing="0">
204-
<tr><td>
204+
<tr><td>
205205
<?php
206206
$tab_array = array();
207207
$tab_array[] = array(gettext("System"), false, "diag_logs.php");
@@ -218,118 +218,120 @@ function check_everything() {
218218
$tab_array[] = array(gettext("Settings"), true, "diag_logs_settings.php");
219219
display_top_tabs($tab_array);
220220
?>
221-
</td></tr>
222-
<tr>
223-
<td>
221+
</td></tr>
222+
<tr>
223+
<td>
224224
<div id="mainarea">
225-
<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
226-
<tr>
227-
<td width="22%" valign="top" class="vtable">&nbsp;</td>
228-
<td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>>
225+
<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
226+
<tr>
227+
<td colspan="2" valign="top" class="listtopic"><?=gettext("General Logging Options");?></td>
228+
</tr>
229+
<tr>
230+
<td width="22%" valign="top" class="vtable">Forward/Reverse Display</td>
231+
<td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>>
229232
<strong><?=gettext("Show log entries in reverse order (newest entries on top)");?></strong></td>
230-
</tr>
231-
<tr>
232-
<td width="22%" valign="top" class="vtable">&nbsp;</td>
233-
<td width="78%" class="vtable"><?=gettext("Number of log entries to show:")?>
234-
<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"></td>
235-
</tr>
236-
<tr>
237-
<td valign="top" class="vtable">&nbsp;</td>
238-
<td class="vtable"> <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>>
233+
</tr>
234+
<tr>
235+
<td width="22%" valign="top" class="vtable">GUI Log Entries to Display</td>
236+
<td width="78%" class="vtable">
237+
<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"><br/>
238+
<?=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>
239+
</tr>
240+
<tr>
241+
<td valign="top" class="vtable">Log Firewall Default Blocks</td>
242+
<td class="vtable"> <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>>
239243
<strong><?=gettext("Log packets blocked by the default rule");?></strong><br>
240-
<?=gettext("Hint: packets that are blocked by the " .
241-
"implicit default block rule will not be logged anymore " .
242-
"if you uncheck this option. Per-rule logging options are not affected.");?></td>
243-
</tr>
244-
<tr>
245-
<td valign="top" class="vtable">&nbsp;</td>
246-
<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>>
244+
<?=gettext("Hint: packets that are blocked by the " .
245+
"implicit default block rule will not be logged " .
246+
"if you uncheck this option. Per-rule logging options are still respected.");?></td>
247+
</tr>
248+
<tr>
249+
<td valign="top" class="vtable">Raw Logs</td>
250+
<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>>
247251
<strong><?=gettext("Show raw filter logs");?></strong><br>
248-
<?=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.");?></td>
249-
</tr>
250-
<tr>
251-
<td width="22%" valign="top" class="vtable">&nbsp;</td>
252-
<td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)">
253-
<strong><?=gettext("Disable writing log files to the local RAM disk");?></strong></td>
254-
</tr>
255-
<tr>
256-
<td width="22%" valign="top" class="vtable">&nbsp;</td>
257-
<td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
258-
<strong><?=gettext("Enable syslog'ing to remote syslog server");?></strong></td>
259-
</tr>
260-
<tr>
261-
<td width="22%" valign="top" class="vncell"><?=gettext("Remote syslog servers");?></td>
262-
<td width="78%" class="vtable">
263-
<table>
264-
<tr>
265-
<td>
266-
<?=gettext("Server") . " 1";?>
267-
</td>
268-
<td>
269-
<input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>">
270-
</td>
271-
</tr>
272-
<tr>
273-
<td>
274-
<?=gettext("Server") . " 2";?>
275-
</td>
276-
<td>
277-
<input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>">
278-
</td>
279-
</tr>
280-
<tr>
281-
<td>
282-
<?=gettext("Server") . " 3";?>
283-
</td>
284-
<td>
285-
<input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>">
286-
</td>
287-
</tr>
288-
<tr>
289-
<td>
290-
&nbsp;
291-
</td>
292-
<td>
293-
<?=gettext("IP addresses of remote syslog servers, or an IP:port.");?>
294-
</td>
295-
</table>
296-
<input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
297-
<?=gettext("System events");?><br>
298-
<input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
299-
<?=gettext("Firewall events");?><br>
300-
<input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
301-
<?=gettext("DHCP service events");?><br>
302-
<input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
303-
<?=gettext("Portal Auth events");?><br>
304-
<input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
305-
<?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br>
306-
<input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked"; ?>>
307-
<?=gettext("Gateway Monitor events");?><br>
308-
<input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked"; ?>>
309-
<?=gettext("Server Load Balancer events");?><br>
310-
<input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked"; ?>>
311-
<?=gettext("Wireless events");?><br>
312-
<br> <input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked"; ?> onclick="check_everything();">
313-
<?=gettext("Everything");?>
314-
</td>
315-
</tr>
316-
<tr>
317-
<td width="22%" valign="top">&nbsp;</td>
318-
<td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
319-
</td>
320-
</tr>
321-
<tr>
322-
<td width="22%" height="53" valign="top">&nbsp;</td>
323-
<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br>
324-
<?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
325-
"remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
326-
"remote server to accept syslog messages from");?> <?=$g['product_name']?>.
327-
</td>
328-
</tr>
329-
</table>
252+
<?=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>
253+
</tr>
254+
<tr>
255+
<td width="22%" valign="top" class="vtable">Local Logging</td>
256+
<td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)">
257+
<?php if ($g['platform'] == "pfSense"): ?>
258+
<strong><?=gettext("Disable writing log files to the local disk");?></strong></td>
259+
<?php else: ?>
260+
<strong><?=gettext("Disable writing log files to the local RAM disk");?></strong></td>
261+
<?php endif; ?>
262+
</tr>
263+
<tr>
264+
<td colspan="2" valign="top">&nbsp;</td>
265+
</tr>
266+
<tr>
267+
<td colspan="2" valign="top" class="listtopic"><?=gettext("Remote Logging Options");?></td>
268+
</tr>
269+
<tr>
270+
<td width="22%" valign="top" class="vncell"><?=gettext("Enable Remote Logging");?></td>
271+
<td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
272+
<strong><?=gettext("Send log messages to remote syslog server");?></strong></td>
273+
</tr>
274+
<tr>
275+
<td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Servers");?></td>
276+
<td width="78%" class="vtable">
277+
<table>
278+
<tr>
279+
<td><?=gettext("Server") . " 1";?></td>
280+
<td><input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>"></td>
281+
</tr>
282+
<tr>
283+
<td><?=gettext("Server") . " 2";?></td>
284+
<td><input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>"></td>
285+
</tr>
286+
<tr>
287+
<td><?=gettext("Server") . " 3";?></td>
288+
<td><input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>"></td>
289+
</tr>
290+
<tr>
291+
<td>&nbsp;</td>
292+
<td><?=gettext("IP addresses of remote syslog servers, or an IP:port.");?></td>
293+
</table>
294+
</td>
295+
</tr>
296+
<tr>
297+
<td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Contents");?></td>
298+
<td width="78%" class="vtable">
299+
<input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked"; ?> onclick="check_everything();">
300+
<?=gettext("Everything");?><br/><br/>
301+
<input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
302+
<?=gettext("System events");?><br/>
303+
<input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
304+
<?=gettext("Firewall events");?><br/>
305+
<input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
306+
<?=gettext("DHCP service events");?><br/>
307+
<input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
308+
<?=gettext("Portal Auth events");?><br/>
309+
<input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
310+
<?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br/>
311+
<input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked"; ?>>
312+
<?=gettext("Gateway Monitor events");?><br/>
313+
<input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked"; ?>>
314+
<?=gettext("Server Load Balancer events");?><br/>
315+
<input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked"; ?>>
316+
<?=gettext("Wireless events");?><br/>
317+
</td>
318+
</tr>
319+
<tr>
320+
<td width="22%" valign="top">&nbsp;</td>
321+
<td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
322+
</td>
323+
</tr>
324+
<tr>
325+
<td width="22%" height="53" valign="top">&nbsp;</td>
326+
<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br>
327+
<?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
328+
"remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
329+
"remote server to accept syslog messages from");?> <?=$g['product_name']?>.
330+
</td>
331+
</tr>
332+
</table>
330333
</div>
331-
</td>
332-
</tr>
334+
</td></tr>
333335
</table>
334336
</form>
335337
<script language="JavaScript">

0 commit comments

Comments
 (0)