P2P block: Add notice that the user will reload the firewall ruleset.

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3393acdc07998b4069712ebd4d57cddcd692526f..a1fb60ca5d2764db7be9639ae2bb2527cadd870a 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -189,11 +189,11 @@ WARNING: translation string unused: from warn email bad
 WARNING: translation string unused: fwdfw MODE1
 WARNING: translation string unused: fwdfw MODE2
 WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw external port nat
 WARNING: translation string unused: fwdfw from
 WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -210,6 +210,7 @@ WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost ipadr
 WARNING: translation string unused: fwhost ipsec host
 WARNING: translation string unused: fwhost orange
+WARNING: translation string unused: fwhost reread
 WARNING: translation string unused: fwhost reset
 WARNING: translation string unused: fwhost wo subnet
 WARNING: translation string unused: gen static key

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 77e825dca6b720cd42cc6f13cbb1cb320e304847..4bb9ef22f9f091e8c6b684d0983a5a76621f913e 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -212,11 +212,11 @@ WARNING: translation string unused: from warn email bad
 WARNING: translation string unused: fwdfw MODE1
 WARNING: translation string unused: fwdfw MODE2
 WARNING: translation string unused: fwdfw err tgt_port
-WARNING: translation string unused: fwdfw external port nat
 WARNING: translation string unused: fwdfw from
 WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw natport used
+WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -233,6 +233,7 @@ WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost ipadr
 WARNING: translation string unused: fwhost ipsec host
 WARNING: translation string unused: fwhost orange
+WARNING: translation string unused: fwhost reread
 WARNING: translation string unused: fwhost reset
 WARNING: translation string unused: fwhost wo subnet
 WARNING: translation string unused: g.dtm

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6faff27a02038795127abe8ba3867844df1b8115..da8f6069191b1a27c8ecba4df376fd182e653e01 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -659,6 +659,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -667,12 +668,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred
 WARNING: untranslated string: minute
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
 WARNING: untranslated string: ovpn mtu-disc yes
 WARNING: untranslated string: ovpn routes push
 WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 96e691e1a428b8de1542b0752db09231abfa3052..9cd6c2f26669428a0765ef9382d8c66c1812f42d 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -662,6 +662,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -670,12 +671,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -759,7 +761,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -770,6 +771,7 @@ WARNING: untranslated string: least preferred
 WARNING: untranslated string: minute
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: ntp common settings
 WARNING: untranslated string: ntp sync
 WARNING: untranslated string: openvpn default
@@ -789,6 +791,8 @@ WARNING: untranslated string: ovpn mtu-disc no
 WARNING: untranslated string: ovpn mtu-disc off
 WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
 WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 142ec4d5f9f0b7a740d830f145b852aeb165fed8..e472cdf0eb5dcfd4f7b3e07bcb4ea73cf2174836 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -608,6 +608,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -616,12 +617,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -705,7 +707,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -715,7 +716,10 @@ WARNING: untranslated string: fwhost welcome
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: qos enter bandwidths
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6faff27a02038795127abe8ba3867844df1b8115..da8f6069191b1a27c8ecba4df376fd182e653e01 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -659,6 +659,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -667,12 +668,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred
 WARNING: untranslated string: minute
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
 WARNING: untranslated string: ovpn mtu-disc yes
 WARNING: untranslated string: ovpn routes push
 WARNING: untranslated string: ovpn routes push options
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4be5db7b6ca518131079f8b55bd9b3f226852b05..1ddcedc71dcfa8d390399f05aa23635450ff2f1f 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -645,6 +645,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -653,12 +654,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -742,7 +744,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -754,6 +755,7 @@ WARNING: untranslated string: least preferred
 WARNING: untranslated string: minute
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -772,6 +774,8 @@ WARNING: untranslated string: ovpn mtu-disc no
 WARNING: untranslated string: ovpn mtu-disc off
 WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
 WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 5ebf41a5cd006c93b435f2b0377d76f5cdfcb33b..4e4fd8c3517290062257063191749d08771142ca 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -605,6 +605,7 @@ WARNING: untranslated string: fwdfw err tgt_addr
 WARNING: untranslated string: fwdfw err tgt_grp
 WARNING: untranslated string: fwdfw err tgt_mac
 WARNING: untranslated string: fwdfw err time
+WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw final_rule
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
@@ -613,12 +614,13 @@ WARNING: untranslated string: fwdfw menu
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
-WARNING: untranslated string: fwdfw p2p txt
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
 WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
+WARNING: untranslated string: fwdfw prot41
+WARNING: untranslated string: fwdfw prot41 short
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -702,7 +704,6 @@ WARNING: untranslated string: fwhost newservicegrp
 WARNING: untranslated string: fwhost ovpn_n2n
 WARNING: untranslated string: fwhost port
 WARNING: untranslated string: fwhost prot
-WARNING: untranslated string: fwhost reread
 WARNING: untranslated string: fwhost services
 WARNING: untranslated string: fwhost srv_name
 WARNING: untranslated string: fwhost stdnet
@@ -712,7 +713,10 @@ WARNING: untranslated string: fwhost welcome
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
+WARNING: untranslated string: notice
 WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: p2p block
+WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_missings b/doc/language_missings
index c5f8ac079dd07e4e3c08a6fb4e05addad98d6a81..13f8a5f8615c557d5796c57b9bed7651da47f86a 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -142,6 +142,8 @@
 < fwdfw pol text
 < fwdfw pol text1
 < fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -258,6 +260,7 @@
 < least preferred
 < minute
 < most preferred
+< notice
 < ntp common settings
 < ntp sync
 < openvpn default
@@ -279,6 +282,8 @@
 < ovpn mtu-disc off
 < ovpn mtu-disc with mssfix or fragment
 < ovpn mtu-disc yes
+< p2p block
+< p2p block save notice
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
@@ -541,6 +546,8 @@
 < fwdfw pol text
 < fwdfw pol text1
 < fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -657,6 +664,7 @@
 < least preferred
 < minute
 < most preferred
+< notice
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -694,6 +702,8 @@
 < ovpn mtu-disc yes
 < ovpn routes push
 < ovpn routes push options
+< p2p block
+< p2p block save notice
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
@@ -924,6 +934,8 @@
 < fwdfw pol text
 < fwdfw pol text1
 < fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -1040,6 +1052,7 @@
 < least preferred
 < minute
 < most preferred
+< notice
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1063,6 +1076,8 @@
 < ovpn mtu-disc yes
 < ovpn routes push
 < ovpn routes push options
+< p2p block
+< p2p block save notice
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
@@ -1296,6 +1311,8 @@
 < fwdfw pol text
 < fwdfw pol text1
 < fwdfw pol title
+< fwdfw prot41
+< fwdfw prot41 short
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -1415,6 +1432,7 @@
 < minute
 < month-graph
 < most preferred
+< notice
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1435,6 +1453,8 @@
 < ovpn mtu-disc off
 < ovpn mtu-disc with mssfix or fragment
 < ovpn mtu-disc yes
+< p2p block
+< p2p block save notice
 < proxy reports
 < proxy reports daily
 < proxy reports monthly

diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index aab2d3d1c4117310f7700d92814fcb0d624acdad..6683ca8b620d0536116c2daca7fb7345df5261b8 100755 (executable)
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -32,6 +32,7 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 my $errormessage = '';
+my $notice;
 my $p2pfile = "${General::swroot}/firewall/p2protocols";
 
 my @p2ps = ();
@@ -44,8 +45,6 @@ my %mainsettings = ();
 
 &Header::showhttpheaders();
 &Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'p2p block'}, 1, '');
-&Header::openbigbox('100%', 'center', $errormessage);
 
 if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
        open( FILE, "<$p2pfile") or die "Unable to read $p2pfile";
@@ -66,77 +65,83 @@ if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
        close FILE;
 
        &General::firewall_config_changed();
-       &p2pblock();
-} else {
-       &p2pblock();
+
+       $notice = $Lang::tr{'p2p block save notice'};
 }
 
-sub p2pblock {
-       my $gif;
+&Header::openpage($Lang::tr{'p2p block'}, 1, '');
+&Header::openbigbox('100%', 'center', $errormessage);
 
-       open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
-       @p2ps = <FILE>;
-       close FILE;
+if ($notice) {
+    &Header::openbox('100%', 'left', $Lang::tr{'notice'});
+    print "<font class='base'>$notice</font>";
+    &Header::closebox();
+}
 
-       &Header::openbox('100%', 'center', $Lang::tr{'p2p block'});
-       print <<END;
-               <table width='35%' border='0'>
-                       <tr bgcolor='$color{'color22'}'>
-                               <td align=center colspan='2' >
-                                       <b>$Lang::tr{'protocol'}</b>
-                               </td>
-                               <td align='center'>
-                                       <b>$Lang::tr{'status'}</b>
-                               </td>
-                       </tr>
+my $gif;
+
+open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
+@p2ps = <FILE>;
+close FILE;
+
+&Header::openbox('100%', 'center', $Lang::tr{'p2p block'});
+print <<END;
+       <table width='35%' border='0'>
+               <tr bgcolor='$color{'color22'}'>
+                       <td align=center colspan='2' >
+                               <b>$Lang::tr{'protocol'}</b>
+                       </td>
+                       <td align='center'>
+                               <b>$Lang::tr{'status'}</b>
+                       </td>
+               </tr>
 END
 
-       foreach my $p2pentry (sort @p2ps) {
-               my @p2pline = split( /\;/, $p2pentry);
-               if ($p2pline[2] eq 'on') {
-                       $gif = "/images/on.gif"
-               } else {
-                       $gif = "/images/off.gif"
-               }
-
-               print <<END;
-                       <tr bgcolor='$color{'color20'}'>
-                               <td align='center' colspan='2'>
-                                       $p2pline[0]:
-                               </td>
-                               <td align='center'>
-                                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                               <input type='hidden' name='P2PROT' value='$p2pline[1]'>
-                                               <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
-                                               <input type='hidden' name='ACTION' value='togglep2p'>
-                                       </form>
-                               </td>
-                       </tr>
-END
+foreach my $p2pentry (sort @p2ps) {
+       my @p2pline = split( /\;/, $p2pentry);
+       if ($p2pline[2] eq 'on') {
+               $gif = "/images/on.gif"
+       } else {
+               $gif = "/images/off.gif"
        }
 
        print <<END;
-                       <tr>
-                               <td>
-                                       <img src='/images/on.gif'>
-                               </td>
-                               <td>
-                                       $Lang::tr{'outgoing firewall p2p allow'}
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <img src='/images/off.gif'>
-                               </td>
-                               <td>
-                                       $Lang::tr{'outgoing firewall p2p deny'}
-                               </td>
-                       </tr>
-               </table>
+               <tr bgcolor='$color{'color20'}'>
+                       <td align='center' colspan='2'>
+                               $p2pline[0]:
+                       </td>
+                       <td align='center'>
+                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                       <input type='hidden' name='P2PROT' value='$p2pline[1]'>
+                                       <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
+                                       <input type='hidden' name='ACTION' value='togglep2p'>
+                               </form>
+                       </td>
+               </tr>
 END
-
-       &Header::closebox();
 }
 
+print <<END;
+               <tr>
+                       <td>
+                               <img src='/images/on.gif'>
+                       </td>
+                       <td>
+                               $Lang::tr{'outgoing firewall p2p allow'}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               <img src='/images/off.gif'>
+                       </td>
+                       <td>
+                               $Lang::tr{'outgoing firewall p2p deny'}
+                       </td>
+               </tr>
+       </table>
+END
+
+&Header::closebox();
+
 &Header::closebigbox();
 &Header::closepage();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 92847cac055afa39045322479e8f85f47bbae231..ed6afcece07d7e3808a5d87d2f1528a79147a6e0 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1487,6 +1487,7 @@
 'not present' => '<B>Nicht</B> vorhanden',
 'not running' => 'nicht gestartet',
 'not set' => 'nicht gesetzt',
+'notice' => 'Hinweis',
 'november' => 'November',
 'ntp common settings' => 'Allgemeine Einstellungen',
 'ntp configuration' => 'NTP-Konfiguration',
@@ -1609,6 +1610,7 @@
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
 'p2p block' => 'P2P-Block',
+'p2p block save notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.',
 'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2d36cdbadfa51f21eeef2d11d3819fc84683efb7..f14eb50158503b58bfd21c36d79fce30c898e81e 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1516,6 +1516,7 @@
 'not running' => 'not running',
 'not set' => 'not set',
 'notes' => 'Notes',
+'notice' => 'Notice',
 'november' => 'November',
 'ntp common settings' => 'Common settings',
 'ntp configuration' => 'NTP configuration',
@@ -1638,6 +1639,7 @@
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
 'p2p block' => 'P2P block',
+'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => 'Do you want to install all packages?',