/dev/$partitionline[0]
- $Lang::tr{'size'} $size MB
-
+ /dev/$partitionline[0]
+ $Lang::tr{'size'} $size MB
+
auto
ext3
reiserfs
fat
ntfs (experimental)
-
";
} elsif ($key % 2) {
- print " ";
+ print " ";
} else {
- print " ";
+ print " ";
}
print <$temp[1]
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 6ef9da7d3..c428f4c0c 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -20,6 +20,11 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
my %snortsettings=();
my %checked=();
my %selected=();
@@ -326,11 +331,11 @@ print <
- $Lang::tr{'network'}
- IP
- $Lang::tr{'status'}
+ $Lang::tr{'network'}
+ IP
+ $Lang::tr{'status'}
$Lang::tr{'internet'}: $ipaddr
$connstate
@@ -225,7 +230,7 @@ END
} else {
foreach my $line (@status) {
if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
- $active = "$Lang::tr{'capsinactive'}
";
+ $active = "";
}
}
}
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index dc75afeb1..d1d49e42d 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -24,6 +24,11 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
use POSIX();
#workaround to suppress a warning when a variable is used only once
@@ -349,9 +354,9 @@ foreach $_ (@log)
my @mactemp = split(/:/,$macaddr);
$macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
if ($lines % 2) {
- print " \n"; }
+ print " \n"; }
else {
- print " \n"; }
+ print " \n"; }
print <$time
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 23d80424b..67a2c4052 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -22,6 +22,11 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
use POSIX();
#workaround to suppress a warning when a variable is used only once
@@ -276,9 +281,9 @@ END
foreach $_ (@slice)
{
if ($lines % 2) {
- print "\n"; }
+ print " \n"; }
else {
- print " \n"; }
+ print " \n"; }
my ($datetime,$title,$priority,$classification,$srcip,$srcport,$destip,$destport,$sid,$refs) = split(/\|/);
print <
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index d6139580a..9aa37ed85 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -19,6 +19,11 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
use POSIX();
#workaround to suppress a warning when a variable is used only once
@@ -379,9 +384,9 @@ foreach $_ (@log)
if ($lines % 2) {
- print ""; }
+ print " "; }
else {
- print " "; }
+ print " "; }
print "$time $sec " .&Header::cleanhtml ("$d", 'y') . " \n";
$lines++;
}
diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat
index b4e622a03..e529be061 100644
--- a/html/cgi-bin/logs.cgi/proxylog.dat
+++ b/html/cgi-bin/logs.cgi/proxylog.dat
@@ -32,6 +32,11 @@ my %checked=();
my @log=();
my $errormessage = '';
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
'Sep', 'Oct', 'Nov', 'Dec' );
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
@@ -444,9 +449,9 @@ my $ll = 0;
foreach $_ (@log)
{
if ($ll % 2) {
- print "\n"; }
+ print " \n"; }
else {
- print " \n"; }
+ print " \n"; }
my ($datetime,$ip,$so,$url) = split;
my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime);
$SECdt = sprintf ("%.02d",$SECdt);
diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat
index c2be5b049..7fb2ff9c4 100644
--- a/html/cgi-bin/logs.cgi/urlfilter.dat
+++ b/html/cgi-bin/logs.cgi/urlfilter.dat
@@ -21,6 +21,11 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
my $dbdir = "${General::swroot}/urlfilter/blacklists";
my $logdir = "/var/log/squidGuard";
@@ -331,7 +336,7 @@ if ($lines)
if (@loginfo[2] =~ /emergency/) { $attr1 .= ""; $attr2 .= " \n";
} else {
- if ($lines % 2) { print " \n"; } else { print " \n"; }
+ if ($lines % 2) { print " \n"; } else { print " \n"; }
}
if ($cgiparams{'LOGTYPE'} eq 'squidGuard') {
print "$time $pid $attr1@loginfo$attr2 \n";
diff --git a/html/cgi-bin/networks.cgi b/html/cgi-bin/networks.cgi
index 4861dba67..d1a88a17e 100644
--- a/html/cgi-bin/networks.cgi
+++ b/html/cgi-bin/networks.cgi
@@ -23,7 +23,7 @@
use strict;
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index f24ce1aa0..e8cef7003 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -30,7 +30,12 @@ my @p2pline = ();
my $configfile = "/var/ipfire/outgoing/rules";
my $p2pfile = "/var/ipfire/outgoing/p2protocols";
-my $servicefile = "/var/ipfire/outgoing/defaultservices"
+my $servicefile = "/var/ipfire/outgoing/defaultservices";
+
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
@@ -213,13 +218,13 @@ END
print <
-
- Protokoll
- Netzwerk
- Ziel
- Anmerkung
- Politik
- Aktionen
+
+ Protokoll
+ Netzwerk
+ Ziel
+ Anmerkung
+ Politik
+ Aktionen
END
;
foreach $configentry (sort @configs)
@@ -240,7 +245,7 @@ END
if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "
+
$outfwsettings{'PROT'}
$outfwsettings{'SNET'}
$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
@@ -310,7 +315,7 @@ if ($outfwsettings{'POLICY'} eq 'MODE2'){
&Header::openbox('100%', 'center', 'P2P-Block');
print <
- Protokoll
+ Protokoll
Status
END
;
@@ -322,14 +327,8 @@ END