From 96aa8f6139f37c3b1d8746e1452d6fb7deacb672 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 3 Aug 2010 12:37:14 -0300 Subject: Reset diag_* files on this branch --- usr/local/www/diag_arp.php | 32 +++++------ usr/local/www/diag_authentication.php | 20 +++---- usr/local/www/diag_confbak.php | 45 ++++++++-------- usr/local/www/diag_defaults.php | 29 +++++----- usr/local/www/diag_dump_states.php | 4 +- usr/local/www/diag_ipsec.php | 26 ++++----- usr/local/www/diag_ipsec_spd.php | 32 +++++------ usr/local/www/diag_logs.php | 28 +++++----- usr/local/www/diag_logs_auth.php | 28 +++++----- usr/local/www/diag_logs_dhcp.php | 28 +++++----- usr/local/www/diag_logs_filter.php | 56 +++++++++---------- usr/local/www/diag_logs_filter_dynamic.php | 40 +++++++------- usr/local/www/diag_logs_filter_summary.php | 48 ++++++++--------- usr/local/www/diag_logs_ipsec.php | 28 +++++----- usr/local/www/diag_logs_ntpd.php | 26 ++++----- usr/local/www/diag_logs_openvpn.php | 26 ++++----- usr/local/www/diag_logs_ppp.php | 28 +++++----- usr/local/www/diag_logs_relayd.php | 26 ++++----- usr/local/www/diag_logs_settings.php | 86 +++++++++++++++--------------- usr/local/www/diag_nanobsd.php | 34 ++++++------ usr/local/www/diag_overload_tables.php | 10 ++-- usr/local/www/diag_packet_capture.php | 67 +++++++++++------------ usr/local/www/diag_patterns.php | 16 +++--- usr/local/www/diag_resetstate.php | 34 ++++++------ usr/local/www/diag_routes.php | 11 ++-- usr/local/www/diag_system_activity.php | 4 +- usr/local/www/diag_system_pftop.php | 28 +++++----- 27 files changed, 420 insertions(+), 420 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 4a6e92c..3aff783 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -205,15 +205,15 @@ if(count($pools) > 0) { // Put this in an easy to use form $dhcpmac = array(); $dhcpip = array(); - + foreach ($leases as $value) { - $dhcpmac[$value['mac']] = $value['hostname']; - $dhcpip[$value['ip']] = $value['hostname']; + $dhcpmac[$value['mac']] = $value['hostname']; + $dhcpip[$value['ip']] = $value['hostname']; } exec("/usr/sbin/arp -an",$rawdata); -$i = 0; +$i = 0; /* if list */ $ifdescrs = get_configured_interface_with_descr(); @@ -225,7 +225,7 @@ foreach ($ifdescrs as $key =>$interface) { $data = array(); foreach ($rawdata as $line) { $elements = explode(' ',$line); - + if ($elements[3] != "(incomplete)") { $arpent = array(); $arpent['ip'] = trim(str_replace(array('(',')'),'',$elements[1])); @@ -238,28 +238,28 @@ foreach ($rawdata as $line) { function getHostName($mac,$ip) { global $dhcpmac, $dhcpip; - + if ($dhcpmac[$mac]) return $dhcpmac[$mac]; else if ($dhcpip[$ip]) return $dhcpip[$ip]; else if(gethostbyaddr($ip) <> "" and gethostbyaddr($ip) <> $ip) return gethostbyaddr($ip); - else - return ""; + else + return ""; } -$pgtitle = array("Diagnostics","ARP Table"); +$pgtitle = array(gettext("Diagnostics"),gettext("ARP Table")); include("head.inc"); ?> - +
- Loading, please wait... +

 

@@ -276,7 +276,7 @@ foreach ($data as &$entry) { $dns = trim(getHostName($entry['mac'], $entry['ip'])); if(trim($dns)) $entry['dnsresolve'] = "$dns"; - else + else $entry['dnsresolve'] = "Z_ "; } @@ -289,10 +289,10 @@ $data = msort($data, "dnsresolve"); - - - - + + + + diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php index f6ed771..91874d4 100755 --- a/usr/local/www/diag_authentication.php +++ b/usr/local/www/diag_authentication.php @@ -49,30 +49,30 @@ if ($_POST) { $authcfg = auth_get_authserver($_POST['authmode']); if (!$authcfg) - $input_errors[] = "{$_POST['authmode']} is not a valid authentication server "; + $input_errors[] = $_POST['authmode'] . " " . gettext("is not a valid authentication server"); if (empty($_POST['username']) || empty($_POST['password'])) - $input_errors[] = "A username and password must be specified."; + $input_errors[] = gettext("A username and password must be specified."); if (!$input_errors) { if (authenticate_user($_POST['username'], $_POST['password'], $authcfg)) { - $savemsg = "User: {$_POST['username']} authenticated sucessfully."; + $savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated sucessfully."); $groups = getUserGroups($_POST['username'], $authcfg); - $savemsg .= "
This user is member of this groups:
"; + $savemsg .= "
" + gettext("This user is member of this groups") + ":
"; foreach ($groups as $group) $savemsg .= "{$group} "; } else { - $input_errors[] = "Authentication failed."; + $input_errors[] = gettext("Authentication failed."); } } } -$pgtitle = array("Diagnostics","Authentication"); +$pgtitle = array(gettext("Diagnostics"),gettext("Authentication")); include("head.inc"); ?> - + @@ -87,7 +87,7 @@ include("head.inc");
IP addressMAC addressHostnameInterface
- + - + - + diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index 5d0458b..393f771 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: config */ @@ -45,9 +45,10 @@ if($_GET['newver'] != "") { conf_mount_rw(); $confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); if(config_restore($g['conf_path'] . '/backup/config-' . $_GET['newver'] . '.xml') == 0) - $savemsg = "Successfully reverted to timestamp " . date("n/j/y H:i:s", $_GET['newver']) . " with description \"" . $confvers[$_GET['newver']]['description'] . "\"."; + + $savemsg = sprintf(gettext("Successfully reverted to timestamp %s with description \"%s\"."), date(gettext("n/j/y H:i:s"), $_GET['newver']), $confvers[$_GET['newver']]['description']); else - $savemsg = "Unable to revert to the selected configuration."; + $savemsg = gettext("Unable to revert to the selected configuration."); conf_mount_ro(); } @@ -55,7 +56,7 @@ if($_GET['rmver'] != "") { conf_mount_rw(); $confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); unlink_if_exists($g['conf_path'] . '/backup/config-' . $_GET['rmver'] . '.xml'); - $savemsg = "Deleted backup with timestamp " . date("n/j/y H:i:s", $_GET['rmver']) . " and description \"" . $confvers[$_GET['rmver']]['description'] . "\"."; + $savemsg = sprintf(gettext("Deleted backup with timestamp %s and description \"%s\"."), date(gettext("n/j/y H:i:s"), $_GET['rmver']),$confvers[$_GET['rmver']]['description']); conf_mount_ro(); } @@ -94,7 +95,7 @@ cleanup_backupcache(); $confvers = get_backups(); unset($confvers['versions']); -$pgtitle = array("Diagnostics","Configuration History"); +$pgtitle = array(gettext("Diagnostics"),gettext("Configuration History")); include("head.inc"); ?> @@ -107,7 +108,7 @@ include("head.inc"); ?>
Authentication Server
Username ' />
Password ' />
- + + ?> @@ -149,25 +150,25 @@ include("head.inc"); - - + + - + - + @@ -179,24 +180,24 @@ include("head.inc");   - @@ -208,7 +209,7 @@ include("head.inc"); diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index c462abd..cde9d54 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -48,14 +48,14 @@ if ($_POST) { if ($_POST['Submit'] != " No ") { reset_factory_defaults(); system_reboot(); - $rebootmsg = "The system has been reset to factory defaults and is now rebooting. This may take one minute."; + $rebootmsg = gettext("The system has been reset to factory defaults and is now rebooting. This may take one minute."); } else { header("Location: index.php"); exit; } } -$pgtitle = array("Diagnostics","Factory defaults"); +$pgtitle = array(gettext("Diagnostics"),gettext("Factory defaults")); include("head.inc"); ?> @@ -64,21 +64,22 @@ include("head.inc"); -

If you click "Yes", the firewall will: - +

: +

- Are you sure you want to proceed?

+

- - + "> + ">

diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index 50cdb32..a98b943 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -50,7 +50,7 @@ if($_GET['action']) { $retval = mwexec("/sbin/pfctl -k '{$srcip}' -k '{$dstip}'"); echo htmlentities("|{$srcip}|{$dstip}|{$retval}|"); } else { - echo "invalid input"; + echo gettext("invalid input"); } exit; } @@ -132,7 +132,7 @@ include("head.inc");
Configuration diff from to
DateConfiguration Change
Current
- - Revert to this configuration + '")> + <?=gettext(" title=""> - - Remove this backup + ')"> + <?=gettext(" title=""> - Download this backup + <?=gettext(" title="">
- +
- + @@ -82,12 +82,12 @@ $sad = ipsec_dump_sad();
Current state count: : : diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index a77d261..99b9864 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -45,7 +45,7 @@ global $g; -$pgtitle = array("Status","IPsec"); +$pgtitle = array(gettext("Status"),gettext("IPsec")); require("guiconfig.inc"); include("head.inc"); @@ -69,10 +69,10 @@ $sad = ipsec_dump_sad();
- - - - - - + + + + + + - Note:
 + :
 - You can configure your IPsec + here. diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 3d44b62..8621e59 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -46,7 +46,7 @@ require("guiconfig.inc"); require("ipsec.inc"); -$pgtitle = array("Status","IPsec","SPD"); +$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SPD")); include("head.inc"); /* delete any SP? */ @@ -69,10 +69,10 @@ $spd = ipsec_dump_spd(); @@ -83,11 +83,11 @@ $spd = ipsec_dump_spd();
Local IPRemote IPLocal NetworkRemote NetworkDescriptionStatus
- - - - - + + + + + @@ -105,7 +105,7 @@ $spd = ipsec_dump_spd(); $args .= "&dstid=".rawurlencode($sp['dstid']); $args .= "&dir=".rawurlencode($sp['dir']); ?> - + ')"> @@ -116,19 +116,19 @@ $spd = ipsec_dump_spd();
SourceDestinationDirectionProtocolTunnel endpoints
- + - + @@ -140,8 +140,8 @@ $spd = ipsec_dump_spd();

-Note:
 -You can configure your IPsec here. +:
 + . diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 85b61df..145d480 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -62,7 +62,7 @@ if ($_POST['filtertext']) if ($filtertext) $filtertextmeta="?filtertext=$filtertext"; -$pgtitle = array("Status","System logs","System"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("System")); include("head.inc"); ?> @@ -74,17 +74,17 @@ include("head.inc");

@@ -94,7 +94,7 @@ include("head.inc");
incoming (as seen by firewall)
outgoing (as seen by firewall)
-

No IPsec security policies.

+

- + diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 700b6dc..a6e9730 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -51,7 +51,7 @@ if (!$nentries) if ($_POST['clear']) clear_log_file($portal_logfile); -$pgtitle = array("Status","System logs","Portal Auth"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Portal Auth")); include("head.inc"); ?> @@ -62,17 +62,17 @@ include("head.inc"); @@ -82,11 +82,11 @@ include("head.inc");
Last system log entries
- + " />
+ + ">
- Last Portal Auth log entries

-
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index b95b969..ffc51c4 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -53,7 +53,7 @@ if (!$nentries) if ($_POST['clear']) clear_log_file($dhcpd_logfile); -$pgtitle = array("Status","System logs","DHCP"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("DHCP")); include("head.inc"); ?> @@ -64,17 +64,17 @@ include("head.inc"); @@ -84,11 +84,11 @@ include("head.inc"); + + ">
- Last DHCP service log entries

-
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 9d8d9cd..02b2591 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -53,7 +53,7 @@ if($_GET['getrulenum'] or $_POST['getrulenum']) { $rulenum = $_POST['getrulenum']; list($rulenum, $type) = explode(',', $rulenum); $rule = find_rule_by_number($rulenum, $type); - echo "The rule that triggered this action is:\n\n{$rule}"; + echo gettext("The rule that triggered this action is") . ":\n\n{$rule}"; exit; } @@ -87,7 +87,7 @@ if (!$nentries) if ($_POST['clear']) clear_log_file($filter_logfile); -$pgtitle = array("Status","System logs","Firewall"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Firewall")); include("head.inc"); ?> @@ -98,17 +98,17 @@ include("head.inc"); @@ -117,7 +117,7 @@ include("head.inc");
- - - - - - + + + + + + + @@ -97,17 +97,17 @@ include("head.inc"); @@ -115,19 +115,19 @@ include("head.inc");
- Normal View | Dynamic View | Summary View

+ | |

- Last firewall log entries. + - matched log entries. + - (Max ) +
ActTimeIfSourceDestinationProto
@@ -155,13 +155,13 @@ include("head.inc"); $dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto); ?> - - " title="Easy Rule: Add to Block List" onclick="return confirm('Do you really want to add this BLOCK rule?\n\nEasy Rule is still experimental.\nContinue at risk of your own peril.\nBackups are also nice.')"> + "> + " title="" onclick="return confirm('')"> - - " title="Easy Rule: Pass this traffic" onclick="return confirm('Do you really want to add this PASS rule?\n\nEasy Rule is still experimental.\nContinue at risk of your own peril.\nBackups are also nice.')"> + "> + " title="" onclick="return confirm('')">
- Last firewall log entries
- Normal View | Dynamic View | Summary View + | |
- Last records; Pause: + ; :
- Act - Time - If - Source - Destination - Proto + + + + + +
> diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index 4904127..1171b89 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -31,7 +31,7 @@ pfSense_MODULE: filter */ -$pgtitle = "Diagnostics: System logs: Firewall Log Summary"; +$pgtitle = gettext("Diagnostics").": ".gettext("System logs").": ".gettext("Firewall Log Summary"); require_once("guiconfig.inc"); include_once("filter_log.inc"); @@ -42,13 +42,13 @@ $entriesperblock = 5; $filterlog = conv_log_filter($filter_logfile, $lines, $lines); $gotlines = count($filterlog); $fields = array( - 'act' => "Actions", - 'interface' => "Interfaces", - 'proto' => "Protocols", - 'srcip' => "Source IPs", - 'dstip' => "Destination IPs", - 'srcport' => "Source Ports", - 'dstport' => "Destination Ports"); + 'act' => gettext("Actions"), + 'interface' => gettext("Interfaces"), + 'proto' => gettext("Protocols"), + 'srcip' => gettext("Source IPs"), + 'dstip' => gettext("Destination IPs"), + 'srcport' => gettext("Source Ports"), + 'dstport' => gettext("Destination Ports")); $summary = array(); foreach (array_keys($fields) as $f) { @@ -68,7 +68,7 @@ function stat_block($summary, $stat, $num) { global $gotlines, $fields; uasort($summary[$stat] , 'cmp'); print ''; - print ""; + print ""; $k = array_keys($summary[$stat]); $total = 0; $numentries = 0; @@ -78,7 +78,7 @@ function stat_block($summary, $stat, $num) { $numentries++; $outstr = $k[$i]; if (is_ipaddr($outstr)) { - $outstr = " {$outstr}"; + $outstr = " {$outstr}"; } elseif (substr_count($outstr, '/') == 1) { list($proto, $port) = explode('/', $outstr); $service = getservbyport($port, strtolower($proto)); @@ -181,17 +181,17 @@ include("head.inc"); ?> @@ -200,12 +200,12 @@ include("head.inc"); ?>
{$fields[$stat]} data
{$fields[$stat]} ".gettext("data")."
@@ -104,7 +104,7 @@ include("head.inc");
- Normal View | Dynamic View | Summary View

+ | |

-This is a firewall log summary, of the last lines of the firewall log (Max ).
-NOTE: IE8 users must enable compatibility view. +
+ @@ -84,17 +84,17 @@ include("head.inc");
- + [Unknown Gateway/Dynamic]: $2$3$4"; + $replaces = "$1[".gettext("Unknown Gateway/Dynamic")."]: $2$3$4"; $logent = preg_replace($searchs, $replaces, $logent); } $logent = preg_split("/\s+/", $logent, 6); diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index d168f70..588c0e2 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -51,7 +51,7 @@ if (!$nentries) if ($_POST['clear']) clear_log_file($ntpd_logfile); -$pgtitle = array("Status","System logs","OpenNTPD"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenNTPD")); include("head.inc"); ?> @@ -62,17 +62,17 @@ include("head.inc"); @@ -82,7 +82,7 @@ include("head.inc");
Last IPsec log entries
+ @@ -86,7 +86,7 @@ include("head.inc");
- Last OpenNTPD log entries

diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index aa50856..f052ad9 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -42,7 +42,7 @@ ##|*MATCH=diag_logs_openvpn.php* ##|-PRIV -$pgtitle = array("Status","System logs","OpenVPN"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN")); require("guiconfig.inc"); require_once("vpn.inc"); @@ -66,17 +66,17 @@ include("head.inc");
- + diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index 470d33d..52eb40b 100755 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -56,7 +56,7 @@ if ($_POST['clear']) $ppp_logarr = return_clog($ppp_logfile, $nentries); -$pgtitle = array("Status","System logs","PPP"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("PPP")); include("head.inc"); ?> @@ -67,17 +67,17 @@ include("head.inc"); @@ -87,7 +87,7 @@ include("head.inc");
Last OpenVPN log entries
- + [Unknown Gateway/Dynamic]: $2$3$4"; + $replaces = "$1[".gettext("Unknown Gateway/Dynamic")."]: $2$3$4"; $logent = preg_replace($searchs, $replaces, $logent); } $logent = preg_split("/\s+/", $logent, 6); diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 7bf67bf..57df0e1 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -52,7 +52,7 @@ if (!$nentries) if ($_POST['clear']) clear_log_file($relayd_logfile); -$pgtitle = array("Status","System logs","Load Balancer"); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Load Balancer")); include("head.inc"); ?> @@ -63,17 +63,17 @@ include("head.inc"); @@ -83,7 +83,7 @@ include("head.inc");
Last PPP log entries PPP log entries"),$nentries);?>
+ @@ -187,46 +187,44 @@ function enable_change(enable_over) { + - +
+ +
+ + + - + @@ -273,10 +271,10 @@ function enable_change(enable_over) { -
- Last Load Balancer log entries

diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index f2b7861..b86da2c 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -73,20 +73,20 @@ if ($_POST) { /* input validation */ if ($_POST['enable'] && !is_ipaddr($_POST['remoteserver'])) { - $input_errors[] = "A valid IP address must be specified for remote syslog server #1."; + $input_errors[] = gettext("A valid IP address must be specified for remote syslog server #1."); } if ($_POST['enable'] && $_POST['remoteserver2'] && !is_ipaddr($_POST['remoteserver2'])) { - $input_errors[] = "A valid IP address must be specified for remote syslog server #2."; + $input_errors[] = gettext("A valid IP address must be specified for remote syslog server #2."); } if ($_POST['enable'] && $_POST['remoteserver3'] && !is_ipaddr($_POST['remoteserver3'])) { - $input_errors[] = "A valid IP address must be specified for remote syslog server #3."; + $input_errors[] = gettext("A valid IP address must be specified for remote syslog server #3."); } if ($_POST['enable'] && !is_ipaddr($_POST['remoteserver'])) { - $input_errors[] = "A valid IP address must be specified."; + $input_errors[] = gettext("A valid IP address must be specified."); } if (($_POST['nentries'] < 5) || ($_POST['nentries'] > 2000)) { - $input_errors[] = "Number of log entries to show must be between 5 and 2000."; + $input_errors[] = gettext("Number of log entries to show must be between 5 and 2000."); } if (!$input_errors) { @@ -123,7 +123,7 @@ if ($_POST) { } } -$pgtitle = array("Status","System logs","Settings"); +$pgtitle = array(gettext("Status"), gettext("System logs"), gettext("Settings")); include("head.inc"); ?> @@ -166,17 +166,17 @@ function enable_change(enable_over) {
  > - Show log entries in reverse order (newest entries - on top)
 Number of log entries to - show: +
  > - Log packets blocked by the default rule
- Hint: packets that are blocked by the - implicit default block rule will not be logged anymore - if you uncheck this option. Per-rule logging options are not affected.
  > - Show raw filter logs
- Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information.
  onClick="enable_change(false)"> - Disable writing log files to the local RAM disk
  onClick="enable_change(false)"> - Enable syslog'ing to remote syslog server
Remote syslog servers
- Server 1 + @@ -234,7 +232,7 @@ function enable_change(enable_over) {
- Server 2 + @@ -242,7 +240,7 @@ function enable_change(enable_over) {
- Server 3 + @@ -253,17 +251,17 @@ function enable_change(enable_over) {   - IP addresses of remote syslog servers +
> - system events
> - firewall events
> - DHCP service events
> - Portal Auth
> - PPTP VPN events +
> +
> +
> +
> +
> - Everything +
 Note:
- syslog sends UDP datagrams to port 514 on the specified - remote syslog server. Be sure to set syslogd on the - remote server to accept syslog messages from . +
+ .
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 4e64c8f..db96484 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -46,7 +46,7 @@ ini_set('max_input_time', '9999'); require_once("guiconfig.inc"); require_once("config.inc"); -$pgtitle = array("Diagnostics","NanoBSD"); +$pgtitle = array(gettext("Diagnostics"), gettext("NanoBSD")); include("head.inc"); // Survey slice info @@ -76,7 +76,7 @@ if($_POST['bootslice']) {
EOF; nanobsd_switch_boot_slice(); - $savemsg = "The boot slice has been set to " . nanobsd_get_active_slice(); + $savemsg = gettext("The boot slice has been set to") . " " . nanobsd_get_active_slice(); // Survey slice info nanobsd_detect_slice_info(); @@ -92,9 +92,9 @@ echo << EOF; if(nanobsd_clone_slice($_POST['destslice'])) { - $savemsg = "The slice has been duplicated.

If you would like to boot from this newly duplicated slice please set it using the bootup information area."; + $savemsg = gettext("The slice has been duplicated.") . "

" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area."); } else { - $savemsg = "There was an error while duplicating the slice. Operation aborted."; + $savemsg = gettext("There was an error while duplicating the slice. Operation aborted."); } // Re-Survey slice info nanobsd_detect_slice_info(); @@ -115,28 +115,28 @@ if ($savemsg)

- NOTE:  +   - The options on this page are intended for use by advanced users only. +
 

- + - + - + - + - + @@ -170,10 +170,10 @@ if ($savemsg) - + - + - + @@ -126,14 +126,14 @@ Table: "; + echo ""; ?>
Bootup information
NanoBSD Image size
Bootup - Bootup slice is currently: -

This will switch the bootup slice to the alternate slice. + : +


@@ -146,20 +146,20 @@ if ($savemsg) 		 
Duplicate bootup slice to alternate
Duplicate bootup slice
- Destination slice: + :
- This will duplicate the bootup slice to the alternate slice. Use this if you would like to duplicate the known good working boot partition to the alternate. +
 
View upgrade log
View previous upgrade log -Table: +:
IP Address
No entries exist in this table.
" . gettext("No entries exist in this table.") . "
0) - echo "

Delete all entries in this table." + echo "

" . gettext("Delete") . " " . gettext("all") . " " . gettext("entries in this table."); ?> diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index bfdb52d..de314a9 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -35,7 +35,7 @@ ##|*MATCH=diag_packet_capture.php* ##|-PRIV -$pgtitle = array("Diagnostics", "Packet Capture"); +$pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture")); require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); @@ -64,7 +64,7 @@ if ($_POST) { } if ($_POST['startbtn'] != "" ) { - $action = "Start"; + $action = gettext("Start"); //delete previous packet capture if it exists if (file_exists($fp.$fn)) @@ -95,7 +95,6 @@ if ($_POST) { } else { $do_tcpdump = false; } -$pgtitle = "Diagnostics: Packet Capture"; include("head.inc"); ?> @@ -110,10 +109,10 @@ include("fbegin.inc"); - + - + - + - + - + - + - + - + @@ -190,14 +191,14 @@ include("fbegin.inc"); if ($processcheck != false) $processisrunning = true; - if (($action == "Stop" or $action == "") and $processisrunning != true) - echo " "; + if (($action == gettext("Stop") or $action == "") and $processisrunning != true) + echo " "; else { - echo " "; + echo " "; } if (file_exists($fp.$fn) and $processisrunning != true) { - echo ""; - echo "  (The packet capture file was last updated: " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")"; + echo ""; + echo "  (" . gettext("The packet capture file was last updated") . ": " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")"; } ?> @@ -207,7 +208,7 @@ include("fbegin.inc"); "; if ($processisrunning == true) - echo("Packet Capture is running.
"); + echo("" . gettext("Packet Capture is running.") . "
"); if ($do_tcpdump) { @@ -234,12 +235,12 @@ include("fbegin.inc"); $selectedif = convert_friendly_interface_to_real_interface_name($selectedif); - if ($action == "Start") { - echo("Packet Capture is running.
"); + if ($action == gettext("Start")) { + echo("" . gettext("Packet Capture is running.") . "
"); mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $searchhost $searchport"); } else { //action = stop - echo("Packet Capture stopped.

Packets Captured:
"); + echo("" . gettext("Packet Capture stopped.") . "

" . gettext("Packets Captured") . ":
"); ?>
Packet capture
Interface
Host Address -
This value is either the Source or Destination IP address. The packet capture will look for this address in either field. -
This value can be a domain name or IP address. -
If you leave this field blank, all packets on the specified interface will be captured. +
+
+
Port -
The port can be either the source or destination port. The packet capture will look for this port in either field. -
Leave blank if you do not want to filter by port. +
+
Packet Length
Count -
This is the number of packets the packet capture will grab. Default value is 100.
Enter 0 (zero) for no count limit. +
" . gettext("Enter 0 (zero) for no count limit.");?>
Level of Detail -
This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.
Note: This option does not affect the level of detail when downloading the packet capture. +
" . + gettext("Note") . ": " . + gettext("This option does not affect the level of detail when downloading the packet capture.");?>
Reverse DNS Lookup > -
This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses. -
Note: This option can cause delays for large packet captures. +
+
: