From bf68dc410e836e58fd2dee34c62e450a117f0ff0 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Sat, 7 Jan 2017 20:11:57 +0545 Subject: Remove unusued $heading in genhtmltitle() It came into use in https://github.com/pfsense/pfsense/commit/45eebe10a93fa1e2399c6cdf133ad88dc21ee6e7 but genhtmltitle() has changed since then and no longer uses $heading (cherry picked from commit f93e9098abc0d490a4f9fca2eef69396eb5bb099) --- src/usr/local/www/guiconfig.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index f64df7b..40acdc6 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -533,7 +533,7 @@ function genhtmltitle($title) { $bc = ""; } - return $heading . $bc; + return $bc; } /* update the changedesc and changecount(er) variables */ -- cgit v1.1 From df82227e2c426a536f1f5c2519942bd37c036933 Mon Sep 17 00:00:00 2001 From: stilez Date: Sat, 31 Dec 2016 11:42:53 +0000 Subject: Improve labels + help text for IPv6 tunneling options * Move the help message to be on the group as a whole not just the IP input field * Clarify the IP field (label states "IP address and explains tunelling, but whgat address should be entered and should it be IPv4, IPv6 or either? This isn't made clear. * Group title uses the term "tunneling" and this is probably the most commonly understandable term, so keep it consistent and don;'t switch to "encapsulation" halfway through. (We use the term "encapsulation" in the help text already so it's there for purists) (cherry picked from commit 5e391e58439fa189518370fa8d16ffd2e8a1002d) --- src/usr/local/www/system_advanced_network.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 708cbe9..ca3b655 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -199,23 +199,25 @@ $section->addInput(new Form_Checkbox( ))->setHelp('NOTE: This does not disable any IPv6 features on the firewall, it only '. 'blocks traffic.'); + $group = new Form_Group('IPv6 over IPv4 Tunneling'); $group->add(new Form_Checkbox( 'ipv6nat_enable', 'IPv6 over IPv4 Tunneling', - 'Enable IPv4 NAT encapsulation of IPv6 packets', + 'Enable IPv6 over IPv4 tunneling', $pconfig['ipv6nat_enable'] )); $group->add(new Form_Input( 'ipv6nat_ipaddr', - 'IP address', + 'IP address of tunneling peer', 'text', $pconfig['ipv6nat_ipaddr'] -))->setHelp('Enable IPv4 NAT encapsulation of IPv6 packets.
This provides an '. - 'RFC 2893 compatibility mechanism that can be used to tunneling IPv6 packets over '. - 'IPv4 routing infrastructures. If enabled, don\'t forget to add a firewall rule to '. - 'permit IPv6 packets.'); +))->setHelp('The IPv4 address of the tunneling peer'); + +$group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, that can be used ' . + 'to tunnel IPv6 packets over IPv4 routing infrastructures. A firewall rule to allow passing of IPv6 packets ' . + 'must also be created.'); $section->add($group); -- cgit v1.1 From efeea3502935aad1ee590d034d753267874736a0 Mon Sep 17 00:00:00 2001 From: stilez Date: Wed, 4 Jan 2017 20:52:39 +0000 Subject: Various wording changes (cherry picked from commit a075265e0a076419813622e0d69556915b6f40f2) --- src/usr/local/www/system_advanced_network.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index ca3b655..06eef7b 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -210,14 +210,14 @@ $group->add(new Form_Checkbox( $group->add(new Form_Input( 'ipv6nat_ipaddr', - 'IP address of tunneling peer', + 'Tunnel Peer\'s IP Address', 'text', $pconfig['ipv6nat_ipaddr'] ))->setHelp('The IPv4 address of the tunneling peer'); -$group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, that can be used ' . - 'to tunnel IPv6 packets over IPv4 routing infrastructures. A firewall rule to allow passing of IPv6 packets ' . - 'must also be created.'); +$group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, ' . + 'that can be used to tunnel IPv6 packets over IPv4 routing infrastructures. A firewall rule to pass IPv6 packets ' . + 'is also necessary.'); $section->add($group); -- cgit v1.1 From b11927df95acc8c3ce38f787567a860e2f187ff9 Mon Sep 17 00:00:00 2001 From: stilez Date: Wed, 4 Jan 2017 20:55:35 +0000 Subject: left label as comment above (cherry picked from commit a0052ea3a5fe74246795d90bcacadd025801134a) --- src/usr/local/www/system_advanced_network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 06eef7b..3a04b39 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -200,7 +200,7 @@ $section->addInput(new Form_Checkbox( 'blocks traffic.'); -$group = new Form_Group('IPv6 over IPv4 Tunneling'); +$group = new Form_Group('IPv6 over IPv4'); $group->add(new Form_Checkbox( 'ipv6nat_enable', 'IPv6 over IPv4 Tunneling', -- cgit v1.1 From 2f93ba9e88a2abda621078ba23b2d0522ab103ce Mon Sep 17 00:00:00 2001 From: stilez Date: Wed, 4 Jan 2017 21:11:24 +0000 Subject: change as commented and remove redundant help text (cherry picked from commit 16fbe9b7ee1abfb8b9504a8d1e90dcd7592f9fe2) --- src/usr/local/www/system_advanced_network.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 3a04b39..6aa003a 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -201,6 +201,7 @@ $section->addInput(new Form_Checkbox( $group = new Form_Group('IPv6 over IPv4'); + $group->add(new Form_Checkbox( 'ipv6nat_enable', 'IPv6 over IPv4 Tunneling', @@ -210,10 +211,10 @@ $group->add(new Form_Checkbox( $group->add(new Form_Input( 'ipv6nat_ipaddr', - 'Tunnel Peer\'s IP Address', + 'IPv4 address of Tunnel Peer', 'text', $pconfig['ipv6nat_ipaddr'] -))->setHelp('The IPv4 address of the tunneling peer'); +)); $group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, ' . 'that can be used to tunnel IPv6 packets over IPv4 routing infrastructures. A firewall rule to pass IPv6 packets ' . -- cgit v1.1 From 66dba4d7d5b5076610545680fa132a73efbd5ed0 Mon Sep 17 00:00:00 2001 From: stilez Date: Sat, 7 Jan 2017 20:55:45 +0000 Subject: clarify type of firewall rule needed A comment on the original PR says that it's not clear if the rule for this needs to be IPv6 or IPv4 with protocol IPv6, and users get confused. I've tried to clarify it here. I've also tried to "de-mystify" it, because it's not that tunneling needs special rules, it's just that any traffic needs rules and tunneled traffic is handled as IPv6 for rules purposes, so it needs an IPv6 rule. But the user may want other rules, or selective rules, so I'[ve tried to be clear this isn't about some "special" IPv6 rule, but rather, just that any traffic desired to pass, will need one or more IPv6 rules permitting it. (cherry picked from commit 3509ad4f9215ff46d7a8684e0559bb93c1bd7a78) --- src/usr/local/www/system_advanced_network.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 6aa003a..a20286e 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -217,8 +217,9 @@ $group->add(new Form_Input( )); $group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, ' . - 'that can be used to tunnel IPv6 packets over IPv4 routing infrastructures. A firewall rule to pass IPv6 packets ' . - 'is also necessary.'); + 'that can be used to tunnel IPv6 packets over IPv4 routing infrastructures. ' . + 'IPv6 firewall rules are also required, to control and pass encapsulated traffic.'); + $section->add($group); -- cgit v1.1 From eaa55106831046f238b9097d6b1115e5db9a455d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 9 Jan 2017 10:20:11 +0545 Subject: Crash Reporter report when no data found The glob for $crash_files always returns an array - an empty one in the case when there are no matching crash files. So the echo at old line 115 never happened. In any case, if the echo happens, it is spat out as plain text on the GUI outside of all the nice boxes and menus. Might be nice for the devs to get explicit feedback about the "missing" parts of a crash report - that there were either "No PHP errors found" or "No FreeBSD crash data found". (cherry picked from commit cb6b7189bed635976ff33377e68f54b36b2647c9) --- src/usr/local/www/crash_reporter.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index fe667af..d674440 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -135,8 +135,10 @@ exec("/bin/cat /tmp/PHP_errors.log", $php_errors); if (count($php_errors) > 0) { $crash_reports .= "\nPHP Errors:\n"; $crash_reports .= implode("\n", $php_errors) . "\n\n"; + } else { + $crash_reports .= "\nNo PHP errors found.\n"; } - if (is_array($crash_files)) { + if (count($crash_files) > 0) { foreach ($crash_files as $cf) { if (filesize($cf) < FILE_SIZE) { $crash_reports .= "\nFilename: {$cf}\n"; @@ -144,7 +146,7 @@ exec("/bin/cat /tmp/PHP_errors.log", $php_errors); } } } else { - echo gettext("Could not locate any crash data."); + $crash_reports .= "\nNo FreeBSD crash data found.\n"; } ?>
-- cgit v1.1