my $errormessage = '';
my $warnNTPmessage = '';
my @nosaved=();
+my %color = ();
#Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS
our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address';
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("${General::swroot}/time/settings", \%timesettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
#Get GUI values
&Header::getcgihash(\%dhcpsettings);
if ($dhcpsettings{'KEY1'} eq $key) {
print "<tr bgcolor='${Header::colouryellow}'>";
} elsif ($key % 2) {
- print "<tr bgcolor='${Header::table2colour}'>";
+ print "<tr bgcolor='$color{'color22'}'>";
} else {
- print "<tr bgcolor='${Header::table1colour}'>";
+ print "<tr bgcolor='$color{'color20'}'>";
}
print <<END
if ($dhcpsettings{'KEY2'} eq $key) {
print "<tr bgcolor='${Header::colouryellow}'>";
} elsif ($key % 2) {
- print "<tr bgcolor='${Header::table2colour}'>";
+ print "<tr bgcolor='$color{'color22'}'>";
} else {
- print "<tr bgcolor='${Header::table1colour}'>";
+ print "<tr bgcolor='$color{'color20'}'>";
}
my $TAG0 = '';
my $TAG1 = '';
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.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 %cgiparams=();
my @cgigraphs=();
}
&Header::closebox();
print "<div align='center'><table width='80%'><tr><td align='center'>";
- print "<a href='/cgi-bin/hardwaregraphs.cgi=${graph}'>";
+ print "<a href='/cgi-bin/hardwaregraphs.cgi'>";
print "$Lang::tr{'back'}</a></td></tr></table></div>\n";
}
else
{
if ( $i % 2 )
{
- print("<tr bgcolor='$Header::table2colour'>");
+ print("<tr bgcolor='$color{'color22'}'>");
}
else
{
- print("<tr bgcolor='$Header::table1colour'>");
+ print("<tr bgcolor='$color{'color20'}'>");
}
$mbmon_settings{'LABEL-'.$key} = &Header::cleanhtml($mbmon_settings{'LABEL-'.$key});
print("<td align='center'><input type='checkbox' name='LINE-$key' $mbmon_graphs{$key}/></td>");
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
- print "<tr bgcolor='$color{'color20'}'>\n";
+ print "<tr><td align='center'> </td><td align='center' nowrap='nowrap' bgcolor='$color{'color20'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
} else {
- print "<tr bgcolor='$color{'color22'}'>\n";
+ print "<tr><td align='center'> </td><td align='center' nowrap='nowrap' bgcolor='$color{'color22'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
}
- print "<td bgcolor='#ffffff' align='center'> </td><td align='center' nowrap='nowrap'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
+
my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
if ($confighash{$key}[0] eq 'off') {
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+my %color = ();
my %checked=();
my %selected=();
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
$xlratorsettings{'ACTION'} = '';
$xlratorsettings{'ENABLE_LOG'} = 'off';
{
$id++;
if ($id % 2) {
- print "<tr bgcolor='$Header::table1colour'>\n"; }
+ print "<tr bgcolor='$color{'color20'}'>\n"; }
else {
- print "<tr bgcolor='$Header::table2colour'>\n"; }
+ print "<tr bgcolor='$color{'color22'}'>\n"; }
$filesize = (-s "$repository/$updatefile");
1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/;
if (!(initsetuid()))
exit(1);
+ FILE *file = NULL;
+
/* Get vpnwatch pid */
- int fd;
- if (( fd = open("/var/run/vpn-watch.pid", O_RDONLY)) != "" ) {
- close(fd);
- safe_system("kill -9 $(cat /var/run/vpn-watch.pid)");
+
+ if (file = fopen("/var/run/vpn-watch.pid", "r")) {
+ safe_system("kill -9 fd");
safe_system("unlink /var/run/vpn-watch.pid)");
}
-
+ close(fd);
+
/* FIXME: workaround for pclose() issue - still no real idea why
* this is happening */
signal(SIGCHLD, SIG_DFL);
char if_orange[STRING_SIZE] = "";
char if_blue[STRING_SIZE] = "";
char s[STRING_SIZE];
- FILE *file = NULL;
if (!(file = fopen(CONFIG_ROOT "/vpn/config", "r"))) {
fprintf(stderr, "Couldn't open vpn settings file");