]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/index.cgi
DNS: Show DNSSEC status on index page if deavtivated
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / index.cgi
index 6919c8cf5d3dd882afa076236f79abcf3ff1a8ee..7c1746259d34bf653f86bd0033d801bfe3d09e09 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -21,6 +21,7 @@
 
 use strict;
 use Net::Telnet;
+use Sort::Naturally;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -36,10 +37,22 @@ my %pppsettings=();
 my %modemsettings=();
 my %netsettings=();
 my %ddnssettings=();
+my %proxysettings=();
+my %vpnsettings=();
+my %vpnconfig=();
+my %ovpnconfig=();
 my $warnmessage = '';
 my $refresh = "";
 my $ipaddr='';
-
+my $showbox=0;
+my $showipsec=0;
+my $showovpn=0;
+
+if ( ! -e "/var/ipfire/main/gpl_accepted" ) {
+       print "Status: 302 Moved Temporarily\n";
+       print "Location: gpl.cgi\n\n";
+       exit (0);
+}
 
 &Header::showhttpheaders();
 
@@ -51,6 +64,8 @@ $pppsettings{'PROFILENAME'} = 'None';
 &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/ddns/settings", \%ddnssettings);
+&General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
+&General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
 
 my %color = ();
 my %mainsettings = ();
@@ -59,14 +74,12 @@ my %mainsettings = ();
 
 my $connstate = &Header::connectionstatus();
 
-       if ( -e "/var/ipfire/main/gpl-accepted" ) {
-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 ( -e "/var/ipfire/main/gpl-accepted" ) {
+       if ($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'})
@@ -81,8 +94,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
        unlink("${General::swroot}/ppp/settings");
        link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
                "${General::swroot}/ppp/settings");
-       system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
-
+       open (TMP, ">${General::swroot}/ppp/updatesettings");
+       close TMP;
        # read in the new params "early" so we can write secrets.
        %cgiparams = ();
        &General::readhash("${General::swroot}/ppp/settings", \%cgiparams);
@@ -106,10 +119,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
 
 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'}) {
+       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;}
+       or &General::log("Hangup failed: $?"); sleep 1;
+}
 
 my $c;
 my $maxprofiles = 5;
@@ -129,18 +143,15 @@ for ($c = 1; $c <= $maxprofiles; $c++) {
 $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'";
 my $dialButtonDisabled = "disabled='disabled'";
 
-
 &Header::openpage($Lang::tr{'main page'}, 1, $refresh);
 &Header::openbigbox('', 'center');
+if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
+           $ipaddr = <IPADDR>;
+           close IPADDR;
+           chomp ($ipaddr);
+       }
 
-# 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"));
-
-
+&Header::openbox('100%', 'center', '');
 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>;
@@ -158,289 +169,340 @@ 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'};
-#}
-
-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>
+print <<END;
+<!-- Table of networks -->
+<table class='tbl' style='width:80%;'>
+  <tr>
+        <th style='background-color:$color{'color20'};'>$Lang::tr{'network'}</th>
+        <th style='background-color:$color{'color20'};'>$Lang::tr{'ip address'}</th>
+        <th style='background-color:$color{'color20'};'>$Lang::tr{'status'}</th>
+  </tr>
+  <tr>
+        <td style='width:25%; text-align:center; background-color:$Header::colourred;'><a href='/cgi-bin/pppsetup.cgi' style='color:white;'><b>$Lang::tr{'internet'}</b></a><br/></td>
+        <td style='width:30%; text-align:center;'>$ipaddr </td>
+        <td style='width:45%; text-align:center;'>$connstate </td>
+  </tr>
 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>
+       my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
+       if ( "$HOSTNAME" ne "" ) {
+               print <<END;
+       <tr><td><b>$Lang::tr{'hostname'}:</b><td style='text-align:center;'>$HOSTNAME</td><td></td>
 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>
+       }
+
+       if ( -e "${General::swroot}/red/remote-ipaddress" ) {
+               open (TMP, "<${General::swroot}/red/remote-ipaddress");
+               my $GATEWAY = <TMP>;
+               chomp($GATEWAY);
+               close TMP;
+               print <<END;
+       <tr><td><b>$Lang::tr{'gateway'}:</b><td style='text-align:center;'>$GATEWAY</td><td></td></tr>
 END
-;
-       } else {
-print <<END
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='100%'>
+       }
+
+       my $dns_servers;
+       if ( -e "${General::swroot}/red/dns" ) {
+               open (TMP, "<${General::swroot}/red/dns");
+               $dns_servers = <TMP>;
+               chomp($dns_servers);
+               close TMP;
+       }
+       print <<END;
                <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>
+                       <td>
+                               <b>$Lang::tr{'dns servers'}:</b>
+                       </td>
+                       <td style='text-align:center;'>
+                               $dns_servers
+                       </td>
+                       <td></td>
                </tr>
-               </table>
-               </form>
+       </table>
 END
-;
-       }
-}
-print <<END;
 
-
-
-<!-- Table of networks -->
-<table border='0' width=80%>
-  <tr>  <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
-        <th bgcolor='$color{'color20'}'>IP</th>
-        <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
-  <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>
-        <td width='30%' align='center'>$ipaddr </td>
-        <td width='45%' align='center'>$connstate 
-END
+#Dial profiles
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
-print `/usr/local/bin/dialctrl.pl show`;
-print <<END;
-        </td></tr>
-        <tr><td colspan='2'>
-
+       if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
+               print <<END;
+               <br/>
+               <table style='width:80%;'>
+               <tr><td>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
                        <select name='PROFILE'>
 END
-       for ($c = 1; $c <= $maxprofiles; $c++)
-       {
-               if ($profilenames[$c] ne '') {
-                       $dialButtonDisabled = "";
-                       print "\t<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
+               for ($c = 1; $c <= $maxprofiles; $c++)
+               {
+                       if ($profilenames[$c] ne '') {
+                               $dialButtonDisabled = "";
+                               print "<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>";
+                       }
                }
-       }
-       $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active");
-       if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
+               $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active");
                print <<END;
-                               </select>
-                               <input type='submit' name='ACTION' value='$Lang::tr{'dial profile'}' $dialButtonDisabled />
-                       </form>
-                       <td align='center'>
-                               <table width='100%' border='0'>
-                                       <tr>
-                                       <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='$ENV{'SCRIPT_NAME'}'>
-                                                                                       <input type='submit' name='ACTION' value='$Lang::tr{'hangup'}'>
-                                                                               </form>
-                               </table>
+                       </select>
+                       <input type='submit' name='ACTION' value='$Lang::tr{'dial profile'}' $dialButtonDisabled />
+               </form>
+               </td>
+               <td style='text-align:center;'>
+                       <table style='width:100%;'>
+                               <tr>
+                               <td style='width=50%; text-align:right;'>
+                                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'dial'}'>
+                                       </form>
+                               </td>
+                               <td style='width=50%; text-align:left;'>
+                                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='submit' name='ACTION' value='$Lang::tr{'hangup'}'>
+                                       </form>
+                               </td>
+                               </tr>
+                       </table>
+               </td>
+               </tr>
+               </table>
 END
        } else {
-       print "$Lang::tr{'profile has errors'}\n </b></font>\n";
+               print "<br/><span style='color:red;'>$Lang::tr{'profile has errors'}</span><br/>";
        }
 }
-       my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
-       if ( "$HOSTNAME" ne "" ) {
-               print <<END;
-       <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME<td>&nbsp;
+
+
+print <<END;
+<br/>
+<table class='tbl' style='width:80%;'>
+<tr>
+       <th>$Lang::tr{'network'}</th>
+       <th>$Lang::tr{'ip address'}</th>
+       <th>$Lang::tr{'status'}</th>
+</tr>
 END
-       }
 
-       if ( -e "/var/ipfire/red/remote-ipaddress" ) {
-               my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`;
-               chomp($GATEWAY);
+if ( $netsettings{'GREEN_DEV'} ) {
+               my $sub=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
                print <<END;
-       <tr><td><b>Gateway:</b><td align='center'>$GATEWAY<td>&nbsp;
+               <tr>
+                       <td style='width:25%; text-align:center; background-color:$Header::colourgreen;'>
+                               <a href='/cgi-bin/dhcp.cgi' style='color:white'><b>$Lang::tr{'lan'}</b></a>
+                       </td>
+                       <td style='width:30%; text-align:center;'>$netsettings{'GREEN_ADDRESS'}/$sub</td>
+                       <td style='width:45%; text-align:center;'>
 END
+               if ( $proxysettings{'ENABLE'} eq 'on' ) {
+                       print $Lang::tr{'advproxy on'};
+                       if ( $proxysettings{'TRANSPARENT'} eq 'on' ) { print " (transparent)"; }
+               }       else { print $Lang::tr{'advproxy off'};  }
+               print '</td>';
+               print '</tr>';
        }
-
-       my $DNS1 = `cat /var/ipfire/red/dns1`;
-       my $DNS2 = `cat /var/ipfire/red/dns2`;
-       chomp($DNS1);
-       chomp($DNS1);
-
-       if ( $DNS1 ) { print <<END;
-       <tr><td><b>DNS-Server:</b><td align='center'>$DNS1
+if (&Header::blue_used()) {
+               my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
+               print <<END;
+               <tr>
+                       <td style='width:25%; text-align:center; background-color:$Header::colourblue;'>
+                               <a href='/cgi-bin/wireless.cgi' style='color:white'><b>$Lang::tr{'wireless'}</b></a>
+                       </td>
+                       <td style='width:30%; text-align:center;'>$netsettings{'BLUE_ADDRESS'}/$sub
+                       <td style='width:45%; text-align:center;'>
 END
+               if ( $proxysettings{'ENABLE_BLUE'} eq 'on' ) {
+                       print $Lang::tr{'advproxy on'};
+                       if ( $proxysettings{'TRANSPARENT_BLUE'} eq 'on' ) { print " (transparent)"; }
+               }       else { print $Lang::tr{'advproxy off'};  }
+               print '</td>';
+               print '</tr>';
        }
-       if ( $DNS2 ) { print <<END;
-       <td align='center'>$DNS2
-END
-       } else { print <<END;
-       <td>&nbsp;
+if (&Header::orange_used()) {
+               my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
+               print <<END;
+               <tr>
+                       <td style='width:25%; text-align:center; background-color:$Header::colourorange;'>
+                               <a href='/cgi-bin/firewall.cgi' style='color:white'><b>$Lang::tr{'dmz'}</b></a>
+                       </td>
+                       <td style='width:30%; text-align:center;'>$netsettings{'ORANGE_ADDRESS'}/$sub</td>
+                       <td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
+               </tr>
 END
        }
+#check if IPSEC is running
+if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
+       my $ipsecip = $vpnsettings{'VPN_IP'};
+print<<END;
+               <tr>
+                       <td style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
+                               <a href='/cgi-bin/vpnmain.cgi' style='color:white'><b>$Lang::tr{'ipsec'}</b></a>
+                       </td>
+                       <td style='width:30%; text-align:center;'>$ipsecip</td>
+                       <td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
+               </tr>
+END
+}
+
+#check if OpenVPN is running
+my %confighash=();
+&General::readhash("${General::swroot}/ovpn/settings", \%confighash);
 
-       if ( $netsettings{'GREEN_DEV'} ) { print <<END;
-               <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'>
+if (($confighash{'ENABLED'} eq "on") ||
+    ($confighash{'ENABLED_BLUE'} eq "on") ||
+    ($confighash{'ENABLED_ORANGE'} eq "on")) {
+       my ($ovpnip,$sub) = split("/",$confighash{'DOVPN_SUBNET'});
+       $sub=&General::iporsubtocidr($sub);
+       $ovpnip="$ovpnip/$sub";
+print <<END;
+       <tr>
+               <td style='width:25%; text-align:center; background-color:$Header::colourovpn;'>
+                       <a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a>
+               </td>
+               <td style='width:30%; text-align:center;'>$ovpnip</td>
+               <td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
+       </tr>
 END
-               if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { 
-                       print $Lang::tr{'advproxy on'}; 
-                       if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; }
-               }       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>
-               <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 $Lang::tr{'advproxy on'};  
-                       if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
-               }       else { print $Lang::tr{'advproxy off'};  }
+print"</table>";
+&Header::closebox();
+
+#Check if there are any vpns configured (ipsec and openvpn)
+&General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
+foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
+       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host'){
+               $showipsec=1;
+               $showbox=1;
+               last;
        }
-       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>
-               <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
-               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
-END
+}
+&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig);
+foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+       if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+               $showbox=1;
+               $showovpn=1;
+               last;
        }
-       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-`;
+}
+
+if ($showbox){
+# Start of Box wich contains all vpn connections
+       &Header::openbox('100%', 'center', $Lang::tr{'vpn'});
+
+       #show ipsec connectiontable
+       if ( $showipsec ) {
+               my $ipsecip = $vpnsettings{'VPN_IP'};
                my @status = `/usr/local/bin/ipsecctrl I`;
                my %confighash = ();
-               &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
-               print <<END;
-               <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;
-               foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
-                       if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
-
-                       if ($id % 2) {
-          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><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>";
-                       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/) ||
-                                   ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
-                                   {
-                                   $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>";
+               my $col="";
+               my $count=0;
+               print <<END;
+               <table class='tbl' style='width:80%;'>
+               <tr>
+                       <th style='width:40%;'>$Lang::tr{'ipsec network'}</th>
+                       <th style='width:30%;'>$Lang::tr{'ip address'}</th>
+                       <th style='width:30%;'>$Lang::tr{'status'}</th>
+               </tr>
+END
+               foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
+                       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
+                               $count++;
+                               my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
+                               $vpnsub=&General::iporsubtocidr($vpnsub);
+                               $vpnip="$vpnip/$vpnsub";
+                               if ($count % 2){
+                                       $col = $color{'color22'};
+                               }else{
+                                       $col = $color{'color20'};
                                }
-                          }
+                               print "<tr>";
+                               print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>";
+                               print "<td style='text-align:center; background-color:$col'>$vpnip</td>";
+
+                               my $activecolor = $Header::colourred;
+                               my $activestatus = $Lang::tr{'capsclosed'};
+                               if ($vpnconfig{$key}[0] eq 'off') {
+                                       $activecolor = $Header::colourblue;
+                                       $activestatus = $Lang::tr{'capsclosed'};
+                               } else {
+                                       foreach my $line (@status) {
+                                               if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
+                                                       $activecolor = $Header::colourgreen;
+                                                       $activestatus = $Lang::tr{'capsopen'};
+                                               } elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
+                                                       $activecolor = $Header::colourorange;
+                                                       $activestatus = $Lang::tr{'vpn on-demand'};
+                                               }
+                                       }
+                               }
+                               print "<td style='text-align:center; color:white; background-color:$activecolor;'><b>$activestatus</b></td>";
+                               print "</tr>";
                        }
-                       print "<td align='center'>$active</td>";
                }
+               print "</table>";
        }
-       if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` || 
-            `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` || 
-            `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\/\/'`;
+
+       # Check if there is any OpenVPN connection configured.
+       if ( $showovpn ){
                print <<END;
-               <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>
-       
+               <br/>
+               <table class='tbl' style='width:80%;'>
+               <tr>
+                       <th style='width:40%;'>$Lang::tr{'openvpn network'}</th>
+                       <th style='width:30%;'>$Lang::tr{'ip address'}</th>
+                       <th style='width:30%;'>$Lang::tr{'status'}</th>
 END
 
-       }
-
-###
-# Print the OpenVPN N2N connection status.
-###
-if ( -d "${General::swroot}/ovpn/n2nconf") {
-       my %confighash=();
-
-       &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
-       foreach my $dkey (keys %confighash) {
-               if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
-                       my $tport = $confighash{$dkey}[22];
-                       next if ($tport eq '');
-
-                       my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
-                       $tnet->open('127.0.0.1');
-                       my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
-                       my @tustate = split(/\,/, $output[1]);
-
-                       my $display;
-                       my $display_colour = $Header::colourred;
-                       if ( $tustate[1] eq 'CONNECTED') {
-                               $display_colour = $Header::colourgreen;
-                               $display = $Lang::tr{'capsopen'};
-                       } else {
-                               $display = $tustate[1];
-                       }
-                       print <<END;
-                       <tr>
-                               <td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'>
-                                       $confighash{$dkey}[1]
-                               </td>
-                               <td align='center'>
-                                       $confighash{$dkey}[11]
-                               </td>
-                               <td align='center' bgcolor='$display_colour'>
-                                       <b>
-                                               <font color='#FFFFFF'>
-                                                       $display
-                                               </font>
-                                       </b>
-                               </td>
-                       </tr>
+               # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
+               my $active;
+               my $count=0;
+               # Print the OpenVPN N2N connection status.
+               if ( -d "${General::swroot}/ovpn/n2nconf") {
+                       my $col="";
+                       foreach my $dkey (sort { ncmp ($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+                               if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+                                       $count++;
+                                       my $tport = $ovpnconfig{$dkey}[22];
+                                       next if ($tport eq '');
+                                       my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport);
+                                       $tnet->open('127.0.0.1');
+                                       my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+                                       my @tustate = split(/\,/, $output[1]);
+                                       my $display;
+                                       my $display_colour = $Header::colourred;
+                                       if ( $tustate[1] eq 'CONNECTED' || ($tustate[1] eq 'WAIT')) {
+                                               $display_colour = $Header::colourgreen;
+                                               $display = $Lang::tr{'capsopen'};
+                                       } else {
+                                               $display = $tustate[1];
+                                       }
+                                       if ($count %2){
+                                               $col = $color{'color22'};
+                                       }else{
+                                               $col = $color{'color20'};
+                                       }
+                                       $active='off';
+                                       #make cidr from ip
+                                       my ($vpnip,$vpnsub) = split("/",$ovpnconfig{$dkey}[11]);
+                                       my $vpnsub=&General::iporsubtocidr($vpnsub);
+                                       my $vpnip="$vpnip/$vpnsub";
+                                       print <<END;
+                                       <tr>
+                                               <td style='text-align:left; color:white; background-color:$Header::colourovpn;'>$ovpnconfig{$dkey}[1]</td>
+                                               <td style='text-align:center; background-color:$col'>$vpnip</td>
+                                               <td style='text-align:center; color:white; background-color:$display_colour' ><b>$display</b></td>
+                                       </tr>
 END
+                               }
+                       }
+               }
+               if ($active ne 'off'){
+                       print "<tr><td colspan='3' style='text-align:center;'>$Lang::tr{'ovpn no connections'}</td></tr>";
                }
+               print"</table>";
        }
+&Header::closebox();
+}
+
+my $dnssec_status = &General::dnssec_status();
+if ($dnssec_status eq "off") {
+       $warnmessage .= "<li>$Lang::tr{'dnssec disabled warning'}</li>";
 }
 
 # Fireinfo
@@ -456,7 +518,7 @@ $free[2] =~ m/(\d+)/;
 my $used = $1;
 my $pct = int 100 * ($mem - $used) / $mem;
 if ($used / $mem > 90) {
-       $warnmessage .= "<li> $Lang::tr{'high memory usage'}: $pct% !</li>\n";
+       $warnmessage .= "<li>$Lang::tr{'high memory usage'}: $pct% !</li>";
 }
 
 # Diskspace usage warning
@@ -471,7 +533,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 .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>\n";
+                       $warnmessage .= "<li>$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>";
                }
                
        } else {
@@ -480,7 +542,7 @@ foreach my $line (@df) {
                if ($1>90) {
                        @temp = split(/ /,$line);
                        $temp2=int(100-$1);
-                       $warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !</li>\n";
+                       $warnmessage .= "<li>$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !</li>";
                }
        }
 }
@@ -492,7 +554,7 @@ foreach my $file (@files) {
        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";
+               $warnmessage .= "<li>$Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !</li>";
        }
 }
 
@@ -500,77 +562,25 @@ foreach my $file (@files) {
 my @files = `mount | grep " reiser4 (" 2>/dev/null`;
 foreach my $disk (@files) {
        chomp ($disk);
-       $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
+       $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>";
 }
 
-
 if ($warnmessage) {
-       print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
+       &Header::openbox('100%','center', );
+       print "<table class='tbl' style='width:80%;'>";
+       print "<tr><th>$Lang::tr{'fwhost hint'}</th></tr>";
+       print "<tr><td style='color:white; background-color:$Header::colourred;'>$warnmessage</td></tr>";
+    print "</table>";
+       &Header::closebox();
 }
-print <<END;
-</table>
-END
-;
+
 &Pakfire::dblist("upgrade", "notice");
-print <<END;
-END
 if ( -e "/var/run/need_reboot" ) {
-       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 ( -e "/usr/share/doc/licenses/GPLv3" ) {
-       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();
+       print "<div style='text-align:center; color:red;'>";
+       print "<br/><br/>$Lang::tr{'needreboot'}!";
+       print "</div>";
 }
 
 &Header::closebigbox();
 &Header::closepage();
+