]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/p2p-block.cgi
cgi-bin: HTML cleanup, add quotes for attribute values
[people/teissler/ipfire-2.x.git] / html / cgi-bin / p2p-block.cgi
old mode 100755 (executable)
new mode 100644 (file)
index cfca542..04f1331
@@ -31,104 +31,124 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
-my $errormessage='';
-my $p2pfile                    = "${General::swroot}/forward/p2protocols";
+my $errormessage = '';
+my $notice;
+my $p2pfile = "${General::swroot}/firewall/p2protocols";
 
 my @p2ps = ();
-my %fwdfwsettings=();
-my %color=();
-my %mainsettings=();
+my %fwdfwsettings = ();
+my %color = ();
+my %mainsettings = ();
 
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
-
-
 &Header::showhttpheaders();
 &Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'fwdfw menu'}, 1, '');
-&Header::openbigbox('100%', 'center',$errormessage);
 
-if ($fwdfwsettings{'ACTION'} eq ''){
-&p2pblock;
-}
-if ($fwdfwsettings{'ACTION'} eq 'togglep2p')
-{
-       open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
+if ($fwdfwsettings{'ACTION'} eq 'togglep2p') {
+       open( FILE, "<$p2pfile") or die "Unable to read $p2pfile";
        @p2ps = <FILE>;
        close FILE;
-       open( FILE, "> $p2pfile" ) or die "Unable to write $p2pfile";
-       foreach my $p2pentry (sort @p2ps)
-       {
-               my @p2pline = split( /\;/, $p2pentry );
+       open( FILE, ">$p2pfile") or die "Unable to write $p2pfile";
+       foreach my $p2pentry (sort @p2ps) {
+               my @p2pline = split( /\;/, $p2pentry);
                if ($p2pline[1] eq $fwdfwsettings{'P2PROT'}) {
-                       if($p2pline[2] eq 'on'){
-                               $p2pline[2]='off';
-                       }else{
-                               $p2pline[2]='on';
+                       if ($p2pline[2] eq 'on') {
+                               $p2pline[2] = 'off';
+                       } else {
+                               $p2pline[2] = 'on';
                        }
                }
                print FILE "$p2pline[0];$p2pline[1];$p2pline[2];\n";
        }
        close FILE;
-       &rules;
-       &p2pblock;
+
+       &General::firewall_config_changed();
+
+       $notice = $Lang::tr{'p2p block save notice'};
 }
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
-{
-       &reread_rules;
-       &p2pblock;
+
+&Header::openpage($Lang::tr{'p2p block'}, 1, '');
+&Header::openbigbox('100%', 'center', $errormessage);
+
+if ($notice) {
+    &Header::openbox('100%', 'left', $Lang::tr{'notice'});
+    print "<font class='base'>$notice</font>";
+    &Header::closebox();
 }
 
+my $gif;
+
+open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
+@p2ps = <FILE>;
+close FILE;
 
-sub p2pblock
-{
-       if (-f "${General::swroot}/forward/reread"){
-               print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div></td></tr></table></form><br>";
+&Header::openbox('100%', 'center',);
+print <<END;
+       <table width='35%' class='tbl'>
+               <tr>
+                       <th align='center' colspan='2' bgcolor='$color{'color22'}' >
+                               <b>$Lang::tr{'protocol'}</b>
+                       </th>
+                       <th align='center' bgcolor='$color{'color22'}' >
+                               <b>$Lang::tr{'status'}</b>
+                       </th>
+               </tr>
+END
+my $lines=0;
+my $col="";
+foreach my $p2pentry (sort @p2ps) {
+       my @p2pline = split( /\;/, $p2pentry);
+       if ($p2pline[2] eq 'on') {
+               $gif = "/images/on.gif"
+       } else {
+               $gif = "/images/off.gif"
        }
-       my $gif;
-       open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
-       @p2ps = <FILE>;
-       close FILE;
-       &Header::openbox('100%', 'center', 'P2P-Block');
+       if ($lines % 2) {
+                print "<tr>";
+                $col="bgcolor='$color{'color20'}'"; }
+        else {
+                print "<tr>";
+                $col="bgcolor='$color{'color22'}'"; }
        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>
+                       <td align='center' colspan='2' $col>
+                               $p2pline[0]:
+                       </td>
+                       <td align='center' $col>
+                               <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;
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <tr bgcolor='$color{'color20'}'>
-               <td align='center' colspan='2' >$p2pline[0]:</td><td align='center'><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'></td></tr></form>
-END
-       }
-       print"<tr><td><img src='/images/on.gif'></td><td  align='left'>$Lang::tr{'outgoing firewall p2p allow'}</td></tr>";
-       print"<tr><td><img src='/images/off.gif'></td><td align='left'>$Lang::tr{'outgoing firewall p2p deny'}</td></tr></table>";
-       print"<br><br><br><table width='100%'><tr><td align='left'>$Lang::tr{'fwdfw p2p txt'}</td></tr></table>";
-       &Header::closebox();
-}
-sub rules
-{
-       if (!-f "${General::swroot}/forward/reread"){
-               system("touch ${General::swroot}/forward/reread");
-               system("touch ${General::swroot}/fwhosts/reread");
-       }
-}
-sub reread_rules
-{
-       system("/usr/local/bin/forwardfwctrl");
-       if ( -f "${General::swroot}/forward/reread"){
-               system("rm ${General::swroot}/forward/reread");
-               system("rm ${General::swroot}/fwhosts/reread");
-       }
+$lines++;
 }
+
+print <<END;
+</table><table>
+               <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();