]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/index.cgi
Fixed index.cgi - perl is not my language.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / index.cgi
index f9cf5c3b084d2a27bf88c9afcec101b0c1e3fc41..cd1c0c200eef6825314cba179c289a5045646022 100644 (file)
@@ -1,21 +1,34 @@
 #!/usr/bin/perl
-#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The SmoothWall Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 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=();
@@ -23,9 +36,10 @@ my %modemsettings=();
 my %netsettings=();
 my %ddnssettings=();
 my $warnmessage = '';
-my $refresh = '';
+my $refresh = "";
 my $ipaddr='';
 
+
 &Header::showhttpheaders();
 
 $cgiparams{'ACTION'} = '';
@@ -37,13 +51,71 @@ $pppsettings{'PROFILENAME'} = 'None';
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/ddns/settings", \%ddnssettings);
 
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%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 = "<meta http-equiv='refresh' content='30;'>";
-} 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 = "<meta http-equiv='refresh' content='300;'>";
+} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
        $refresh = "<meta http-equiv='refresh' content='5;'>";
+} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
+       $refresh = "<meta http-equiv='refresh' content='30;'>";
 }
 
+if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
+{
+       my $profile = $cgiparams{'PROFILE'};
+       my %tempcgiparams = ();
+       $tempcgiparams{'PROFILE'} = '';
+       &General::readhash("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
+               \%tempcgiparams);
+
+       # make a link from the selected profile to the "default" one.
+       unlink("${General::swroot}/ppp/settings");
+       link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
+               "${General::swroot}/ppp/settings");
+       system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
+
+       # read in the new params "early" so we can write secrets.
+       %cgiparams = ();
+       &General::readhash("${General::swroot}/ppp/settings", \%cgiparams);
+       $cgiparams{'PROFILE'} = $profile;
+       $cgiparams{'BACKUPPROFILE'} = $profile;
+       &General::writehash("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
+               \%cgiparams);
+
+       # write secrets file.
+       open(FILE, ">/${General::swroot}/ppp/secrets") or die "Unable to write secrets file.";
+       flock(FILE, 2);
+       my $username = $cgiparams{'USERNAME'};
+       my $password = $cgiparams{'PASSWORD'};
+       print FILE "'$username' * '$password'\n";
+       chmod 0600, "${General::swroot}/ppp/secrets";
+       close FILE;
+
+       &General::log("$Lang::tr{'profile made current'} $tempcgiparams{'PROFILENAME'}"); 
+       $cgiparams{'ACTION'} = "$Lang::tr{'dial'}";
+}
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) {
+       system('/usr/local/bin/redctrl start > /dev/null') == 0
+       or &General::log("Dial failed: $?"); sleep 1;}
+elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) {
+       system('/usr/local/bin/redctrl stop > /dev/null') == 0
+       or &General::log("Hangup failed: $?"); sleep 1;}
+
 my $c;
 my $maxprofiles = 5;
 my @profilenames = ();
@@ -65,9 +137,16 @@ my $dialButtonDisabled = "disabled='disabled'";
 
 &Header::openpage($Lang::tr{'main page'}, 1, $refresh);
 &Header::openbigbox('', 'center');
+
+# 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'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
+
+if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
        if (open(IPADDR,"${General::swroot}/ddns/ipcache")) {
            $ipaddr = <IPADDR>;
            close IPADDR;
@@ -84,31 +163,103 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || (
        print "$Lang::tr{'profile has errors'}\n </b></font>\n";
 }
 
-if ( $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) {
-       $ipaddr = $netsettings{'RED_ADDRESS'};
+#if ( $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) {
+#      $ipaddr = $netsettings{'RED_ADDRESS'};
+#}
+
+my $death = 0;
+my $rebirth = 0;
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
+       $death = 1;
+       &General::log($Lang::tr{'shutting down ipfire'});
+       system '/usr/local/bin/ipfirereboot down';
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
+       $rebirth = 1;
+       &General::log($Lang::tr{'rebooting ipfire'});
+       system '/usr/local/bin/ipfirereboot boot';
 }
 
+if ($death == 0 && $rebirth == 0) {
+       
+if ($mainsettings{'REBOOTQUESTION'} eq "off") {        
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='100%'>
+       <tr>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
+       </tr>
+       </table>
+       </form>
+END
+;
+} else {               
+       if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='100%'>
+         <tr>
+           <td colspan="3" align='left'><font color="red">$Lang::tr{'reboot sure'}</font></td>
+           </tr>
+         <tr>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+       </tr>
+       </table>
+       </form>
+END
+;
+       } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='100%'>
+         <tr>
+           <td colspan="3" align='right'><font color="red">$Lang::tr{'shutdown sure'}</font></td>
+           </tr>
+         <tr>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+               <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
+       </tr>
+       </table>
+       </form>
+END
+;
+       } else {
+print <<END
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <table width='100%'>
+               <tr>
+                       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+                       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+                       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+               </tr>
+               </table>
+               </form>
+END
+;
+       }
+}
 print <<END;
-<table border='0'>
-<tr>
-       <td align='center'><form method='post' action="$ENV{'SCRIPT_NAME'}">
-               <input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' />
-       </form></td>
-</tr></table>
+
 
 <!-- Table of networks -->
 <table border='0' width=80%>
-  <tr> <th bgcolor='lightgrey'>$Lang::tr{'network'}
-       <th bgcolor='lightgrey'>IP
-       <th bgcolor='lightgrey'>$Lang::tr{'status'}
-  <tr> <td bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}:</b></font></a><br>
-       <td width='30%'>$ipaddr 
-       <td width='45%'>$connstate
+  <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
+       <th bgcolor='$color{'color20'}'>IP
+       <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
+  <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br>
+       <td width='30%' align='center'>$ipaddr 
+       <td width='45%' align='center'>$connstate
 END
+if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
 print `/usr/local/bin/dialctrl.pl show`;
 print <<END;
        <tr><td colspan='2'>
-               <form method='post' action='/cgi-bin/dial.cgi'>$Lang::tr{'profile'}:
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
                        <select name='PROFILE'>
 END
        for ($c = 1; $c <= $maxprofiles; $c++)
@@ -119,7 +270,7 @@ END
                }
        }
        $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active");
-       if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
+       if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
                print <<END;
                                </select>
                                <input type='submit' name='ACTION' value='$Lang::tr{'dial profile'}' $dialButtonDisabled />
@@ -127,10 +278,10 @@ END
                        <td align='center'>
                                <table width='100%' border='0'>
                                        <tr>
-                                       <td width='50%' align='right'>  <form method='post' action='/cgi-bin/dial.cgi'>
+                                       <td width='50%' align='right'>  <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                        <input type='submit' name='ACTION' value='$Lang::tr{'dial'}'>
                                                                                </form>
-                                       <td width='50%' align='left'>   <form method='post' action='/cgi-bin/dial.cgi'>
+                                       <td width='50%' align='left'>   <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                        <input type='submit' name='ACTION' value='$Lang::tr{'hangup'}'>
                                                                                </form>
                                </table>
@@ -138,11 +289,11 @@ END
        } else {
        print "$Lang::tr{'profile has errors'}\n </b></font>\n";
        }
-
+}
        my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
        if ( "$HOSTNAME" ne "" ) {
                print <<END;
-       <tr><td><b>Hostname:</b><td>$HOSTNAME<td>&nbsp;
+       <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME<td>&nbsp;
 END
        }
 
@@ -150,7 +301,7 @@ END
                my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`;
                chomp($GATEWAY);
                print <<END;
-       <tr><td><b>Gateway:</b><td>$GATEWAY<td>&nbsp;
+       <tr><td><b>Gateway:</b><td align='center'>$GATEWAY<td>&nbsp;
 END
        }
 
@@ -160,11 +311,11 @@ END
        chomp($DNS1);
 
        if ( $DNS1 ) { print <<END;
-       <tr><td><b>DNS-Server:</b><td>$DNS1
+       <tr><td><b>DNS-Server:</b><td align='center'>$DNS1
 END
        }
        if ( $DNS2 ) { print <<END;
-       <td>$DNS2
+       <td align='center'>$DNS2
 END
        } else { print <<END;
        <td>&nbsp;
@@ -172,41 +323,41 @@ END
        }
 
        if ( $netsettings{'GREEN_DEV'} ) { print <<END;
-               <tr><td bgcolor='$Header::colourgreen' width='25%'><a href="/cgi-bin/dhcp.cgi"><font size='2' color='white'><b>$Lang::tr{'lan'}:</b></font></a>
-               <td width='30%'>$netsettings{'GREEN_ADDRESS'}
-               <td width='45%'>
+               <tr><td align='center' bgcolor='$Header::colourgreen' width='25%'><a href="/cgi-bin/dhcp.cgi"><font size='2' color='white'><b>$Lang::tr{'lan'}</b></font></a>
+               <td width='30%' align='center'>$netsettings{'GREEN_ADDRESS'}
+               <td width='45%' align='center'>
 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 <<END;
-               <tr><td bgcolor='$Header::colourblue' width='25%'><a href="/cgi-bin/wireless.cgi"><font size='2' color='white'><b>$Lang::tr{'wireless'}:</b></font></a><br>
-               <td width='30%'>$netsettings{'BLUE_ADDRESS'}
-               <td width='45%'>
+               <tr><td align='center' bgcolor='$Header::colourblue' width='25%'><a href="/cgi-bin/wireless.cgi"><font size='2' color='white'><b>$Lang::tr{'wireless'}</b></font></a><br>
+               <td width='30%' align='center'>$netsettings{'BLUE_ADDRESS'}
+               <td width='45%' align='center'>
 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 <<END;
-               <tr><td bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}:</b></font></a><br>
-               <td width='30%'>$netsettings{'ORANGE_ADDRESS'}
-               <td width='45%'><font color=$Header::colourgreen>Online</font>
+               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
+               <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
+               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 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 <<END;
-               <tr><td bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'vpn'}:</b></font></a><br>
-               <td width='30%'>$ipsecip
-               <td width='45%'><font color=$Header::colourgreen>Online</font>
+               <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'vpn'}</b></font></a><br>
+               <td width='30%' align='center'>$ipsecip
+               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
                my $id = 0;
                my $gif;
@@ -214,18 +365,18 @@ END
                        if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
 
                        if ($id % 2) {
-                           print "<tr bgcolor='${Header::table1colour}'>\n";
+          print "<tr><td align='left' nowrap='nowrap' bgcolor='$color{'color20'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center'>$confighash{$key}[11]</td>";
                        } else {
-                           print "<tr bgcolor='${Header::table2colour}'>\n";
+          print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center'>$confighash{$key}[11]</td>";
                        }
-                       print "<td bgcolor='#ffffff'>&nbsp;</td><td align='center' nowrap='nowrap'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
+                       
                        my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
                        if ($confighash{$key}[0] eq 'off') {
                            $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
                        } else {
                            foreach my $line (@status) {
                                if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
-                                   $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsinactive'}</font></b></td></tr></table>";
+                                   $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                                }
                           }
                        }
@@ -237,9 +388,9 @@ 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 <<END;
-               <tr><td bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN:</b></font></a><br>
-               <td width='30%'>$ovpnip
-               <td width='45%'><font color=$Header::colourgreen>Online</font>
+               <tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
+               <td width='30%' align='center'>$ovpnip
+               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
        }
 
@@ -266,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] <b>$Lang::tr{'free'}=$1M</b> !\n";
+                       $warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>\n";
                }
                
        } else {
@@ -275,21 +426,90 @@ foreach my $line (@df) {
                if ($1>90) {
                        @temp = split(/ /,$line);
                        $temp2=int(100-$1);
-                       $warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !\n";
+                       $warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !</li>\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 .= "<li> $Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !</li>\n\n";
+       }
+}
+
+
 if ($warnmessage) {
        print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
 print <<END;
 </table>
+END
+;
+&Pakfire::dblist("upgrade", "notice");
+print <<END;
+END
+if ($reboot == 1) {
+       print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
+}
+} else {
+       my $message='';
+       if ($death) {
+               $message = $Lang::tr{'ipfire has now shutdown'};
+       } else {
+               $message = $Lang::tr{'ipfire has now rebooted'};
+       }
+       print <<END
+<div align='center'>
+<table width='100%' bgcolor='#ffffff'>
+<tr><td align='center'>
+<br /><br /><img src='/images/IPFire.png' /><br /><br /><br />
+</td></tr>
+</table>
+<br />
+<font size='6'>$message</font>
+</div>
+END
+;
+
+} 
+
+&Header::closebox();
+}
+
+else {
+&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
+print <<END;
+       $Lang::tr{'gpl please read carefully the general public license and accept it below'}.
+       <br /><br />
+END
+;      
+if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
+       print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
+       print `cat /usr/share/doc/licenses/GPLv3`;
+       print '</textarea>';
+}
+else {
+       print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
+}
+print <<END;
+       <p>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
+                       <br/ >
+                       <input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+               </form>
+       </p>
+       <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
 
 END
 
 &Header::closebox();
+}
 
 &Header::closebigbox();
-
 &Header::closepage();