From e455cafe40d2dc4da2b7d0ba7c6c4678815ed74e Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 4 Jan 2007 21:30:12 +0000 Subject: [PATCH] Hab ein Paar CGIs gefixt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@378 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/etherwake | 1 + config/rootfiles/common/grep | 2 +- config/rootfiles/common/gzip | 6 +-- html/cgi-bin/fwhits.cgi | 18 ++++---- html/cgi-bin/graphs.cgi | 22 +++++----- html/cgi-bin/index.cgi | 45 ++++++++++++++------ html/cgi-bin/netstatus.cgi | 21 --------- html/cgi-bin/status.cgi | 19 --------- html/cgi-bin/wakeonlan.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 5 ++- 10 files changed, 61 insertions(+), 80 deletions(-) create mode 100644 config/rootfiles/common/etherwake diff --git a/config/rootfiles/common/etherwake b/config/rootfiles/common/etherwake new file mode 100644 index 000000000..6332dc30e --- /dev/null +++ b/config/rootfiles/common/etherwake @@ -0,0 +1 @@ +usr/sbin/etherwake diff --git a/config/rootfiles/common/grep b/config/rootfiles/common/grep index 4b05a9de4..5d5db68a1 100644 --- a/config/rootfiles/common/grep +++ b/config/rootfiles/common/grep @@ -1,5 +1,5 @@ bin/egrep -#bin/fgrep +bin/fgrep bin/grep #usr/info/grep.info #usr/man/man1/egrep.1 diff --git a/config/rootfiles/common/gzip b/config/rootfiles/common/gzip index b4772643a..a62ee3885 100644 --- a/config/rootfiles/common/gzip +++ b/config/rootfiles/common/gzip @@ -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 diff --git a/html/cgi-bin/fwhits.cgi b/html/cgi-bin/fwhits.cgi index 58da56577..40026dab3 100755 --- a/html/cgi-bin/fwhits.cgi +++ b/html/cgi-bin/fwhits.cgi @@ -28,7 +28,7 @@ my $graphdir = "/home/httpd/html/graphs"; my @LOCALCHECK=(); my $errormessage=""; -&Header::openpage($Lang::tr{'firewall graphs'}, 1, ' '); +&Header::openpage($Lang::tr{'firewall graphs'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); print <$Lang::tr{'the statistics were last updated at'}: $ftime
\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-week-line.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-month-line.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-year-line.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-week-area.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-month-area.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"}); my $ftime = localtime((stat("$graphdir/firewallhits-year-area.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print "
\n"; &Header::closebox(); } diff --git a/html/cgi-bin/graphs.cgi b/html/cgi-bin/graphs.cgi index 9c7743e7d..708387cf7 100644 --- a/html/cgi-bin/graphs.cgi +++ b/html/cgi-bin/graphs.cgi @@ -49,7 +49,7 @@ sub diskbox { my $ftime = localtime((stat("$graphdir/disk-$disk-day.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; print "
\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 "
"; print "$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print "
"; - print "
"; - print "
"; - print ""; + print "
"; + print "
"; + print "
"; + print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } 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 "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; print ""; - print ""; + print ""; print ""; } else { print $Lang::tr{'no information available'}; diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 3ee9bef9c..921e299e2 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -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 <Willkommen in ihrem Administrationsmenue -

In diesem Menue koennen Sie ihren IPFire administrieren.

-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 < $Lang::tr{'network'} IP $Lang::tr{'status'} - $Lang::tr{'internet'}:
+ $Lang::tr{'internet'}:
$ipaddr $connstate @@ -144,7 +137,7 @@ END } if ( $netsettings{'GREEN_DEV'} ) { print <$Lang::tr{'lan'}: + $Lang::tr{'lan'}: $netsettings{'GREEN_ADDRESS'} END @@ -154,7 +147,7 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}:
+ $Lang::tr{'wireless'}:
$netsettings{'BLUE_ADDRESS'} END @@ -164,7 +157,7 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}:
+ $Lang::tr{'dmz'}:
$netsettings{'ORANGE_ADDRESS'} Online 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 <$Lang::tr{'vpn'}:
+ $Lang::tr{'vpn'}:
$ipsecip Online 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 "\n"; + } else { + print "\n"; + } + print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")"; + my $active = "
$Lang::tr{'capsclosed'}
"; + if ($confighash{$key}[0] eq 'off') { + $active = "
$Lang::tr{'capsclosed'}
"; + } else { + foreach my $line (@status) { + if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) { + $active = "
$Lang::tr{'capsopen'}
"; + } + } + } + print "$active"; + } } 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 <OpenVPN:
+ OpenVPN:
$ovpnip Online END diff --git a/html/cgi-bin/netstatus.cgi b/html/cgi-bin/netstatus.cgi index bde5bf2a7..670a14dd7 100644 --- a/html/cgi-bin/netstatus.cgi +++ b/html/cgi-bin/netstatus.cgi @@ -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 "\n"; -print "
\n"; -print "$Lang::tr{'interfaces'} |\n"; -if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} eq "DHCP") { - print "RED $Lang::tr{'dhcp configuration'} |\n"; -} -if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') { - print "$Lang::tr{'current dynamic leases'} |\n"; -} -if ($pppsettings{'TYPE'} =~ /^(bewanadsl|alcatelusbk|conexantpciadsl|eagleusbadsl)$/) { - print "$Lang::tr{'adsl settings'} |\n"; -} -print "$Lang::tr{'routing table entries'} |\n"; -print " $Lang::tr{'arp table entries'}\n"; -print "
\n"; - -print "\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 "\n"; &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'}); $output = `/sbin/route -n`; $output = &Header::cleanhtml($output,"y"); print "
$output
\n"; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'}); $output = `/sbin/arp -n`; $output = &Header::cleanhtml($output,"y"); diff --git a/html/cgi-bin/status.cgi b/html/cgi-bin/status.cgi index 45e16a4d6..b25f6f8df 100644 --- a/html/cgi-bin/status.cgi +++ b/html/cgi-bin/status.cgi @@ -68,20 +68,6 @@ if ($netsettings{'BLUE_DEV'} ne '') { &Header::openbigbox('100%', 'left'); -print < - - $Lang::tr{'services'} | - $Lang::tr{'memory'} | - $Lang::tr{'disk usage'} | - $Lang::tr{'uptime and users'} | - $Lang::tr{'loaded modules'} | - $Lang::tr{'kernel version'} - -END -; - -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'services'}); print <\n"; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'memory'}); print "
"; my $ram=0; @@ -194,7 +179,6 @@ END ; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'disk usage'}); print "
\n"; open(DF,'/bin/df -B M -x rootfs|'); @@ -240,21 +224,18 @@ close DF; print "
\n"; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'uptime and users'}); my $output = `/usr/bin/w`; $output = &Header::cleanhtml($output,"y"); print "
$output
\n"; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'loaded modules'}); $output = qx+/bin/lsmod+; ($output = &Header::cleanhtml($output,"y")) =~ s/\[.*\]//g; print "
\n$output\n
\n"; &Header::closebox(); -print "\n"; &Header::openbox('100%', 'left', $Lang::tr{'kernel version'}); print "
\n";
 print `/bin/uname -a`;
diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi
index 9f9c31655..da6bfe3bc 100644
--- a/html/cgi-bin/wakeonlan.cgi
+++ b/html/cgi-bin/wakeonlan.cgi
@@ -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' )
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 3feaba07c..8a9b5d1ac 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -174,7 +174,7 @@ END
 ;
 	&showmenu();
 
-print <
 
 
@@ -284,7 +284,8 @@ END
 			Status: $status Uptime:$uptime Version: $FIREBUILD
 		
 	
-	
+
+
 
 END
 ;
-- 
2.39.2