From bf137f5bb6c2ba2d13fd88b912705e4c2e9feb6f Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Fri, 23 Apr 2010 13:21:09 +0200 Subject: [PATCH] Fixed cosemtic naming of firewall groups for webinterface. --- 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(-) diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 65f6b26bc5..fefbda84a0 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 "; if (&getPID("\\s/usr/bin/wget\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\$")) { - print "$Lang::tr{ \n"; + print "$Lang::tr{ \n"; } else { - print "$Lang::tr{ \n"; + print "$Lang::tr{ \n"; } print "\t\t "; if ($vendorid =~ /^Adobe$/i) { - print "Adobe \n"; + print "Adobe \n"; } elsif ($vendorid =~ /^Microsoft$/i) { - print "Microsoft \n"; + print "Microsoft \n"; } elsif ($vendorid =~ /^Symantec$/i) { - print "Symantec \n"; + print "Symantec \n"; } elsif ($vendorid =~ /^Linux$/i) { - print "Linux \n"; + print "Linux \n"; } elsif ($vendorid =~ /^TrendMicro$/i) { - print "Trend Micro \n"; + print "Trend Micro \n"; } elsif ($vendorid =~ /^Apple$/i) { - print "Apple \n"; + print "Apple \n"; } elsif ($vendorid =~ /^Avast$/i) { - print "Avast \n"; + print "Avast \n"; } else { - if (-e "/home/httpd/html/images/updxl-src-" . $vendorid . ".gif") + if (-e "/home/httpd/html/images/updbooster/updxl-src-" . $vendorid . ".gif") { - print "" . ucfirst $vendorid . " \n"; + print "" . ucfirst $vendorid . " \n"; } else { - print "" . ucfirst $vendorid . " \n"; + print "" . ucfirst $vendorid . " \n"; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9a6a6138f2..be7817c0ab 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 8906f21941..e5390a52ee 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 feef190cbb..60a5ca0cc5 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 bfd4527041..40fb67e0dc 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"))) { -- 2.39.2