X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=eec3f9bf361f6a1d463c4e616e16e504c05b3f0a;hp=b0a90181d1e4328437e783c07f29fb122505d33c;hb=57ba1e9023b0f1f3499cc888f66827a81574bb41;hpb=c853dcceece609d6cfed2cec1acd31af5fc4ab34 diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index b0a90181d1..eec3f9bf36 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -28,6 +28,7 @@ use strict; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "/opt/pakfire/lib/functions.pl"; my %cgiparams=(); my %pppsettings=(); @@ -38,6 +39,7 @@ my $warnmessage = ''; my $refresh = ""; my $ipaddr=''; + &Header::showhttpheaders(); $cgiparams{'ACTION'} = ''; @@ -56,6 +58,7 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); + if ( -e "/var/ipfire/main/gpl-accepted" ) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = ""; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -63,6 +66,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $La } elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { $refresh = ""; } +} if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) { @@ -127,8 +131,13 @@ my $dialButtonDisabled = "disabled='disabled'"; &Header::openpage($Lang::tr{'main page'}, 1, $refresh); &Header::openbigbox('', 'center'); -&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); +# licence agreement +if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { + system('touch /var/ipfire/main/gpl_accepted') +} +if ( -e "/var/ipfire/main/gpl_accepted" ) { +&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { @@ -166,55 +175,71 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) { } if ($death == 0 && $rebirth == 0) { - -if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) { - print < - - - - - - - - - -
$Lang::tr{'reboot sure'}
- + +if ($mainsettings{'REBOOTQUESTION'} eq "off") { +print < + + + + + + +
+ END ; -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) { - print < - - - - - - - - - -
$Lang::tr{'shutdown sure'}
- +} else { + if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) { +print < + + + + + + + + + +
$Lang::tr{'reboot sure'}
+ END ; -} else { + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) { print < - - - - - - -
- +
+ + + + + + + + + +
$Lang::tr{'shutdown sure'}
+
END ; + } else { +print < + + + + + + +
+ +END +; + } } print <
$Lang::tr{'network'} @@ -297,9 +322,9 @@ END END if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { - print "Proxy an"; + print $Lang::tr{'advproxy on'}; if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; } - } else { print "Proxy aus"; } + } else { print $Lang::tr{'advproxy off'}; } } if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}
@@ -307,9 +332,9 @@ END 		END if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) { - print "Proxy an"; + print $Lang::tr{'advproxy on'}; if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; } - } else { print "Proxy aus"; } + } else { print $Lang::tr{'advproxy off'}; } } if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}
@@ -320,7 +345,7 @@ 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 @status = `/usr/local/bin/ipsecctrl I`; my %confighash = (); &General::readhasharray("${General::swroot}/vpn/config", \%confighash); print < 90) { # Diskspace usage warning my @temp=(); my $temp2=(); -my @df = `/bin/df -B M -x rootfs`; +my @df = `/bin/df -B M -P -x rootfs`; foreach my $line (@df) { next if $line =~ m/^Filesystem/; if ($line =~ m/root/ ) { @@ -386,7 +418,7 @@ foreach my $line (@df) { if ($1<5) { # available:plain value in MB, and not %used as 10% is too much to waste on small disk # and root size should not vary during time - $warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] $Lang::tr{'free'}=$1M !\n"; + $warnmessage .= "
  • $Lang::tr{'filesystem full'}: $temp[0] $Lang::tr{'free'}=$1M !
    • \n"; } } else { @@ -395,18 +427,35 @@ foreach my $line (@df) { if ($1>90) { @temp = split(/ /,$line); $temp2=int(100-$1); - $warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] $Lang::tr{'free'}=$temp2% !\n"; + $warnmessage .= "
  • $Lang::tr{'filesystem full'}: $temp[0] $Lang::tr{'free'}=$temp2% !
    • \n"; } } } +# S.M.A.R.T. health warning +my @files = `/bin/ls /var/run/smartctl_out_hddtemp-* 2>/dev/null`; +foreach my $file (@files) { + chomp ($file); + my $disk=`echo $file | cut -d"-" -f2`; + chomp ($disk); + if (`/bin/grep "SAVE ALL DATA" $file`) { + $warnmessage .= "
  • $Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !
    • \n\n"; + } +} + if ($warnmessage) { print "
    $warnmessage
    "; } print < - END +; +&Pakfire::dblist("upgrade", "notice"); +print <
    $Lang::tr{'needreboot'}!"; +} } else { my $message=''; if ($death) { @@ -430,5 +479,37 @@ END } &Header::closebox(); +} + +else { +&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'}); +print <
    +END +; +if ( -e "/usr/share/doc/licenses/GPLv3" ) { + print ''; +} +else { + print '
    GNU GENERAL PUBLIC LICENSE
    '; +} +print < +
    + $Lang::tr{'gpl i accept these terms and conditions'}. +
    + +
    +

    + $Lang::tr{'gpl unofficial translation of the general public license v3'} + +END + +&Header::closebox(); +} + &Header::closebigbox(); &Header::closepage();