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

Quasi fast alle cgis von den fixen header farben befreit

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@560 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-05-17 16:54:15 +00:00
parent 4b4aec3a3d
commit f2fdd0c1e9
30 changed files with 279 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/cgi-bin/connections.cgi
View File

@@ -329,7 +329,7 @@ foreach my $line (@active) {
</a>
</td>
<td align='center'>$proto</td>
<td align='center' bgcolor="${Header::table1colour}">$state</td>
<td align='center'>$state</td>
<td align='center'>$ttl</td>
</tr>
END

9
html/cgi-bin/connscheduler.cgi
View File

@@ -25,6 +25,11 @@ require "${General::swroot}/header.pl";
require '/var/ipfire/connscheduler/lib.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 $buttontext = $Lang::tr{'add'};
my $hiddenvalue = 'add';
my $day;
@@ -408,11 +413,11 @@ for my $id ( 0 .. $#CONNSCHED::config )
}
elsif ( $id % 2 )
{
$trcolor = "<tr bgcolor='$Header::table2colour'>";
$trcolor = "<tr bgcolor='$color{'color20'}'>";
}
else
{
$trcolor = "<tr bgcolor='$Header::table1colour'>";
$trcolor = "<tr bgcolor='$color{'color22'}'>";
}
print <<END

9
html/cgi-bin/ddns.cgi
View File

@@ -26,6 +26,11 @@ undef (@dummy);
my $ddnsprefix = $Lang::tr{'ddns noip prefix'};
$ddnsprefix =~ s/%/$General::noipprefix/;
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
# Files used
my $setting = "${General::swroot}/ddns/settings";
our $datafile = "${General::swroot}/ddns/config";
@@ -432,9 +437,9 @@ foreach my $line (@current) {
if ($settings{'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'}'>";
}
#if a field is empty, replace it with a '---' to see colorized info!

8
html/cgi-bin/extrahd.cgi
View File

@@ -193,16 +193,16 @@ END
$size = int($partitionline[1] / 1024);
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<tr><td align="center" bgcolor='#EAEAEA'>/dev/$partitionline[0]
<td align="center" bgcolor='#EAEAEA'>$Lang::tr{'size'} $size MB
<td align='center' bgcolor='#EAEAEA'><select name="FS">
<tr><td align="center">/dev/$partitionline[0]
<td align="center">$Lang::tr{'size'} $size MB
<td align='center'><select name="FS">
<option value="auto">auto</option>
<option value="ext3">ext3</option>
<option value="reiserfs">reiserfs</option>
<option value="vfat">fat</option>
<option value="ntfs-3g">ntfs (experimental)</option>
</select>
<td align="center" bgcolor='#EAEAEA'><input type='text' name='PATH' value=/mnt/harddisk />
<td align="center"><input type='text' name='PATH' value=/mnt/harddisk />
<td align="center">
<input type='hidden' name='DEVICE' value='$partitionline[0]' />
<input type='hidden' name='ACTION' value=$Lang::tr{'add'} />

9
html/cgi-bin/hosts.cgi
View File

@@ -29,6 +29,11 @@ undef (@dummy);
my $setting = "${General::swroot}/main/settings";
our $datafile = "${General::swroot}/main/hosts"; #(our: used in subroutine)
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
our %settings = ();
#Settings1
# removed
@@ -305,9 +310,9 @@ foreach my $line (@current) {
if ($settings{'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
<td align='center'>$temp[1]</td>

9
html/cgi-bin/ids.cgi
View File

@@ -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 <<END
}
.row1color {
border: ridge;
background-color: $table1colour;
background-color: $color{'color22'};
}
.row2color {
border: ridge;
background-color: $table2colour;
background-color: $color{'color20'};
}
.rowselected {
border: double #FF0000;

13
html/cgi-bin/index.cgi
View File

@@ -37,6 +37,11 @@ $pppsettings{'PROFILENAME'} = 'None';
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/ddns/settings", \%ddnssettings);
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 $connstate = &Header::connectionstatus();
if ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
$refresh = "<meta http-equiv='refresh' content='30;'>";
@@ -98,9 +103,9 @@ print <<END;
<!-- Table of networks -->
<table border='0' width=80%>
<tr> <th bgcolor='lightgrey'>$Lang::tr{'network'}
<th bgcolor='lightgrey'>IP
<th bgcolor='lightgrey'>$Lang::tr{'status'}
<tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
<th bgcolor='$color{'color20'}'>IP
<th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
<tr> <td bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}:</b></font></a><br>
<td width='30%'>$ipaddr
<td width='45%'>$connstate
@@ -225,7 +230,7 @@ END
} else {
foreach my $line (@status) {
if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsinactive'}</font></b></td></tr></table>";
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
}
}
}

9
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -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 "<tr bgcolor='${Header::table1colour}'>\n"; }
print "<tr bgcolor='$color{'color20'}'>\n"; }
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print "<tr bgcolor='$color{'color22'}'>\n"; }
print <<END
<td align='center'>$time</td>

9
html/cgi-bin/logs.cgi/ids.dat
View File

@@ -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 "<tr bgcolor='${Header::table1colour}'><td>\n"; }
print "<tr bgcolor='$color{'color20'}'><td>\n"; }
else {
print "<tr bgcolor='${Header::table2colour}'><td>\n"; }
print "<tr bgcolor='$color{'color22'}'><td>\n"; }
my ($datetime,$title,$priority,$classification,$srcip,$srcport,$destip,$destport,$sid,$refs) = split(/\|/);
print <<END
<table width='100%'>

9
html/cgi-bin/logs.cgi/log.dat
View File

@@ -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 "<tr bgcolor='${Header::table1colour}'>"; }
print "<tr bgcolor='$color{'color20'}'>"; }
else {
print "<tr bgcolor='${Header::table2colour}'>"; }
print "<tr bgcolor='$color{'color22'}'>"; }
print "<td>$time<td>$sec<td>" .&Header::cleanhtml ("$d", 'y') . "</td></tr>\n";
$lines++;
}

9
html/cgi-bin/logs.cgi/proxylog.dat
View File

@@ -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 "<tr bgcolor='${Header::table1colour}'>\n"; }
print "<tr bgcolor='$color{'color20'}'>\n"; }
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print "<tr bgcolor='$color{'color20'}'>\n"; }
my ($datetime,$ip,$so,$url) = split;
my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime);
$SECdt = sprintf ("%.02d",$SECdt);

7
html/cgi-bin/logs.cgi/urlfilter.dat
View File

@@ -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 .= "<b><font color='$Header::colourerr'>"; $attr2 .= "</font></b>"; }
print "<tr>\n";
} else {
if ($lines % 2) { print "<tr bgcolor='$Header::table1colour'>\n"; } else { print "<tr bgcolor='$Header::table2colour'>\n"; }
if ($lines % 2) { print "<tr bgcolor='$color{'color20'}'>\n"; } else { print "<tr bgcolor='$color{'color22'}'>\n"; }
}
if ($cgiparams{'LOGTYPE'} eq 'squidGuard') {
print "<td nowrap>$time &nbsp; $pid &nbsp; $attr1@loginfo$attr2</td>\n";

2
html/cgi-bin/networks.cgi
View File

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

37
html/cgi-bin/outgoingfw.cgi
View File

@@ -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 <<END
<hr />
<table border='0' width='100%' cellspacing='0'>
<tr bgcolor='white'>
<td width='14%'><b>Protokoll</b>
<td width='14%'><b>Netzwerk</b>
<td width='14%'><b>Ziel</b>
<td width='14%'><b>Anmerkung</b>
<td width='14%'><b>Politik</b>
<td width='30%'><b>Aktionen</b>
<tr bgcolor='$color{'color22'}'>
<td width='14%' align='center'><b>Protokoll</b>
<td width='14%' align='center'><b>Netzwerk</b>
<td width='14%' align='center'><b>Ziel</b>
<td width='14%' align='center'><b>Anmerkung</b>
<td width='14%' align='center'><b>Politik</b>
<td width='30%' align='center'><b>Aktionen</b>
END
;
foreach $configentry (sort @configs)
@@ -240,7 +245,7 @@ END
if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW'>"; }
if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
print <<END
<tr bgcolor='#F0F0F0'>
<tr bgcolor='$color{'color20'}'>
<td align='center'>$outfwsettings{'PROT'}
<td align='center'>$outfwsettings{'SNET'}
<td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
@@ -310,7 +315,7 @@ if ($outfwsettings{'POLICY'} eq 'MODE2'){
&Header::openbox('100%', 'center', 'P2P-Block');
print <<END
<table width='40%'>
<tr bgcolor='#FFFFFF'><td width='66%'><b>Protokoll</b>
<tr bgcolor='$color{'color20'}'><td width='66%'><b>Protokoll</b>
<td width='33%'><b>Status</b>
END
;
@@ -322,14 +327,8 @@ END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
END
;
if ($id % 2) {
print "\t\t\t<tr bgcolor='#F0F0F0'>\n";
}
else {
print "\t\t\t<tr bgcolor='#FAFAFA'>\n";
}
$id++;
print <<END
print "\t\t\t<tr bgcolor='$color{'color22'}'>\n";
print <<END
<td width='66%' align='center'>$p2pline[0]:
<td width='33%' align='center'><input type='hidden' name='P2PROT' value=$p2pline[1]>
END
@@ -455,7 +454,7 @@ if ($outfwsettings{'POLICY'} eq 'MODE1')
my @defservices = <FILE>;
close FILE;
print "<table width='100%'><tr bgcolor='#F0F0F0'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td></td></tr>";
print "<table width='100%'><tr bgcolor='$color{'color20'}'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td></td></tr>";
foreach my $serviceline(@defservices)
{
my @service = split(/,/,$serviceline);

21
html/cgi-bin/ovpnmain.cgi
View File

@@ -30,7 +30,10 @@ require "${General::swroot}/countries.pl";
my @dummy = ( ${Header::colourgreen} );
undef (@dummy);
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
###
### Initialize variables
@@ -1460,9 +1463,9 @@ END
if ($user2 >= 1){
for (my $idx = 1; $idx <= $user2; $idx++){
if ($idx % 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";
}
print "<td align='left'>$users[$idx-1]{'CommonName'}</td>";
print "<td align='left'>$users[$idx-1]{'RealAddress'}</td>";
@@ -2875,7 +2878,7 @@ if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
$casubject =~ s+/Email+, E+;
$casubject =~ s/ ST=/ S=/;
print <<END
<tr bgcolor='${Header::table2colour}'>
<tr bgcolor='$color{'color22'}'>
<td class='base'>$Lang::tr{'root certificate'}</td>
<td class='base'>$casubject</td>
<form method='post' name='frmrootcrta'><td width='3%' align='center'>
@@ -2892,7 +2895,7 @@ END
} else {
# display rootcert generation buttons
print <<END
<tr bgcolor='${Header::table2colour}'>
<tr bgcolor='$color{'color22'}'>
<td class='base'>$Lang::tr{'root certificate'}:</td>
<td class='base'>$Lang::tr{'not present'}</td>
<td colspan='3'>&nbsp;</td></tr>
@@ -2907,7 +2910,7 @@ if (-f "${General::swroot}/ovpn/certs/servercert.pem") {
$hostsubject =~ s+/Email+, E+;
$hostsubject =~ s/ ST=/ S=/;
print <<END
<tr bgcolor='${Header::table1colour}'>
<tr bgcolor='$color{'color20'}'>
<td class='base'>$Lang::tr{'host certificate'}</td>
<td class='base'>$hostsubject</td>
<form method='post' name='frmhostcrta'><td width='3%' align='center'>
@@ -2924,7 +2927,7 @@ END
} else {
# Nothing
print <<END
<tr bgcolor='${Header::table1colour}'>
<tr bgcolor='$color{'color20'}'>
<td width='25%' class='base'>$Lang::tr{'host certificate'}:</td>
<td class='base'>$Lang::tr{'not present'}</td>
</td><td colspan='3'>&nbsp;</td></tr>
@@ -2941,9 +2944,9 @@ if (! -f "${General::swroot}/ovpn/ca/cacert.pem") {
if (keys %cahash > 0) {
foreach my $key (keys %cahash) {
if (($key + 1) % 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";
}
print "<td class='base'>$cahash{$key}[0]</td>\n";
print "<td class='base'>$cahash{$key}[1]</td>\n";

9
html/cgi-bin/portfw.cgi
View File

@@ -38,6 +38,11 @@ require "${General::swroot}/header.pl";
my @dummy = ( ${Header::colouryellow} );
undef (@dummy);
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 %selected=();
my %checked=();
@@ -764,10 +769,10 @@ while (<RULES>)
print "<tr bgcolor='${Header::colouryellow}'>\n";
} else {
if ($id % 2) {
print "<tr bgcolor='${Header::table1colour}'>\n";
print "<tr bgcolor='$color{'color22'}'>\n";
}
else {
print "<tr bgcolor='${Header::table2colour}'>\n";
print "<tr bgcolor='$color{'color20'}'>\n";
}
}

19
html/cgi-bin/pppsetup.cgi
View File

@@ -29,6 +29,11 @@ my $errormessage = '';
my $maxprofiles = 5;
my $kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`;
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::showhttpheaders();
$pppsettings{'ACTION'} = '';
@@ -647,7 +652,7 @@ print <<END
<tr>
<td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'reconnection'}:</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'reconnection'}:</b></td>
</tr>
<tr>
<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='manual' $checked{'RECONNECTION'}{'manual'}>$Lang::tr{'manual'}</td>
@@ -696,7 +701,7 @@ if ($pppsettings{'TYPE'} eq 'isdn') {
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'isdn settings'}</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'isdn settings'}</b></td>
</tr>
<tr>
<td colspan='3' width='75%'>$Lang::tr{'use ibod'}</td>
@@ -715,7 +720,7 @@ if ($pppsettings{'TYPE'} eq 'pptp')
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'pptp settings'}</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
</tr>
<tr>
<td width='25%'>$Lang::tr{'phonebook entry'}</td>
@@ -740,7 +745,7 @@ if ($pppsettings{'TYPE'} eq 'pppoe')
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'pppoe settings'}</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
</tr>
<tr>
<td width='25%'><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
@@ -771,7 +776,7 @@ if ($pppsettings{'TYPE'} eq 'fritzdsl')
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'adsl settings'}:</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
</tr>
<tr>
<td colspan='2' width='50%'>$Lang::tr{'vpi number'}</td>
@@ -820,7 +825,7 @@ END
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td bgcolor='${Header::table1colour}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
<td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
</tr>
<tr>
<td width='25%'>$Lang::tr{'username'}</td>
@@ -851,7 +856,7 @@ print <<END
</tr>
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
<td bgcolor='${Header::table1colour}' colspan='4' width='100%'><b>DNS:</b></td>
<td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>DNS:</b></td>
</tr>
<tr>
<td colspan='4' width='100%'><input type='radio' name='DNS' value='Automatic' $checked{'DNS'}{'Automatic'} />$Lang::tr{'automatic'}</td>

2
html/cgi-bin/proxy.cgi
View File

@@ -312,7 +312,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$errormessage = $Lang::tr{'invalid input'};
goto ERROR;
}
if (!(&General::validproxyport($proxysettings{'PROXY_PORT'})))
if (!(&General::validport($proxysettings{'PROXY_PORT'})))
{
$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
goto ERROR;

43
html/cgi-bin/qos.cgi
View File

@@ -102,6 +102,11 @@ $qossettings{'TOS'} = '';
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
&Header::getcgihash(\%qossettings);
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::openpage('QoS', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -1097,24 +1102,24 @@ sub showclasses {
&Header::openbox('100%', 'center', "Klasse: $classline[1]");
print <<END
<table border='0' width='100%' cellspacing='0'>
<tr><td bgcolor='lightgrey' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
<td bgcolor='lightgrey' width='10%' align='center'><b>Klasse</b>
<td bgcolor='lightgrey' width='10%' align='center'>Prioritaet
<td bgcolor='lightgrey' width='10%' align='center'>Garantierte Bandbreite
<td bgcolor='lightgrey' width='10%' align='center'>Maximale Bandbreite
<td bgcolor='lightgrey' width='10%' align='center'>Burst
<td bgcolor='lightgrey' width='10%' align='center'>Ceil Burst
<td bgcolor='lightgrey' width='10%' align='center'>TOS
<td bgcolor='lightgrey' width='20%' align='center'>Aktionen
<tr><td align='center' bgcolor='#EAEAEA'>$classline[0]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[1]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[2]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[3]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[4]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[5]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[6]</td>
<td align='center' bgcolor='#EAEAEA'>$classline[7]</td>
<td align='right' bgcolor='#EAEAEA'>
<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
<td bgcolor='$color{'color20'}' width='10%' align='center'><b>Klasse</b>
<td bgcolor='$color{'color20'}' width='10%' align='center'>Prioritaet
<td bgcolor='$color{'color20'}' width='10%' align='center'>Garantierte Bandbreite
<td bgcolor='$color{'color20'}' width='10%' align='center'>Maximale Bandbreite
<td bgcolor='$color{'color20'}' width='10%' align='center'>Burst
<td bgcolor='$color{'color20'}' width='10%' align='center'>Ceil Burst
<td bgcolor='$color{'color20'}' width='10%' align='center'>TOS
<td bgcolor='$color{'color20'}' width='20%' align='center'>Aktionen
<tr><td align='center' bgcolor='$color{'color22'}'>$classline[0]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[1]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[2]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[3]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[4]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[5]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[6]</td>
<td align='center' bgcolor='$color{'color22'}'>$classline[7]</td>
<td align='right' bgcolor='$color{'color22'}'>
<table border='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
@@ -1531,4 +1536,4 @@ sub random_hex_color {
my @color;
push @color, @hex[rand(@hex)] for 1 .. $size;
return join('', '#', @color);
}
}

57
html/cgi-bin/samba.cgi
View File

@@ -20,6 +20,8 @@ my %cgisettings = ();
my %checked = ();
my %netsettings = ();
my %ovpnsettings = ();
my %color = ();
my %mainsettings = ();
my $message = "";
my $errormessage = "";
@@ -42,6 +44,8 @@ my %shares = ();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
############################################################################################################################
############################################# Samba Dienste fr Statusberprfung ##########################################
@@ -156,7 +160,7 @@ if ($sambasettings{'ACTION'} eq 'globalreset')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
$Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
<input type='hidden' name='ACTION' value='globalresetyes' /></form></td>
@@ -174,7 +178,7 @@ if ($sambasettings{'ACTION'} eq 'sharesreset')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
$Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
<input type='hidden' name='ACTION' value='sharesresetyes' /></form></td>
@@ -360,7 +364,6 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
&Header::openbox('100%', 'center', $Lang::tr{'samba'});
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
END
@@ -371,7 +374,7 @@ if ( $message ne "" )
}
print <<END
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
</table><table width='95%' cellspacing='0'>
END
;
@@ -397,7 +400,7 @@ print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
@@ -434,7 +437,7 @@ END
print <<END
<tr><td align='center' width='40%'>$Lang::tr{'more'}</td><td align='left'><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30" /></td></tr>
<tr><td align='left'><br /></td><td></td></tr>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
<option value='share' $selected{'SECURITY'}{'share'}>Share</option>
<option value='user' $selected{'SECURITY'}{'user'}>User</option>
@@ -450,7 +453,7 @@ print <<END
<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
<input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
<tr><td align='left'><br /></td><td /></tr>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
@@ -480,7 +483,7 @@ if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'o
{
print <<END
<tr><td align='left'><br /></td><td></td></tr>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'pdc options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pdc options'}</b></td></tr>
<tr><td align='left'><br /></td><td></td></tr>
<tr><td colspan='2' align='center'><textarea name="PDCOPTIONS" cols="50" rows="15" Wrap="off">$PDCOPTIONS</textarea></td></tr>
END
@@ -491,7 +494,7 @@ END
{
print <<END
<tr><td align='left'><br /></td><td></td></tr>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'printing options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'printing options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'load printer'}</td><td align='left'><input type='text' name='LOADPRINTERS' value='$sambasettings{'LOADPRINTERS'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'printing'}</td><td align='left'><input type='text' name='PRINTING' value='$sambasettings{'PRINTING'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'printcap name'}</td><td align='left'><input type='text' name='PRINTCAPNAME' value='$sambasettings{'PRINTCAPNAME'}' size="30" /></td></tr>
@@ -545,11 +548,10 @@ if ($sambasettings{'SECURITY'} eq 'user')
&Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'});
}
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr><td colspan='6' align='left'></td></tr>
<tr><td bgcolor='${Header::table1colour}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
<tr><td bgcolor='$color{'color20'}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
<tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
END
;
@@ -714,11 +716,10 @@ END
my $username = "$sambasettings{'NAME'}";
my $password = 'samba';
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly /></td></tr>
<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
<tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
@@ -738,11 +739,10 @@ END
chomp $password;
$password=~s/\s//g;
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
@@ -761,11 +761,10 @@ END
chomp $pcname;
$pcname=~s/\s//g;
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
@@ -789,10 +788,9 @@ my %shares = config("${General::swroot}/samba/shares");
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
<tr><td align='left'><u>$Lang::tr{'sharename'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
END
;
@@ -858,10 +856,9 @@ END
if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
{
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
<tr><td colspan='2' align='center'></td></tr>
<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
@@ -880,10 +877,9 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
{
my $shareoption = $shares{$sambasettings{'NAME'}};
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
<tr><td colspan='2' align='center'></td></tr>
<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
<tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
@@ -936,10 +932,9 @@ if ( -e "/var/ipfire/cups/enable")
my @Printers = keys(%printer);
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
<tr><td align='left'><u>$Lang::tr{'printername'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
END
;
@@ -985,10 +980,9 @@ END
if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' )
{
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add printer'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add printer'}</b></td></tr>
<tr><td colspan='2' align='center'></td></tr>
<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
@@ -1008,10 +1002,9 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq '
{
my $printeroption = $printer{$sambasettings{'NAME'}};
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'edit printer'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit printer'}</b></td></tr>
<tr><td colspan='2' align='center'></td></tr>
<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
<tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$printeroption</textarea></td></tr>
@@ -1056,10 +1049,9 @@ if ($sambasettings{'ACTION'} eq 'smbprinterchange')
&Header::openbox('100%', 'center', 'Status');
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
<tr><td align='left'>$Status</td></tr>
</table>
END
@@ -1079,11 +1071,10 @@ $Log=~s/\n/<br \/>/g;
&Header::openbox('100%', 'center', $Lang::tr{'log'});
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
<tr><td colspan='3' align='left'><br /></td></tr>
<tr><td align='left'><select name='LOG' style="width: 200px">
END

2
html/cgi-bin/services.cgi
View File

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

13
html/cgi-bin/system.cgi
View File

@@ -25,6 +25,11 @@ undef (@dummy);
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
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=();
# Maps a nice printable name to the changing part of the pid file, which
# is also the name of the program
@@ -101,20 +106,14 @@ print <<END
END
;
my $lines = 0;
my $key = '';
foreach $key (sort keys %servicenames)
{
if ($lines % 2) {
print "<tr bgcolor='${Header::table1colour}'>\n"; }
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print "<td align='left'>$key</td>\n";
print "<tr>\n<td align='left'>$key</td>\n";
my $shortname = $servicenames{$key};
my $status = &isrunning($shortname);
print "$status\n";
print "</tr>\n";
$lines++;
}

13
html/cgi-bin/traffic.cgi
View File

@@ -18,6 +18,11 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require '/var/ipfire/net-traffic/net-traffic-lib.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 %pppsettings;
my %netsettings;
@@ -225,9 +230,9 @@ foreach (@allDays) {
$total_red_out += $allDaysBytes{$_}{${Traffic::red_out}};
if ($lines % 2) {
print "<tr bgcolor='${Header::table1colour}'>"; }
print "<tr bgcolor='$color{'color20'}'>"; }
else {
print "<tr bgcolor='${Header::table2colour}'>"; }
print "<tr bgcolor='$color{'color22'}'>"; }
printf "<td align='center' nowrap='nowrap'>%s</td>\n", $allDaysBytes{$_}{'Day'};
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::green_in}}/1048576);
@@ -259,8 +264,8 @@ $total_orange_out=sprintf("%.2f", ($total_orange_out/1048576));
$total_red_in=sprintf("%.2f", ($total_red_in/1048576));
$total_red_out=sprintf("%.2f", ($total_red_out/1048576));
if ($lines % 2) {print "<tr bgcolor='${Header::table1colour}'>"; }
else {print "<tr bgcolor='${Header::table2colour}'>"; }
if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>"; }
else {print "<tr bgcolor='$color{'color22'}'>"; }
print <<END;
<td align='center' class='boldbase' height='20' nowrap='nowrap'><b>$Lang::tr{'trafficsum'}</b></td>

98
html/cgi-bin/tripwire.cgi
View File

@@ -25,6 +25,11 @@ my $file = `ls -tr /var/ipfire/tripwire/report/ | tail -1`;
my @cronjobs = `ls /etc/fcron.daily/tripwire*`;
my $Log =$Lang::tr{'no log selected'};
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
############################################################################################################################
################################################# Tripwire Default Variablen ################################################
@@ -105,7 +110,7 @@ if ($tripwiresettings{'ACTION'} eq 'addcron')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'add cron'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'add cron'}</b>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<tr><td align='center' colspan='2'>HH<input type='text' size='2' name='HOUR' value='08'/>MM<input type='text' size='2' name='MINUTE' value='00'/><br /><br /></td></tr>
<tr><td align='right' width='50%'>
@@ -125,7 +130,7 @@ if ($tripwiresettings{'ACTION'} eq 'globalreset')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'resetglobals'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'resetglobals'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'defaultwarning'}<br /><br /></font></td></tr>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
$Lang::tr{'ok'} <input type='image' alt='$Lang::tr{'ok'}' src='/images/edit-redo.png' />
@@ -144,7 +149,7 @@ if ($tripwiresettings{'ACTION'} eq 'generatepolicypw')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'generatepolicy'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'generatepolicy'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningpolicy'}<br /><br /></font></td></tr>
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr>
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /><br /><br /></td></tr>
@@ -165,7 +170,7 @@ if ($tripwiresettings{'ACTION'} eq 'policyresetpw')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'resetpolicy'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'resetpolicy'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningpolicy'}<br /><br /></font></td></tr>
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr>
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /><br /><br /></td></tr>
@@ -186,7 +191,7 @@ if ($tripwiresettings{'ACTION'} eq 'updatedatabasepw')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'updatedatabase'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'updatedatabase'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningdatabase'}<br /><br /></font></td></tr>
<tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /><br /><br /></td></tr>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -205,7 +210,7 @@ if ($tripwiresettings{'ACTION'} eq 'keyreset')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'keyreset'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'keyreset'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningkeys'}<br /><br /></font></td></tr>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
$Lang::tr{'ok'} <input type='image' alt='$Lang::tr{'ok'}' src='/images/edit-redo.png' />
@@ -224,7 +229,7 @@ if ($tripwiresettings{'ACTION'} eq 'generatekeys')
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='2' align='center'><b>$Lang::tr{'generatekeys'}</b>
<tr><td bgcolor='$color{'color20'}' colspan='2' align='center'><b>$Lang::tr{'generatekeys'}</b>
<tr><td colspan='2' align='center'><font color=red>$Lang::tr{'tripwirewarningkeys'}<br /><br /></font></td></tr>
<tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
$Lang::tr{'ok'} <input type='image' alt='$Lang::tr{'ok'}' src='/images/edit-redo.png' />
@@ -308,12 +313,11 @@ if ($tripwiresettings{'ACTION'} eq 'deletecron'){system("/usr/local/bin/tripwire
&Header::openbox('100%', 'center', 'Tripwire');
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'emailreportlevel'}</td><td align='left'><input type='text' name='EMAILREPORTLEVEL' value='$tripwiresettings{'EMAILREPORTLEVEL'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'reportlevel'}</td><td align='left'><input type='text' name='REPORTLEVEL' value='$tripwiresettings{'REPORTLEVEL'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'mailmethod'}</td><td align='left'><input type='text' name='MAILMETHOD' value='$tripwiresettings{'MAILMETHOD'}' size="30" /></td></tr>
@@ -357,12 +361,11 @@ END
&Header::openbox('100%', 'center', $Lang::tr{'generate tripwire keys and init'});
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'keys'}</b></td></tr>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'keys'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /></td></tr>
</table>
@@ -402,7 +405,6 @@ END
&Header::openbox('100%', 'center', $Lang::tr{'tripwire functions'});
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
@@ -446,11 +448,10 @@ END
&Header::openbox('100%', 'center', $Lang::tr{'tripwire reports'});
print <<END
<hr />
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
<tr><td colspan='3' align='left'><br /></td></tr>
<tr><td align='left'><select name='LOG' style="width: 500px">
END
@@ -483,42 +484,41 @@ END
############################################################################################################################
####################################################### Tripwire Cronjob ##################################################
#
#&Header::openbox('100%', 'center', $Lang::tr{'tripwire cronjob'});
#print <<END
#<br />
#<table width='95%' cellspacing='0'>
#<tr><td colspan='3' align='left'><br /></td></tr>
#END
#;
#foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=$cronjob; $time=~s/\/etc\/fcron.daily\/tripwire//g;print"<form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td align='left' colspan='2'>$cronjob at $time daily</td><td><input type='hidden' name='ACTION' value='deletecron' /><input type='hidden' name='CRON' value='$time' /><input type='image' alt='delete cron' src='/images/user-trash.png' /></td></tr></form>";}
#print <<END
#</table>
#<br />
#<table width='10%' cellspacing='0'>
#<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
# <input type='hidden' name='ACTION' value='addcron'/>
# <input type='image' alt='$Lang::tr{'add cron'}' src='/images/appointment-new.png' /></form></td>
#<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
# <input type='hidden' name='ACTION' value='croncaption' />
# <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
#</table>
#END
#;
&Header::openbox('100%', 'center', $Lang::tr{'tripwire cronjob'});
print <<END
<hr />
<br />
<table width='95%' cellspacing='0'>
<tr><td colspan='3' align='left'><br /></td></tr>
END
;
foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=$cronjob; $time=~s/\/etc\/fcron.daily\/tripwire//g;print"<form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td align='left' colspan='2'>$cronjob at $time daily</td><td><input type='hidden' name='ACTION' value='deletecron' /><input type='hidden' name='CRON' value='$time' /><input type='image' alt='delete cron' src='/images/user-trash.png' /></td></tr></form>";}
print <<END
</table>
<br />
<table width='10%' cellspacing='0'>
<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='addcron'/>
<input type='image' alt='$Lang::tr{'add cron'}' src='/images/appointment-new.png' /></form></td>
<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='croncaption' />
<input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
</table>
END
;
if ($tripwiresettings{'ACTION'} eq 'croncaption')
{
print <<END
<br />
<table width='95%' cellspacing='0'>
<tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
<tr><td align='right' width='33%'><img src='/images/appointment-new.png' /></td><td align='left'>$Lang::tr{'add cron'}</td></tr>
<tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete cron'}</td></tr>
</table>
END
;
}
#if ($tripwiresettings{'ACTION'} eq 'croncaption')
#{
#print <<END
#<br />
#<table width='95%' cellspacing='0'>
#<tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
#<tr><td align='right' width='33%'><img src='/images/appointment-new.png' /></td><td align='left'>$Lang::tr{'add cron'}</td></tr>
#<tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete cron'}</td></tr>
#</table>
#END
#;
#}
&Header::closebox();

14
html/cgi-bin/upnp.cgi
View File

@@ -24,6 +24,11 @@ my %selected= () ;
my %servicenames =('UPnP Daemon' => 'upnpd',);
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::showhttpheaders();
############################################################################################################################
############################################### Setzen von Standartwerten ##################################################
@@ -122,12 +127,7 @@ my $lines = 0;
my $key = '';
foreach $key (sort keys %servicenames)
{
if ($lines % 2)
{print "<tr bgcolor='${Header::table1colour}'>\n";}
else
{print "<tr bgcolor='${Header::table2colour}'>\n"; }
print "<td align='left'>$key\n";
print "<tr><td align='left'>$key\n";
my $shortname = $servicenames{$key};
my $status = &isrunning($shortname);
print "$status\n";
@@ -144,7 +144,7 @@ print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr><td colspan='2' align='left' bgcolor='${Header::table1colour}'><b>$Lang::tr{'options'}</b></td></tr>
<tr><td colspan='2' align='left' bgcolor='$color{'color20'}'><b>$Lang::tr{'options'}</b></td></tr>
<tr><td align='left' colspan='2'><br /></td></tr>
<tr><td align='left'>UPnP Device Name:</td><td><input type='text' name='friendlyName' value='$upnpsettings{'friendlyName'}' size="30" /></td></tr>
<tr><td align='left' colspan='2'><br /></td></tr>

23
html/cgi-bin/vpnmain.cgi
View File

@@ -33,6 +33,11 @@ my %selected=();
my $warnmessage = '';
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);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
$cgiparams{'ENABLED'} = 'off';
$cgiparams{'EDIT_ADVANCED'} = 'off';
@@ -2506,9 +2511,9 @@ END
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
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";
}
print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>";
print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
@@ -2529,7 +2534,7 @@ END
}
# move to blueif really down
if ($confighash{$key}[0] eq 'off' && $active =~ /${Header::colourred}/ ) {
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsinactive'}</font></b></td></tr></table>";
$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>";
}
print <<END
<td align='center'>$active</td>
@@ -2663,7 +2668,7 @@ EOF
my $casubject = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/cacert.pem"));
print <<END
<tr bgcolor='${Header::table2colour}'>
<tr bgcolor='$color{'color22'}'>
<td class='base'>$Lang::tr{'root certificate'}</td>
<td class='base'>$casubject</td>
<td width='3%' align='center'>
@@ -2684,7 +2689,7 @@ END
} else {
# display rootcert generation buttons
print <<END
<tr bgcolor='${Header::table2colour}'>
<tr bgcolor='$color{'color22'}'>
<td class='base'>$Lang::tr{'root certificate'}:</td>
<td class='base'>$Lang::tr{'not present'}</td>
<td colspan='3'>&nbsp;</td></tr>
@@ -2696,7 +2701,7 @@ END
my $hostsubject = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/certs/hostcert.pem"));
print <<END
<tr bgcolor='${Header::table1colour}'>
<tr bgcolor='$color{'color20'}'>
<td class='base'>$Lang::tr{'host certificate'}</td>
<td class='base'>$hostsubject</td>
<td width='3%' align='center'>
@@ -2717,7 +2722,7 @@ END
} else {
# Nothing
print <<END
<tr bgcolor='${Header::table1colour}'>
<tr bgcolor='$color{'color20'}'>
<td width='25%' class='base'>$Lang::tr{'host certificate'}:</td>
<td class='base'>$Lang::tr{'not present'}</td>
<td colspan='3'>&nbsp;</td></tr>
@@ -2729,9 +2734,9 @@ END
if (keys %cahash > 0) {
foreach my $key (keys %cahash) {
if ($rowcolor++ % 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";
}
print "<td class='base'>$cahash{$key}[0]</td>\n";
print "<td class='base'>$cahash{$key}[1]</td>\n";

9
html/cgi-bin/wakeonlan.cgi
View File

@@ -37,6 +37,11 @@ my @wol_devices = ();
our $datafile = "/var/ipfire/wakeonlan/clients.conf";
&ReadConfig;
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 %netsettings = ();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
my %cgiparams = ();
@@ -298,11 +303,11 @@ for $i ( 0 .. $#wol_devices )
}
elsif ( $i % 2)
{
print "<tr bgcolor='$Header::table2colour'>";
print "<tr bgcolor='$color{'color22'}'>";
}
else
{
print "<tr bgcolor='$Header::table1colour'>";
print "<tr bgcolor='$color{'color20'}'>";
}
print <<END

9
html/cgi-bin/xtaccess.cgi
View File

@@ -32,6 +32,11 @@ my $filename = "${General::swroot}/xtaccess/config";
my $aliasfile = "${General::swroot}/ethernet/aliases";
my $changed = 'no';
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::showhttpheaders();
$cgiparams{'ENABLED'} = 'off';
@@ -289,9 +294,9 @@ foreach my $line (@current)
if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) {
print "<tr bgcolor='${Header::colouryellow}'>\n"; }
elsif ($id % 2) {
print "<tr bgcolor='${Header::table1colour}'>\n"; }
print "<tr bgcolor='$color{'color22'}'>\n"; }
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print "<tr bgcolor='$color{'color20'}'>\n"; }
if ($temp[3] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};}
else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; }
if ($temp[1] eq '0.0.0.0/0') {

4
html/html/themes/ipfire/include/colors.txt
View File

@@ -17,9 +17,9 @@ color16=#40E0D0
color17=#90EE90
color18=#F4A460
color19=#EAE9EE
color20=#EAE9EE
color20=#E0E0E0
color21=#EAE9EE
color22=#EAE9EE
color22=#F0F0F0
color23=#FF00FF
color24=#6464FF
color25=#FF6464

4
html/html/themes/maniac/include/colors.txt
View File

@@ -17,9 +17,9 @@ color16=#40E0D0
color17=#90EE90
color18=#F4A460
color19=#EAE9EE
color20=#EAE9EE
color20=#1C1C1C
color21=#CD6600
color22=#EAE9EE
color22=#4F4F4F
color23=#FF00FF
color24=#6464FF
color25=#FF6464