X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=0ef95ba8ca26c83d6f203736793b3ee7c3b17af5;hp=2ae0ecf4ceae6d0c68717d5daa43f709ab027a99;hb=44f8687ba29b06b012a01c36abe51ffdba27287d;hpb=c1712013f4f9585359c562d8032d32c5c526db87 diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 2ae0ecf4c..0ef95ba8c 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 # @@ -39,6 +39,7 @@ my $warnmessage = ''; my $refresh = ""; my $ipaddr=''; + &Header::showhttpheaders(); $cgiparams{'ACTION'} = ''; @@ -57,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'}/ ){ @@ -64,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'}) { @@ -128,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)$/ )) { @@ -314,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'}
@@ -324,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'}
@@ -337,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 <OpenVPN n2n
+ $n2novpnet[0] + $confighash{$dkey}[6] +END +} +} + } + +# Fireinfo +if ( ! -e "/var/ipfire/main/send_profile") { + $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
    • "; +} + # Memory usage warning my @free = `/usr/bin/free`; $free[1] =~ m/(\d+)/; @@ -394,7 +428,7 @@ if ($used / $mem > 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/ ) { @@ -403,7 +437,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 { @@ -412,19 +446,19 @@ 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-*`; +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'} $disk $Lang::tr{'smartwarn2'}
    \n"; + $warnmessage .= "
  • $Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !
    • \n\n"; } } @@ -437,8 +471,10 @@ END ; &Pakfire::dblist("upgrade", "notice"); print <
    $Lang::tr{'needreboot'}!"; +} } else { my $message=''; if ($death) { @@ -462,5 +498,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();