Merge remote-tracking branch 'amarx/INDEX' into next

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index cc00c665bcb94cf0e2805053270aa9c70b15d82d..81b6fa4e7451da736ba535e2f590e06a167ecab9 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -92,8 +92,8 @@ sub makegraphbox {
        print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
        print " - ";
        print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
-       print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
        print "</center>";
+       print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
 }
 
 # Generate the CPU Graph for the current period of time for values given by

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index c5ccae809e88bd9dc4a1c204621b4593c38ad449..2ce4030018cacfc89fbdaa992ecb52de88c05dec 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -358,7 +358,7 @@ if (($confighash{'ENABLED'} eq "on") ||
        $ovpnip="$ovpnip/$sub";
 print <<END;
        <tr>
-               <td style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
+               <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>
@@ -372,7 +372,7 @@ print"</table>";
 #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'){
+       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host'){
                $showipsec=1;
                $showbox=1;
                last;
@@ -409,7 +409,7 @@ if ($showbox){
                </tr>
 END
                foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
-                       if ($vpnconfig{$key}[0] eq 'on') {
+                       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
                                $count++;
                                my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
                                $vpnsub=&General::iporsubtocidr($vpnsub);
@@ -420,8 +420,8 @@ END
                                        $col = $color{'color20'};
                                }
                                print "<tr>";
-                               print "<td style='text-align:left; color:white; background-color:$Header::colourovpn;'>$vpnconfig{$key}[1]</td>";
-                               print "<td style='text-align:left; background-color:$col'>$vpnip</td>";
+                               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'};