]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/outgoinggrp.cgi
projects / people / pmueller / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added the ability to edit existing firewall groups and persist changes.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / outgoinggrp.cgi
diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
index 28e52611826dd62aa4505c6baddcfedada5b2210..e757ca08afb11f2a840f36995c2452e23809f73c 100644 (file)
--- a/html/cgi-bin/outgoinggrp.cgi
+++ b/html/cgi-bin/outgoinggrp.cgi
@@ -65,9 +65,9 @@ $selected{'macgroup'}{$outgrpsettings{'macgroup'}} = "selected='selected'";
 # my $debugCount = 0;
 # foreach my $line (sort keys %outgrpsettings) {
 # print "$line = $outgrpsettings{$line}<br />\n";
- # $debugCount++;
+# $debugCount++;
 # }
-# print "&nbsp;Count: $debugCount\n";
+# print "Count: $debugCount\n";
 # &Header::closebox();
 # DEBUG DEBUG
 ###############
@@ -78,14 +78,22 @@ $selected{'macgroup'}{$outgrpsettings{'macgroup'}} = "selected='selected'";
 if ($outgrpsettings{'ACTION'} eq 'newipgroup')
 {
        &newipgroup();
+}elsif ($outgrpsettings{'ACTION'} eq 'editipgroup')
+{
+       &editipgroup();
 } elsif ($outgrpsettings{'ACTION'} eq 'deleteipgroup' ) {
        unlink("$configpath/ipgroups/$outgrpsettings{'ipgroup'}");
 } elsif ($outgrpsettings{'ACTION'} eq 'addipgroup') {
 
        if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){
                $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
+       } elsif ( $outgrpsettings{'ipgroup'} eq "all" || $outgrpsettings{'ipgroup'} eq "red" || $outgrpsettings{'ipgroup'} eq "blue" ||
+                       $outgrpsettings{'ipgroup'} eq "green" || $outgrpsettings{'ipgroup'} eq "orange" || $outgrpsettings{'ipgroup'} eq "ip" ||
+                       $outgrpsettings{'ipgroup'} eq "mac" || $outgrpsettings{'ipgroup'} eq "ovpn" || $outgrpsettings{'ipgroup'} eq "ipsec" ) {
+               $errormessage =  "$Lang::tr{'outgoing firewall reserved groupname'}";
        } else {
                open (FILE, ">$configpath/ipgroups/$outgrpsettings{'ipgroup'}") or die "Can't save $outgrpsettings{'ipgroup'} settings $!";
+               $outgrpsettings{'ipgroupcontent'} =~ s/\s*$//;
                flock (FILE, 2);
                print FILE $outgrpsettings{'ipgroupcontent'}."\n";
                close FILE;
@@ -95,14 +103,22 @@ if ($outgrpsettings{'ACTION'} eq 'newipgroup')
 if ($outgrpsettings{'ACTION'} eq 'newmacgroup')
 {
        &newmacgroup();
-} elsif ($outgrpsettings{'ACTION'} eq 'deletemacgroup' ) {
+}elsif ($outgrpsettings{'ACTION'} eq 'editmacgroup')
+{
+       &editmacgroup();
+}elsif ($outgrpsettings{'ACTION'} eq 'deletemacgroup' ) {
        unlink("$configpath/macgroups/$outgrpsettings{'macgroup'}");
 } elsif ($outgrpsettings{'ACTION'} eq 'addmacgroup') {
 
        if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){
                $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
+       } elsif ( $outgrpsettings{'macgroup'} eq "all" || $outgrpsettings{'macgroup'} eq "red" || $outgrpsettings{'macgroup'} eq "blue" ||
+                       $outgrpsettings{'macgroup'} eq "green" || $outgrpsettings{'macgroup'} eq "orange" || $outgrpsettings{'macgroup'} eq "ip" ||
+                       $outgrpsettings{'macgroup'} eq "mac" || $outgrpsettings{'macgroup'} eq "ovpn" || $outgrpsettings{'macgroup'} eq "ipsec" ) {
+               $errormessage =  "$Lang::tr{'outgoing firewall reserved groupname'}";
        } else {
                open (FILE, ">$configpath/macgroups/$outgrpsettings{'macgroup'}") or die "Can't save $outgrpsettings{'macgroup'} settings $!";
+               $outgrpsettings{'macgroupcontent'} =~ s/\s*$//;
                flock (FILE, 2);
                print FILE $outgrpsettings{'macgroupcontent'}."\n";
                close FILE;
@@ -129,7 +145,7 @@ $ipgroupcontent =~ s/\n/<br \/>/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall ip groups'});
 
 print <<END
-<a name="outgoing showipgroup"</a>
+<a name="outgoing showipgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
 <table width='95%' cellspacing='0'>
@@ -168,20 +184,27 @@ print <<END
 <table width='10%' cellspacing='0'>
 <tr>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <input type='hidden' name='ACTION' value='editipgroup' />
+                       <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
+                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+               </form>
+       </td>
+       <td align='center'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='newipgroup' />
                        <input type='image' alt='$Lang::tr{'new'}' title='$Lang::tr{'new'}' src='/images/list-add.png' />
                </form>
        </td>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='saveipgroup' />
                        <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
                        <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
                </form>
        </td>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='deleteipgroup' />
                        <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
                        <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
@@ -206,7 +229,7 @@ $macgroupcontent =~ s/\n/<br \/>/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall mac groups'});
 
 print <<END
-<a name="outgoing showmacgroup"</a>
+<a name="outgoing showmacgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
 <table width='95%' cellspacing='0'>
@@ -245,20 +268,27 @@ print <<END
 <table width='10%' cellspacing='0'>
 <tr>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <input type='hidden' name='ACTION' value='editmacgroup' />
+                       <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
+                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+               </form>
+       </td>
+       <td align='center'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='newmacgroup' />
                        <input type='image' alt='$Lang::tr{'new'}' title='$Lang::tr{'new'}' src='/images/list-add.png' />
                </form>
        </td>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='savemacgroup' />
                        <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
                        <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
                </form>
        </td>
        <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='ACTION' value='deletemacgroup' />
                        <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
                        <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
@@ -294,7 +324,7 @@ print <<END
                </tr>
                <tr>
                        <td  align='left' colspan='2'>
-                               <input type='text' name='ipgroup' value='newgroup' size="30" />
+                               <input type='text' name='ipgroup' value='newipgroup' size="30" />
                        </td>
                        <td  align='left'>
                                <input type='hidden' name='ACTION' value='addipgroup' />
@@ -303,7 +333,46 @@ print <<END
                </tr>
                <tr>
                        <td  align='left' colspan='3'>
-                               <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea>
+                               <textarea name="ipgroupcontent" cols="40" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea>
+                       </td>
+               </tr>
+       </table>
+       </form>
+END
+;
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit 0;
+}
+
+sub editipgroup
+{
+my $ipgroupcontent = `cat $configpath/ipgroups/$outgrpsettings{'ipgroup'} 2>/dev/null`;
+
+       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall edit ip group'});
+
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='95%' cellspacing='0'>
+               <tr>
+                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall edit ip group'}</b></td>
+               </tr>
+               <tr>
+                       <td colspan='3'  align='left'><br /></td>
+               </tr>
+               <tr>
+                       <td  align='left' colspan='2'>
+                               <input type='text' name='ipgroup' value='$outgrpsettings{'ipgroup'}' size='30' readonly style='color:$color{'color20'}'/>
+                       </td>
+                       <td  align='left'>
+                               <input type='hidden' name='ACTION' value='addipgroup' />
+                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
+                       </td>
+               </tr>
+               <tr>
+                       <td  align='left' colspan='3'>
+                               <textarea name="ipgroupcontent" cols="40" rows="5" Wrap="off">$ipgroupcontent</textarea>
                        </td>
                </tr>
        </table>
@@ -331,7 +400,7 @@ print <<END
                </tr>
                <tr>
                        <td  align='left' colspan='2'>
-                               <input type='text' name='macgroup' value='newgroup' size="30" />
+                               <input type='text' name='macgroup' value='newmacgroup' size="30" />
                        </td>
                        <td  align='left'>
                                <input type='hidden' name='ACTION' value='addmacgroup' />
@@ -351,4 +420,43 @@ END
        &Header::closebigbox();
        &Header::closepage();
        exit 0;
-}
\ No newline at end of file
+}
+
+sub editmacgroup
+{
+my $macgroupcontent = `cat $configpath/macgroups/$outgrpsettings{'macgroup'} 2>/dev/null`;
+
+       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall edit mac group'});
+
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing editmacgroup'>
+       <table width='95%' cellspacing='0'>
+               <tr>
+                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall edit mac group'}</b></td>
+               </tr>
+               <tr>
+                       <td colspan='3'  align='left'><br /></td>
+               </tr>
+               <tr>
+                       <td  align='left' colspan='2'>
+                               <input type='text' name='macgroup' value='$outgrpsettings{'macgroup'}' size='30' readonly style='color:$color{'color20'}'/>
+                       </td>
+                       <td  align='left'>
+                               <input type='hidden' name='ACTION' value='addmacgroup' />
+                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
+                       </td>
+               </tr>
+               <tr>
+                       <td  align='left' colspan='3'>
+                               <textarea name="macgroupcontent" cols="20" rows="5" Wrap="off">$macgroupcontent</textarea>
+                       </td>
+               </tr>
+       </table>
+       </form>
+END
+;
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit 0;
+}
Peter's tree of IPFire 2.x