webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward Firewall: added "apply" button to groupmanagement. Now the user can make all changes and finally click apply button to reread firewallrules.

Browse Source 
Also added a comment in de.pl and en.pl which should remiond the user to click the button.
This commit is contained in:
Alexander Marx
2013-02-13 13:31:55 +01:00
committed by Michael Tremer
parent 12dcfbbdbe
commit cd9d9d8a13
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/cgi-bin/forwardfw.cgi
View File

@@ -552,7 +552,7 @@ sub addrule
print "<table border='0'>"; print "<table border='0'>";
print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>"; print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
if (-f "${General::swroot}/forward/reread"){ if (-f "${General::swroot}/forward/reread"){
print "<td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}'></td>"; print "<td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}'>$Lang::tr{'fwhost reread'}</td>";
} }
print"</tr></table></form><hr>"; print"</tr></table></form><hr>";

27
html/cgi-bin/fwhosts.cgi
View File

@@ -80,6 +80,11 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); }
&Header::openbigbox('100%', 'center'); &Header::openbigbox('100%', 'center');
## ACTION #### ## ACTION ####
if ($fwhostsettings{'ACTION'} eq $Lang::tr{'fwdfw reread'})
{
&reread_rules;
&showmenu;
}
# Update # Update
if ($fwhostsettings{'ACTION'} eq 'updatenet' ) if ($fwhostsettings{'ACTION'} eq 'updatenet' )
{ {
@@ -1003,9 +1008,15 @@ sub showmenu
<table border='0' width='100%'><form method='post'> <table border='0' width='100%'><form method='post'>
<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}' /></td> <tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}' /></td>
<td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}' /></td></tr> <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}' /><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}' /></td></tr>
<tr><td colspan='6'><hr></hr></td></tr></table></form> <tr><td colspan='6'><hr></hr></td>
END END
if (-f "${General::swroot}/fwhosts/reread"){
print "</tr><tr><td colspan='6'><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}'>$Lang::tr{'fwhost reread'}</td>";
}
print"</tr></table></form>";
&Header::closebox(); &Header::closebox();
} }
@@ -1877,9 +1888,19 @@ sub getipforgroup
} }
sub rules sub rules
{ {
system ("/usr/local/bin/forwardfwctrl"); if (!-f "${General::swroot}/fwhosts/reread"){
system("rm ${General::swroot}/forward/reread"); system("touch ${General::swroot}/fwhosts/reread");
}
} }
sub reread_rules
{
system ("/usr/local/bin/forwardfwctrl");
if ( -f "${General::swroot}/fwhosts/reread"){
system("rm ${General::swroot}/fwhosts/reread");
}
}
sub decrease sub decrease
{ {
my $grp=$_[0]; my $grp=$_[0];

1
langs/de/cgi-bin/de.pl
View File

@@ -1018,6 +1018,7 @@
'fwhost ovpn_n2n' => 'OpenVPN N-2-N', 'fwhost ovpn_n2n' => 'OpenVPN N-2-N',
'fwhost port' => 'Port(s)', 'fwhost port' => 'Port(s)',
'fwhost prot' => 'Protokoll', 'fwhost prot' => 'Protokoll',
'fwhost reread' => 'Die Firewallregeln müssen neu eingelesen werden. Bitte Übernehmen klicken.',
'fwhost reset' => 'Abbrechen', 'fwhost reset' => 'Abbrechen',
'fwhost services' => 'Dienste', 'fwhost services' => 'Dienste',
'fwhost srv_name' => 'Dienstname', 'fwhost srv_name' => 'Dienstname',

2
langs/en/cgi-bin/en.pl
View File

@@ -1045,6 +1045,7 @@
'fwhost ovpn_n2n' => 'OpenVPN N-2-N', 'fwhost ovpn_n2n' => 'OpenVPN N-2-N',
'fwhost port' => 'Port(s)', 'fwhost port' => 'Port(s)',
'fwhost prot' => 'Protocol', 'fwhost prot' => 'Protocol',
'fwhost reread' => 'Firewallrules need to be updated. Please click applybutton.',
'fwhost reset' => 'Cancel', 'fwhost reset' => 'Cancel',
'fwhost services' => 'Services', 'fwhost services' => 'Services',
'fwhost srv_name' => 'Servicename', 'fwhost srv_name' => 'Servicename',
@@ -2480,7 +2481,6 @@
'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
'wlanap access point' => 'Access Point', 'wlanap access point' => 'Access Point',
'wlanap channel' => 'Channel', 'wlanap channel' => 'Channel',
'wlanap country' => 'Country Code',
'wlanap debugging' => 'Debugging', 'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Remove selected interface?', 'wlanap del interface' => 'Remove selected interface?',
'wlanap encryption' => 'Encryption', 'wlanap encryption' => 'Encryption',