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=052e8cac648da0dacce7efc3c46430c410f13646;hb=44f8687ba29b06b012a01c36abe51ffdba27287d;hpb=6b1c728d88728451a86bebb5011c89de47721d5c diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi old mode 100755 new mode 100644 index 052e8cac6..0ef95ba8c --- 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 # @@ -58,12 +58,7 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); -# check if reboot is necessary -my $reboot = 0; -if (`find /var/run/need_reboot 2>/dev/null`) { - $reboot = 1; -} - + 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'}/ ){ @@ -71,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'}) { @@ -135,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)$/ )) { @@ -368,7 +369,9 @@ END $active = "
$Lang::tr{'capsclosed'}
"; } else { foreach my $line (@status) { - if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) { + if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || + ($line =~/$confighash{$key}[1]\{.*INSTALLED/ )) + { $active = "
$Lang::tr{'capsopen'}
"; } } @@ -387,6 +390,30 @@ END END } +### +# m.a.d n2n +### + +if ( -d "${General::swroot}/ovpn/n2nconf") { +my %confighash=(); +&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); +foreach my $dkey (keys %confighash) { +if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') { +my @n2novpnet = split(/\//,$confighash{$dkey}[27]); + 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+)/; @@ -401,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/ ) { @@ -425,7 +452,7 @@ foreach my $line (@df) { } # 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`; @@ -435,7 +462,6 @@ foreach my $file (@files) { } } - if ($warnmessage) { print "$warnmessage"; } @@ -446,8 +472,8 @@ END &Pakfire::dblist("upgrade", "notice"); print <$Lang::tr{'needreboot'}!"; +if ( -e "/var/run/need_reboot" ) { + print "

    $Lang::tr{'needreboot'}!"; } } else { my $message=''; @@ -472,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();