[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bf137f5bb6c2ba2d13fd88b912705e4c2e9feb6f
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 bf137f5bb6c2ba2d13fd88b912705e4c2e9feb6f (commit) from b1d6635994673c9da5bba8e6b982c9227ed87cc8 (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 bf137f5bb6c2ba2d13fd88b912705e4c2e9feb6f Author: Christian Schmidt maniacikarus@ipfire.org Date: Fri Apr 23 13:21:09 2010 +0200
Fixed cosemtic naming of firewall groups for webinterface.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/updatexlrator.cgi | 27 +++++++++++++-------------- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- src/misc-progs/wirelessctrl.c | 3 +++ 5 files changed, 19 insertions(+), 17 deletions(-)
Difference in files: diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 65f6b26..fefbda8 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -1,5 +1,4 @@ #!/usr/bin/perl -#!/usr/bin/perl # # This code is distributed under the terms of the GPL # @@ -12,7 +11,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2010 IPTifre Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -549,40 +548,40 @@ END print "\t\t<td align='center' nowrap='nowrap'> "; if (&getPID("\s/usr/bin/wget\s.*\s".quotemeta($dlinfo{'SRCURL'})."$")) { - print "<img src='/images/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /> </td>\n"; } else { - print "<img src='/images/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' /> </td>\n"; }
print "\t\t<td align='center' nowrap='nowrap'> "; if ($vendorid =~ /^Adobe$/i) { - print "<img src='/images/updxl-src-adobe.gif' alt='Adobe'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' /> </td>\n"; } elsif ($vendorid =~ /^Microsoft$/i) { - print "<img src='/images/updxl-src-windows.gif' alt='Microsoft'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' /> </td>\n"; } elsif ($vendorid =~ /^Symantec$/i) { - print "<img src='/images/updxl-src-symantec.gif' alt='Symantec'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' /> </td>\n"; } elsif ($vendorid =~ /^Linux$/i) { - print "<img src='/images/updxl-src-linux.gif' alt='Linux'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' /> </td>\n"; } elsif ($vendorid =~ /^TrendMicro$/i) { - print "<img src='/images/updxl-src-trendmicro.gif' alt='Trend Micro'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' /> </td>\n"; } elsif ($vendorid =~ /^Apple$/i) { - print "<img src='/images/updxl-src-apple.gif' alt='Apple'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' /> </td>\n"; } elsif ($vendorid =~ /^Avast$/i) { - print "<img src='/images/updxl-src-avast.gif' alt='Avast'}' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' /> </td>\n"; } else { - if (-e "/home/httpd/html/images/updxl-src-" . $vendorid . ".gif") + if (-e "/home/httpd/html/images/updbooster/updxl-src-" . $vendorid . ".gif") { - print "<img src='/images/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; } else { - print "<img src='/images/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; + print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; } }
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9a6a613..be7817c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1269,7 +1269,7 @@ 'out' => 'Aus', 'outgoing' => 'ausgehend', 'outgoing firewall' => 'Ausgehende Firewall', -'outgoing firewall groups' => 'Ausgehende Firewall Gruppen', +'outgoing firewall groups' => 'Firewall Gruppen', 'outgoing firewall add ip group' => 'IP Adressgruppen hinzufügen', 'outgoing firewall ip groups' => 'Ausgehende Firewall IP Adressgruppen', 'outgoing firewall view group' => 'Gruppe anzeigen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8906f21..e5390a5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1298,7 +1298,7 @@ 'out' => 'Out', 'outgoing' => 'outgoing', 'outgoing firewall' => 'Outgoing Firewall', -'outgoing firewall groups' => 'Outgoing Firewall Groups', +'outgoing firewall groups' => 'Firewall Groups', 'outgoing firewall add ip group' => 'Add IP Address Group', 'outgoing firewall ip groups' => 'Outgoing Firewall IP Adress Groups', 'outgoing firewall view group' => 'View group', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index feef190..60a5ca0 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1298,7 +1298,7 @@ 'out' => 'Out', 'outgoing' => 'sortant', 'outgoing firewall' => 'Sortant Firewall', -'outgoing firewall groups' => 'Sortant Firewall Groupe', +'outgoing firewall groups' => 'Firewall Groupe', 'outgoing firewall add ip group' => 'Ajouter IP Address Group', 'outgoing firewall ip groups' => 'Sortant Firewall IP Groupe', 'outgoing firewall view group' => 'Montrer groupe', diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c index bfd4527..40fb67e 100644 --- a/src/misc-progs/wirelessctrl.c +++ b/src/misc-progs/wirelessctrl.c @@ -101,8 +101,11 @@ int main(void) exit(0); }
+ if (!(fd = fopen(CONFIG_ROOT "/wireless/nodrop", "r"))) + { /* register exit handler to ensure the block rule is always present */ atexit(exithandler); + }
if (!(fd = fopen(CONFIG_ROOT "/wireless/config", "r"))) {
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org