X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=cd1c0c200eef6825314cba179c289a5045646022;hp=28bd09c88b4b49833a1bccf166641bd1c3edff86;hb=922092717b57a984732ecb8a2ad595dccadcf81b;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 28bd09c88b..cd1c0c200e 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -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'} = '';
@@ -55,10 +57,21 @@ my %mainsettings = ();
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my $connstate = &Header::connectionstatus();
-if ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
- $refresh = "";
-} elsif ($connstate =~ /$Lang::tr{'connecting'}/) {
+
+# check if reboot is necessary
+my $reboot = 0;
+if (`find /var/run/need_reboot 2>/dev/null`) {
+ $reboot = 1;
+}
+
+
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
+ $refresh = "";
+} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
$refresh = "";
+} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
+ $refresh = "";
}
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
@@ -124,8 +137,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 (`find /var/ipfire/main/gpl_accepted 2>/dev/null`) {
+&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)$/ )) {
@@ -163,26 +181,77 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
}
if ($death == 0 && $rebirth == 0) {
-
+
+if ($mainsettings{'REBOOTQUESTION'} eq "off") {
print <
-
+
END
;
+} else {
+ if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
+print <
+
+
+END
+;
+ } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
+print <
+
+
+END
+;
+ } else {
+print <
+
+
+END
+;
+ }
+}
print <
$Lang::tr{'network'}
| IP
| $Lang::tr{'status'}
- |
$Lang::tr{'internet'}:
+ |
$Lang::tr{'internet'}
| $ipaddr
| $connstate
END
@@ -254,27 +323,27 @@ END
}
if ( $netsettings{'GREEN_DEV'} ) { print <$Lang::tr{'lan'}:
+ | $Lang::tr{'lan'}
| $netsettings{'GREEN_ADDRESS'}
|
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'}:
+ | $Lang::tr{'wireless'}
| $netsettings{'BLUE_ADDRESS'}
|
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'}:
+ | $Lang::tr{'dmz'}
| $netsettings{'ORANGE_ADDRESS'}
| Online
END
@@ -282,11 +351,11 @@ 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 <$Lang::tr{'vpn'}:
+ | $Lang::tr{'vpn'}
| $ipsecip
| Online
END
@@ -296,9 +365,9 @@ END
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
- print " | | $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | ";
+ print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
} else {
- print " | $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | ";
+ print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
}
my $active = "";
@@ -319,7 +388,7 @@ END
`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
@@ -348,7 +417,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 {
@@ -357,18 +426,36 @@ 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-*`;
+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) {
@@ -388,7 +475,41 @@ END
END
;
+
+}
+
+&Header::closebox();
+}
+
+else {
+&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
+print <
+END
+;
+if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
+ print '';
+}
+else {
+ print '
GNU GENERAL PUBLIC LICENSE
';
}
+print <
+
+
+ $Lang::tr{'gpl unofficial translation of the general public license v3'}
+
+END
+
&Header::closebox();
+}
+
&Header::closebigbox();
&Header::closepage();