This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 68dd6726af4cc47056353f51ebb1c5e92eb68326 (commit) from dc1c56ca781324b2ef9fe895e388075df74a018a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 68dd6726af4cc47056353f51ebb1c5e92eb68326 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Tue Oct 12 17:38:40 2010 +0200

Fixed the feature for deactivating outgoingfw rules.

-----------------------------------------------------------------------

Summary of changes: config/outgoingfw/outgoingfw.pl | 2 +- config/rootfiles/core/41/filelists/files | 6 ++++-- html/cgi-bin/outgoingfw.cgi | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 8d4d27d..6709ee6 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -187,7 +187,7 @@ foreach $configentry (sort @configs) foreach $SOURCE (@SOURCE) { $SOURCE =~ s/\s//gi;

- if ( $SOURCE eq "" ){next;} + if ( $SOURCE eq "" || $configline[1] eq "" ){next;}

if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files index 59e2f53..068f2ba 100644 --- a/config/rootfiles/core/41/filelists/files +++ b/config/rootfiles/core/41/filelists/files @@ -1,8 +1,10 @@ etc/system-release srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/outgoingfw.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/en.pl var/ipfire/langs/de.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/outgoingfw/bin/outgoingfw.pl diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 27a8927..a15b243 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -408,8 +408,12 @@ END if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; } if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; } if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){ - print <<END - <tr bgcolor='$color{'color20'}'> + if ( $outfwsettings{'ENABLED'} eq "on" ){ + print "<tr bgcolor='$color{'color20'}'>"; + } else { + print "<tr bgcolor='$color{'color18'}'>"; + } + print <<END <td align='center'>$outfwsettings{'PROT'} <td align='center'>$outfwsettings{'SNET'} <td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}

hooks/post-receive -- IPFire 2.x development tree