]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/index.cgi
projects / people / pmueller / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
core update: add last webif changes.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / index.cgi
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
old mode 100644 (file)
new mode 100755 (executable)
index f227a17..052e8ca
--- 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'} = '';
@@ -56,9 +58,15 @@ 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 ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
        $refresh = "<meta http-equiv='refresh' content='300;'>";
-} elsif ($connstate =~ /$Lang::tr{'connecting'}/) {
+} 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;'>";
@@ -166,26 +174,77 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
 }
 
 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 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 of networks -->
 <table border='0' width=80%>
   <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
        <th bgcolor='$color{'color20'}'>IP
        <th bgcolor='$color{'color20'}'>$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>
+  <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
@@ -257,27 +316,27 @@ 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>
+               <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>
+               <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>
+               <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
@@ -285,11 +344,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 <<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>
+               <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
@@ -299,9 +358,9 @@ END
                        if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
 
                        if ($id % 2) {
-          print "<tr><td align='center'>&nbsp;</td><td align='center' nowrap='nowrap' bgcolor='$color{'color20'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
+          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><td align='center'>&nbsp;</td><td align='center' nowrap='nowrap' bgcolor='$color{'color22'}'>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
+          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>";
                        }
                        
                        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>";
@@ -322,7 +381,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 <<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>
+               <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
@@ -351,7 +410,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 {
@@ -360,18 +419,36 @@ 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 /><font color='red'>$Lang::tr{'needreboot'}!</font>";
+}
 } else {
        my $message='';
        if ($death) {
@@ -391,7 +468,9 @@ END
 </div>
 END
 ;
-}
+
+} 
+
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
Peter's tree of IPFire 2.x