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

Style ueberarbeitet.

Browse Source 
Graphen fuer den Speicher gefixt.
DNS-Server in der index.cgi gefixt.
Sprachdatei aktualisiert.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@407 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-02-07 20:51:04 +00:00
parent 9833e7d8fb
commit c6aa4ac121
4 changed files with 530 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ END
print "\t<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
}
}
$dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipcop.pid' || -e "${General::swroot}/red/active");
$dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active");
if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
print <<END;
</select>
@@ -136,6 +136,23 @@ END
print "$Lang::tr{'profile has errors'}\n </b></font>\n";
}
my $DNS1 = `cat /var/ipfire/red/dns1`;
my $DNS2 = `cat /var/ipfire/red/dns2`;
chomp($DNS1);
chomp($DNS1);
if ( $DNS1 ) { print <<END;
<tr><td><b>DNS-Server:</b><td>$DNS1
END
}
if ( $DNS2 ) { print <<END;
<td>$DNS2
END
} else { print <<END;
<td>&nbsp;
END
}
if ( $netsettings{'GREEN_DEV'} ) { print <<END;
<tr><td bgcolor='$Header::colourgreen' width='25%'><a href="/cgi-bin/dhcp.cgi"><font size='2' color='white'><b>$Lang::tr{'lan'}:</b></font></a>
<td width='30%'>$netsettings{'GREEN_ADDRESS'}
@@ -207,15 +224,6 @@ END
<td width='45%'><font color=$Header::colourgreen>Online</font>
END
}
if ( $netsettings{'DNS1'} ) { print <<END;
<tr><td>DNS-Server: <td>$netsettings{'DNS1'}
END
}
if ( $netsettings{'DNS2'} ) { print <<END;
<td>$netsettings{'DNS2'}
END
}
# Memory usage warning
my @free = `/usr/bin/free`;

7
html/html/themes/ipfire/include/style.css
View File

@@ -72,7 +72,7 @@ clear: both;
img
{
padding: 3px;
border: solid 1px #e1e1e1;
#border: solid 1px #e1e1e1;
}
img.floatTL
@@ -296,6 +296,11 @@ text-transform: lowercase;
/* Search */
input
{
margin: 0.2em;
}
input.button
{
background: #CA2F2F url('/themes/ipfire/images/n3.gif') repeat-x;

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

File diff suppressed because it is too large Load Diff

53
src/scripts/makegraphs
View File

@@ -197,12 +197,12 @@ sub updateloadgraph {
"DEF:load1=$rrdlog/load.rrd:load1:AVERAGE",
"DEF:load5=$rrdlog/load.rrd:load5:AVERAGE",
"DEF:load15=$rrdlog/load.rrd:load15:AVERAGE",
"AREA:load1#ff0000:1 Minute, letzter\:",
"GPRINT:load1:LAST:%5.2lf\n",
"AREA:load5#ff9900:5 Minuten, letzter\:",
"GPRINT:load5:LAST:%5.2lf\n",
"AREA:load15#ffff00:15 Minuten, letzter\:",
"GPRINT:load15:LAST:%5.2lf",
"AREA:load1#ff0000:1 Minute, letzter\\:",
"GPRINT:load1:LAST:%5.2lf\\j",
"AREA:load5#ff9900:5 Minuten, letzter\\:",
"GPRINT:load5:LAST:%5.2lf\\j",
"AREA:load15#ffff00:15 Minuten, letzter\\:",
"GPRINT:load15:LAST:%5.2lf\\j",
"LINE1:load5#ff9900:",
"LINE1:load1#ff0000:");
$ERROR = RRDs::error;
@@ -316,21 +316,40 @@ sub updatememdata {
open MEM, "/proc/meminfo";
while(<MEM>) {
chomp;
if ($_ =~ /^Mem:/) {
if ($_ =~ /^MemTotal:/) {
my @temp = split (/\s+/, $_);
$memused = $temp[2];
$memfree = $temp[3];
$memshared = $temp[4];
$membuffers = $temp[5];
$memcache = $temp[6];
} elsif ($_ =~ /^Swap:/) {
$memused = $temp[1];
} elsif ($_ =~ /^MemFree:/) {
my @temp = split (/\s+/, $_);
$swapused = $temp[2];
$swapfree = $temp[3];
$memfree = $temp[1];
} elsif ($_ =~ /^Cached:/) {
my @temp = split (/\s+/, $_);
$memcache = $temp[1];
} elsif ($_ =~ /^Buffers:/) {
my @temp = split (/\s+/, $_);
$membuffers = $temp[1];
} elsif ($_ =~ /^SwapTotal:/) {
my @temp = split (/\s+/, $_);
$swapused = $temp[1];
} elsif ($_ =~ /^SwapFree:/) {
my @temp = split (/\s+/, $_);
$swapfree = $temp[1];
}
}
close MEM;
system("/bin/df > /tmp/diskfree");
open DF, "/tmp/diskfree";
while(<DF>) {
chomp;
if ($_ =~ /^shm/) {
my @temp = split (/\s+/, $_);
$memshared = $temp[2];
}
}
close DF;
system("/bin/rm -f /tmp/diskfree");
RRDs::update ("$rrdlog/mem.rrd",
"-t", "memused:memfree:memshared:membuffers:memcache:swapused:swapfree",
"N:$memused:$memfree:$memshared:$membuffers:$memcache:$swapused:$swapfree");
@@ -468,6 +487,8 @@ sub updatediskdatanew {
my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
$atime, $mtime, $ctime, $blksize, $blocks) = stat("/dev/$disk");
print "\n\n$dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks\n\n";
my $major = $rdev >> 8;
my $minor = ($rdev & 0xFF) >>6;
@@ -506,7 +527,7 @@ sub updatediskdatanew {
if ($lastsleepstate==$readwritereq) {
$sleeping=1;
}
}
}
if ($readsect && $writesect) {
RRDs::update ("$rrdlog/disk-$disk.rrd",