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 a1b0369..052e8ca
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -39,6 +39,7 @@ my $warnmessage = '';
 my $refresh = "";
 my $ipaddr='';
 
+
 &Header::showhttpheaders();
 
 $cgiparams{'ACTION'} = '';
@@ -57,6 +58,12 @@ 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'}/ || /$Lang::tr{'connection closed'}/ ){
@@ -314,9 +321,9 @@ END
                <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 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>
@@ -324,9 +331,9 @@ END
                <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 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>
@@ -337,7 +344,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 <<END;
@@ -428,6 +435,7 @@ foreach my $file (@files) {
        }
 }
 
+
 if ($warnmessage) {
        print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
@@ -437,8 +445,10 @@ 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) {