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

Hab ein Paar CGIs gefixt.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@378 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-01-04 21:30:12 +00:00
parent a8239982ac
commit e455cafe40
10 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/etherwake Normal file
View File

@@ -0,0 +1 @@
usr/sbin/etherwake

2
config/rootfiles/common/grep
View File

@@ -1,5 +1,5 @@
bin/egrep
#bin/fgrep
bin/fgrep
bin/grep
#usr/info/grep.info
#usr/man/man1/egrep.1

6
config/rootfiles/common/gzip
View File

@@ -1,15 +1,15 @@
bin/compress
#bin/compress
bin/gunzip
bin/gzip
bin/uncompress
bin/zcat
#bin/zcat
#usr/bin/gzexe
#usr/bin/zcmp
#usr/bin/zdiff
#usr/bin/zegrep
#usr/bin/zfgrep
#usr/bin/zforce
usr/bin/zgrep
#usr/bin/zgrep
#usr/bin/zless
#usr/bin/zmore
#usr/bin/znew

18
html/cgi-bin/fwhits.cgi
View File

@@ -28,7 +28,7 @@ my $graphdir = "/home/httpd/html/graphs";
my @LOCALCHECK=();
my $errormessage="";
&Header::openpage($Lang::tr{'firewall graphs'}, 1, ' <META HTTP-EQUIV="Refresh" CONTENT="300"> <META HTTP-EQUIV="Cache-Control" content="no-cache"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> ');
&Header::openpage($Lang::tr{'firewall graphs'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
print <<END;
@@ -46,28 +46,28 @@ if ($cgigraphs[1] eq "line") {
&Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-day-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-day-line.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-day-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-week-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-week-line.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-week-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-month-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-month-line.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-month-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-year-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-year-line.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-year-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
@@ -76,28 +76,28 @@ else
&Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-day-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-day-area.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-day-area.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-week-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-week-area.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-week-area.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-month-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-month-area.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-month-area.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-year-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/firewallhits-year-area.png' border='0' />";
print "<img alt='' src='/graphs/firewallhits-year-area.png' border='0' />";
print "<br />\n";
&Header::closebox();
}

22
html/cgi-bin/graphs.cgi
View File

@@ -49,7 +49,7 @@ sub diskbox {
my $ftime = localtime((stat("$graphdir/disk-$disk-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=disk-$disk'>";
print "<img src='/graphs/disk-$disk-day.png' border='0' />";
print "<img alt='' src='/graphs/disk-$disk-day.png' border='0' />";
print "</a>";
print "<br />\n";
if (-e "/usr/local/bin/hddshutdown-state") {
@@ -70,10 +70,10 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/${graph}-day.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br /><hr />\n";
print "<img src='/graphs/${graph}-day.png' border='0' /><hr />";
print "<img src='/graphs/${graph}-week.png' border='0' /><hr />";
print "<img src='/graphs/${graph}-month.png' border='0' /><hr />";
print "<img src='/graphs/${graph}-year.png' border='0' />";
print "<img alt='' src='/graphs/${graph}-day.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-week.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-month.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-year.png' border='0' />";
} else {
print $Lang::tr{'no information available'};
}
@@ -102,7 +102,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/${graphname}-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=$graphname'>";
print "<img src='/graphs/${graphname}-day.png' border='0' />";
print "<img alt='' src='/graphs/${graphname}-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
@@ -116,7 +116,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/cpu-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=cpu'>";
print "<img src='/graphs/cpu-day.png' border='0' />";
print "<img alt='' src='/graphs/cpu-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
@@ -129,7 +129,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/load-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=load'>";
print "<img src='/graphs/load-day.png' border='0' />";
print "<img alt='' src='/graphs/load-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
@@ -142,7 +142,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/memory-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=memory'>";
print "<img src='/graphs/memory-day.png' border='0' />";
print "<img alt='' src='/graphs/memory-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
@@ -155,7 +155,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/swap-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=swap'>";
print "<img src='/graphs/swap-day.png' border='0' />";
print "<img alt='' src='/graphs/swap-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
@@ -168,7 +168,7 @@ if ($cgigraphs[1] =~ /(GREEN|BLUE|ORANGE|RED|lq|cpu|memory|swap|disk|load)/) {
my $ftime = localtime((stat("$graphdir/disk-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=disk'>";
print "<img src='/graphs/disk-day.png' border='0' />";
print "<img alt='' src='/graphs/disk-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};

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

@@ -65,13 +65,6 @@ my $dialButtonDisabled = "disabled='disabled'";
&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center');
&Header::openbox('100%', 'center', "Willkommen");
print <<END
<h2>Willkommen in ihrem Administrationsmenue</h2>
<p>In diesem Menue koennen Sie ihren IPFire administrieren.</p>
END
;
&Header::closebox();
&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
@@ -108,7 +101,7 @@ print <<END;
<tr> <th bgcolor='lightgrey'>$Lang::tr{'network'}
<th bgcolor='lightgrey'>IP
<th bgcolor='lightgrey'>$Lang::tr{'status'}
<tr> <td bgcolor='$Header::colourred' width='25%'><font size='2' color='white'><b>$Lang::tr{'internet'}:</b></font><br>
<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
<tr><td colspan='2'>
@@ -144,7 +137,7 @@ END
}
if ( $netsettings{'GREEN_DEV'} ) { print <<END;
<tr><td bgcolor='$Header::colourgreen' width='25%'><font size='2' color='white'><b>$Lang::tr{'lan'}:</b></font>
<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'}
<td width='45%'>
END
@@ -154,7 +147,7 @@ END
} else { print "Proxy aus"; }
}
if ( $netsettings{'BLUE_DEV'} ) { print <<END;
<tr><td bgcolor='$Header::colourblue' width='25%'><font size='2' color='white'><b>$Lang::tr{'wireless'}:</b></font><br>
<tr><td bgcolor='$Header::colourblue' width='25%'><a href="/cgi-bin/wireless.cgi"><font size='2' color='white'><b>$Lang::tr{'wireless'}:</b></font></a><br>
<td width='30%'>$netsettings{'BLUE_ADDRESS'}
<td width='45%'>
END
@@ -164,7 +157,7 @@ END
} else { print "Proxy aus"; }
}
if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
<tr><td bgcolor='$Header::colourorange' width='25%'><font size='2' color='white'><b>$Lang::tr{'dmz'}:</b></font><br>
<tr><td bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}:</b></font></a><br>
<td width='30%'>$netsettings{'ORANGE_ADDRESS'}
<td width='45%'><font color=$Header::colourgreen>Online</font>
END
@@ -172,18 +165,44 @@ END
if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
`cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
my @status = `/usr/sbin/ipsec auto --status`;
my %confighash = ();
&General::readhasharray("${General::swroot}/vpn/config", \%confighash);
print <<END;
<tr><td bgcolor='$Header::colourvpn' width='25%'><font size='2' color='white'><b>$Lang::tr{'vpn'}:</b></font><br>
<tr><td bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'vpn'}:</b></font></a><br>
<td width='30%'>$ipsecip
<td width='45%'><font color=$Header::colourgreen>Online</font>
END
my $id = 0;
my $gif;
foreach my $key (keys %confighash) {
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
print "<tr bgcolor='${Header::table1colour}'>\n";
} else {
print "<tr bgcolor='${Header::table2colour}'>\n";
}
print "<td bgcolor='#ffffff'>&nbsp;</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>";
} 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{'capsopen'}</font></b></td></tr></table>";
}
}
}
print "<td align='center'>$active</td>";
}
}
if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` ||
`cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` ||
`cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) {
my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`;
print <<END;
<tr><td bgcolor='$Header::colourovpn' width='25%'><font size='2' color='white'><b>OpenVPN:</b></font><br>
<tr><td bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN:</b></font></a><br>
<td width='30%'>$ovpnip
<td width='45%'><font color=$Header::colourgreen>Online</font>
END

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

@@ -6,8 +6,6 @@
#
# (c) The SmoothWall Team
#
# $Id: netstatus.cgi,v 1.9.2.20 2005/11/05 15:46:25 gespinasse Exp $
#
use strict;
@@ -33,23 +31,6 @@ my $output='';
&Header::openbigbox('100%', 'left');
print "<table width='100%' cellspacing='0' cellpadding='5'border='0'>\n";
print "<tr><td style='background-color: #EAE9EE;' align='left'>\n";
print "<a href='#interfaces'>$Lang::tr{'interfaces'}</a> |\n";
if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} eq "DHCP") {
print "<a href='#reddhcp'>RED $Lang::tr{'dhcp configuration'}</a> |\n";
}
if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') {
print "<a href='#leases'>$Lang::tr{'current dynamic leases'}</a> |\n";
}
if ($pppsettings{'TYPE'} =~ /^(bewanadsl|alcatelusbk|conexantpciadsl|eagleusbadsl)$/) {
print "<a href='#adsl'>$Lang::tr{'adsl settings'}</a> |\n";
}
print "<a href='#routing'>$Lang::tr{'routing table entries'}</a> |\n";
print "<a href='#arp'> $Lang::tr{'arp table entries'}</a>\n";
print "</td></tr></table>\n";
print "<a name='interfaces'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
$output = `/sbin/ifconfig`;
$output = &Header::cleanhtml($output,"y");
@@ -203,14 +184,12 @@ if ($pppsettings{'TYPE'} eq 'eagleusbadsl') {
}
print "<a name='routing'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
$output = `/sbin/route -n`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
print "<a name='arp'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
$output = `/sbin/arp -n`;
$output = &Header::cleanhtml($output,"y");

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

@@ -68,20 +68,6 @@ if ($netsettings{'BLUE_DEV'} ne '') {
&Header::openbigbox('100%', 'left');
print <<END
<table width='100%' cellspacing='0' cellpadding='5'border='0'>
<tr><td style="background-color: #EAE9EE;" align='left'>
<a href='#services'>$Lang::tr{'services'}</a> |
<a href='#memory'>$Lang::tr{'memory'}</a> |
<a href='#disk'>$Lang::tr{'disk usage'}</a> |
<a href='#uptime'>$Lang::tr{'uptime and users'}</a> |
<a href='#modules'>$Lang::tr{'loaded modules'}</a> |
<a href='#kernel'>$Lang::tr{'kernel version'}</a>
</td></tr></table>
END
;
print "<a name='services'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'services'});
print <<END
@@ -111,7 +97,6 @@ print "</table></div>\n";
&Header::closebox();
print "<a name='memory'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'memory'});
print "<table><tr><td><table>";
my $ram=0;
@@ -194,7 +179,6 @@ END
;
&Header::closebox();
print "<a name='disk'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'disk usage'});
print "<table>\n";
open(DF,'/bin/df -B M -x rootfs|');
@@ -240,21 +224,18 @@ close DF;
print "</table>\n";
&Header::closebox();
print "<a name='uptime'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'uptime and users'});
my $output = `/usr/bin/w`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
print "<a name='modules'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'loaded modules'});
$output = qx+/bin/lsmod+;
($output = &Header::cleanhtml($output,"y")) =~ s/\[.*\]//g;
print "<pre>\n$output\n</pre>\n";
&Header::closebox();
print "<a name='kernel'/>\n";
&Header::openbox('100%', 'left', $Lang::tr{'kernel version'});
print "<pre>\n";
print `/bin/uname -a`;

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

@@ -155,7 +155,7 @@ if ( $cgiparams{'ACTION'} eq 'wakeup' )
undef %cgiparams;
system("/usr/local/sbin/launch-ether-wake $mac $iface");
system("/usr/local/bin/launch-ether-wake $mac $iface");
# make a box with info, 'refresh' to normal screen after 5 seconds
if ( $refresh eq 'yes' )

5
html/html/themes/ipfire/include/functions.pl
View File

@@ -174,7 +174,7 @@ END
;
&showmenu();
print <<END
print <<END
</div>
</div>
@@ -284,7 +284,8 @@ END
<b>Status:</b> $status <b>Uptime:</b>$uptime <b>Version:</b> $FIREBUILD
</div>
</div>
</body>
</div>
</body>
</html>
END
;