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

Fixed cosemtic naming of firewall groups for webinterface.

Browse Source
This commit is contained in:
Christian Schmidt
2010-04-23 13:21:09 +02:00
parent b1d6635994
commit bf137f5bb6
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";
}
}

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

@@ -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',

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

@@ -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',

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

@@ -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',

3
src/misc-progs/wirelessctrl.c
View File

@@ -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")))
{