Fixed cosemtic naming of firewall groups for webinterface.

diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 65f6b26bc5d767f54b87c05e999219bd98c23735..fefbda84a01b2948126a3b50331909c348b2668e 100644 (file)
--- 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'>&nbsp;";
                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'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' />&nbsp;</td>\n";
                } else {
-                       print "<img src='/images/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' />&nbsp;</td>\n";
                }
 
                        print "\t\t<td align='center' nowrap='nowrap'>&nbsp;";
                        if ($vendorid =~ /^Adobe$/i)
                        {
-                               print "<img src='/images/updxl-src-adobe.gif' alt='Adobe'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^Microsoft$/i)
                        {
-                               print "<img src='/images/updxl-src-windows.gif' alt='Microsoft'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^Symantec$/i)
                        {
-                               print "<img src='/images/updxl-src-symantec.gif' alt='Symantec'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^Linux$/i)
                        {
-                               print "<img src='/images/updxl-src-linux.gif' alt='Linux'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^TrendMicro$/i)
                        {
-                               print "<img src='/images/updxl-src-trendmicro.gif' alt='Trend Micro'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^Apple$/i)
                        {
-                               print "<img src='/images/updxl-src-apple.gif' alt='Apple'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' />&nbsp;</td>\n";
                        } elsif ($vendorid =~ /^Avast$/i)
                        {
-                               print "<img src='/images/updxl-src-avast.gif' alt='Avast'}' />&nbsp;</td>\n";
+                               print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' />&nbsp;</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 . "' />&nbsp;</td>\n";
+                                       print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
                                } else {
-                                       print "<img src='/images/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
+                                       print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
                                }
                        }
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9a6a6138f2d391dc3f6d92364f53f90c0d5cbd55..be7817c0ab7cfa1326d66adfb8dabfb4d5467d0d 100644 (file)
--- 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 8906f21941baba1d01c91bd2c819577e7dd68f53..e5390a52eedb6ce2ae230230c39c435fd25cd3bf 100644 (file)
--- 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 feef190cbb5ead82637b6f8c4b63a2cbc38f0aa8..60a5ca0cc5671b603358e959378e8739a5581951 100644 (file)
--- 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 bfd4527041fe437c5658998b8851eb87aa66b8d1..40fb67e0dc1901f85da620d9ca6320efdc61a89f 100644 (file)
--- 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")))
                                {