Merge remote-tracking branch 'alfh/feature_html_validating' into next

diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi
index 8d6b19d4b0dff7a214de94b9c705610d35e74f78..09f6ea370dac1bbe7a4e42e0bc9ed5f2231d0bfb 100644 (file)
--- a/html/cgi-bin/aliases.cgi
+++ b/html/cgi-bin/aliases.cgi
@@ -241,16 +241,16 @@ my %checked =();     # Checkbox manipulations
 
 if ($errormessage) {
     &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-    print "<font class='base'>$errormessage&nbsp;</font>";
+    print "$errormessage&nbsp;";
     &Header::closebox();
 }
 unless (( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ ) && ($netsettings{'RED_TYPE'} eq 'STATIC'))
 {
     &Header::openbox('100%', 'left', $Lang::tr{'capswarning'});
     print <<END
-    <table width='100%'>
+    <table style='width:100%;'>
     <tr>
-    <td width='100%' class='boldbase' align='center'><font color='${Header::colourred}'><b>$Lang::tr{'aliases not active'}</b></font></td>
+    <td class='boldbase' style='color:${Header::colourred};'><b>$Lang::tr{'aliases not active'}</b></td>
     </tr>
     </table>
 END
@@ -275,23 +275,22 @@ if ($settings{'KEY1'} ne '') {
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <input type='hidden' name='KEY1' value='$settings{'KEY1'}' />
-<table width='100%'>
+<table style='width:100%;'>
 <tr>
-<td class='base'><font color='${Header::colourred}'>$Lang::tr{'name'}:&nbsp;<img src='/blob.gif' alt='*' /></font></td>
+<td class='base' style='color:${Header::colourred};'>$Lang::tr{'name'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 <td><input type='text' name='NAME' value='$settings{'NAME'}' size='32' /></td>
-<td class='base' align='right'><font color='${Header::colourred}'>$Lang::tr{'alias ip'}:&nbsp;</font></td>
+<td class='base' style='text-align:right; color:${Header::colourred};'>$Lang::tr{'alias ip'}:&nbsp;</td>
 <td><input type='text' name='IP' value='$settings{'IP'}' size='16' /></td>
-<td class='base' align='right'>$Lang::tr{'enabled'}&nbsp;</td>
+<td class='base' style='text-align:right;'>$Lang::tr{'enabled'}&nbsp;</td>
 <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
 </tr>
 </table>
 <br>
 <hr />
-<table width='100%'>
+<table style='width:100%;'>
 <tr>
-    <td class='base' width='55%'><img src='/blob.gif' align='top' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
-    <td width='40%' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
-    </td>
+    <td><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
+    <td style='text-align:right;'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td>
 </tr>
 </table>
 </form>
@@ -320,11 +319,11 @@ if ($netsettings{'SORT_ALIASES'} eq 'NAMERev') {
 #
 &Header::openbox('100%', 'left', $Lang::tr{'current aliases'});
 print <<END
-<table width='100%' class='tbl'>
+<table class='tbl' style='width:100%;'>
 <tr>
-    <th width='50%' align='center'><a href='$ENV{'SCRIPT_NAME'}?NAME'><b>$Lang::tr{'name'}</b></a> $sortarrow1</th>
-    <th width='45%' align='center'><a href='$ENV{'SCRIPT_NAME'}?IP'><b>$Lang::tr{'alias ip'}</b></a> $sortarrow2</th>
-    <th width='5%' colspan='3' class='boldbase' align='center'><b>$Lang::tr{'action'}</b></th>
+    <th style='width:55%; text-align:center;'><a href='$ENV{'SCRIPT_NAME'}?NAME'><b>$Lang::tr{'name'}</b></a> $sortarrow1</th>
+    <th style='width:45%; text-align:center;'><a href='$ENV{'SCRIPT_NAME'}?IP'><b>$Lang::tr{'alias ip'}</b></a> $sortarrow2</th>
+    <th colspan='3' class='boldbase' style='width:5%; text-align:center;'><b>$Lang::tr{'action'}</b></th>
 </tr>
 END
 ;
@@ -354,21 +353,19 @@ foreach my $line (@current) {
 
     #Colorize each line
     if ($settings{'KEY1'} eq $key) {
-       print "<tr>";
-       $col="bgcolor='${Header::colouryellow}'";
+        $col="background-color:${Header::colouryellow};";
     } elsif ($key % 2) {
-       print "<tr>";
-       $col="bgcolor='${Header::table2colour}'";
+        $col="background-color:${Header::table2colour};";
     } else {
-       print "<tr>";
-       $col="bgcolor='${Header::table1colour}'";
+        $col="background-color:${Header::table1colour};";
     }
+    print "<tr style='$col'>";
 
     print <<END
-<td align='center' $col>$temp[2]</td>
-<td align='center' $col>$temp[0]</td>
+<td style='text-align:center; $col'>$temp[2]</td>
+<td style='text-align:center; $col'>$temp[0]</td>
 
-<td align='center' $col>
+<td style='text-align:center; $col'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' />
 <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' />
@@ -376,7 +373,7 @@ foreach my $line (@current) {
 </form>
 </td>
 
-<td align='center' $col>
+<td style='text-align:center; $col'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
 <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
@@ -384,7 +381,7 @@ foreach my $line (@current) {
 </form>
 </td>
 
-<td align='center' $col>
+<td style='text-align:center; $col'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
 <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
@@ -514,3 +511,4 @@ sub BuildConfiguration {
     # Restart service associated with this
     system '/usr/local/bin/setaliases';
 }
+

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index d566cf7ebb29b98bcfdb8bdfe38ea7847eae678a..c7220f62d164b46dc2c63b34178cdc2e0df2f600 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -282,34 +282,34 @@ if (-e "${General::swroot}/ovpn/n2nconf") {
 
 # Print legend.
 print <<END;
-       <table width='100%'>
+       <table style='width:100%'>
                <tr>
-                       <td align='center'>
-                               <b>$Lang::tr{'legend'} : </b>
+                       <td style='text-align:center;'>
+                               <b>$Lang::tr{'legend'} :</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourgreen}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourgreen}; font-weight:bold;'>
+                               <b>$Lang::tr{'lan'}</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourred}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourred};'>
+                               <b>$Lang::tr{'internet'}</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourorange}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourorange};'>
+                               <b>$Lang::tr{'dmz'}</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourblue}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourblue};'>
+                               <b>$Lang::tr{'wireless'}</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourfw}'>
-                               <b><font color='#FFFFFF'>IPFire</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourfw};'>
+                               <b>IPFire</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourvpn}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourvpn};'>
+                               <b>$Lang::tr{'vpn'}</b>
                        </td>
-                       <td align='center' bgcolor='${Header::colourovpn}'>
-                               <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:${Header::colourovpn};'>
+                               <b>$Lang::tr{'OpenVPN'}</b>
                        </td>
-                       <td align='center' bgcolor='$colour_multicast'>
-                               <b><font color='#FFFFFF'>Multicast</font></b>
+                       <td style='text-align:center; color:#FFFFFF; background-color:$colour_multicast;'>
+                               <b>Multicast</b>
                        </td>
                </tr>
        </table>
@@ -345,60 +345,60 @@ END
 
 # Print table header.
 print <<END;
-       <table width='100%'>
-               <tr valign="top"">
-                       <th align='center'>
-                               <a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+       <table style='width:100%'>
+               <tr>
+                       <th style='text-align:center'>
+                               <a href="?sort_field=5&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=5&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
-                       <th align='center' colspan="2">
-                               <a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                       <th style='text-align:center' colspan='2'>
+                               <a href="?sort_field=1&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=1&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                               <a href="?sort_field=3&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=3&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
-                       <th align='center' colspan="2">
-                               <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                       <th style='text-align:center' colspan='2'>
+                               <a href="?sort_field=2&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=2&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                               <a href="?sort_field=4&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=4&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
-                       <th align='center'>
-                               <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                       <th style='text-align:center'>
+                               <a href="?sort_field=8&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=8&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                                &nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                               <a href="?sort_field=9&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=9&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
-                       <th align='center'>
-                               <a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                       <th style='text-align:center'>
+                               <a href="?sort_field=6&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=6&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
-                       <th align='center'>
-                               <a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
-                               <a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
+                       <th style='text-align:center'>
+                               <a href="?sort_field=7&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
+                               <a href="?sort_field=7&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
                        </th>
                </tr>
-               <tr valign="top"">
-                       <th align='center'>
+               <tr>
+                       <th style='text-align:center'>
                                $Lang::tr{'protocol'}
                        </th>
-                       <th align='center' colspan="2">
+                       <th style='text-align:center' colspan='2'>
                                $Lang::tr{'source ip and port'}
                        </th>
-                       <th align='center' colspan="2">
+                       <th style='text-align:center' colspan='2'>
                                $Lang::tr{'dest ip and port'}
                        </th>
-                       <th align='center'>
+                       <th style='text-align:center'>
                                $Lang::tr{'download'} /
                                <br>$Lang::tr{'upload'}
                        </th>
-                       <th align='center'>
+                       <th style='text-align:center'>
                                $Lang::tr{'connection'}<br>$Lang::tr{'status'}
                        </th>
-                       <th align='center'>
+                       <th style='text-align:center'>
                                $Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
                        </th>
                </tr>
@@ -523,17 +523,17 @@ foreach my $line (@conntrack) {
 
        my $sip_extra;
        if ($sip ne $sip_ret) {
-               $sip_extra = "<font color='#FFFFFF'>&gt;</font> ";
+               $sip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
-               $sip_extra .= " <font color='#FFFFFF'>$sip_ret</font>";
+               $sip_extra .= " <span style='color:#FFFFFF;'>$sip_ret</span>";
                $sip_extra .= "</a>";
        }
 
        my $dip_extra;
        if ($dip ne $dip_ret) {
-               $dip_extra = "<font color='#FFFFFF'>&gt;</font> ";
+               $dip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
-               $dip_extra .= " <font color='#FFFFFF'>$dip_ret</font>";
+               $dip_extra .= " <span style='color:#FFFFFF;'>$dip_ret</span>";
                $dip_extra .= "</a>";
        }
 
@@ -545,9 +545,9 @@ foreach my $line (@conntrack) {
                        $sserv_ret = uc(getservbyport($sport_ret, lc($l4proto)));
                }
 
-               $sport_extra = "<font color='#FFFFFF'>&gt;</font> ";
+               $sport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>";
-               $sport_extra .= " <font color='#FFFFFF'>$sport_ret</font>";
+               $sport_extra .= " <span style='color:#FFFFFF;'>$sport_ret</span>";
                $sport_extra .= "</a>";
        }
 
@@ -558,44 +558,44 @@ foreach my $line (@conntrack) {
                        $dserv_ret = uc(getservbyport($dport_ret, lc($l4proto)));
                }
 
-               $dport_extra = "<font color='#FFFFFF'>&gt;</font> ";
+               $dport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>";
-               $dport_extra .= " <font color='#FFFFFF'>$dport_ret</font>";
+               $dport_extra .= " <span style='color:#FFFFFF;'>$dport_ret</span>";
                $dport_extra .= "</a>";
        }
 
        print <<END;
        <tr>
-               <td align='center'>$l4proto</td>
-               <td align='center' bgcolor='$sip_colour'>
+               <td style='text-align:center'>$l4proto</td>
+               <td style='text-align:center; background-color:$sip_colour;'>
                        <a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
-                               <font color='#FFFFFF'>$sip</font>
+                               <span style='color:#FFFFFF;'>$sip</span>
                        </a>
                        $sip_extra
                </td>
-               <td align='center' bgcolor='$sip_colour'>
+               <td style='text-align:center; background-color:$sip_colour;'>
                        <a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'>
-                               <font color='#FFFFFF'>$sport</font>
+                               <span style='color:#FFFFFF;'>$sport</span>
                        </a>
                        $sport_extra
                </td>
-               <td align='center' bgcolor='$dip_colour'>
+               <td style='text-align:center; background-color:$dip_colour;'>
                        <a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
-                               <font color='#FFFFFF'>$dip</font>
+                               <span style='color:#FFFFFF;'>$dip</span>
                        </a>
                        $dip_extra
                </td>
-               <td align='center' bgcolor='$dip_colour'>
+               <td style='text-align:center; background-color:$dip_colour;'>
                        <a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'>
-                               <font color='#FFFFFF'>$dport</font>
+                               <span style='color:#FFFFFF;'>$dport</span>
                        </a>
                        $dport_extra
                </td>
-               <td align='center'>
+               <td style='text-align:center'>
                        $bytes_in / $bytes_out
                </td>
-               <td align='center'>$state</td>
-               <td align='center'>$ttl</td>
+               <td style='text-align:center'>$state</td>
+               <td style='text-align:center'>$ttl</td>
        </tr>
 END
 }

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 0b38237b6a3c6de732f4e0d4f0edc47274a68223..c5ccae809e88bd9dc4a1c204621b4593c38ad449 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -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        #
@@ -171,18 +171,22 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || (
 
 print <<END;
 <!-- Table of networks -->
-<table width=80% class='tbl' >
-  <tr>  <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
-        <th bgcolor='$color{'color20'}'>$Lang::tr{'ip address'}</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 </td></tr>
+<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
        my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
        if ( "$HOSTNAME" ne "" ) {
                print <<END;
-       <tr><td><b>$Lang::tr{'hostname'}:</b><td align='center'>$HOSTNAME</td><td></td>
+       <tr><td><b>$Lang::tr{'hostname'}:</b><td style='text-align:center;'>$HOSTNAME</td><td></td>
 END
        }
 
@@ -192,7 +196,7 @@ END
                chomp($GATEWAY);
                close TMP;
                print <<END;
-       <tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr>
+       <tr><td><b>$Lang::tr{'gateway'}:</b><td style='text-align:center;'>$GATEWAY</td><td></td></tr>
 END
        }
 
@@ -214,99 +218,131 @@ END
                        <td>
                                <b>$Lang::tr{'dns servers'}:</b>
                        </td>
-                       <td align="center">
+                       <td style='text-align:center;'>
                                $dns_servers_str
                        </td>
-                       <td align="center"></td>
+                       <td></td>
                </tr>
        </table>
 END
 
 #Dial profiles
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
-print `/usr/local/bin/dialctrl.pl show`;
-print <<END;
-<br>
-               <table width='80%'>
+       # The dialctrl.pl script outputs html
+       print `/usr/local/bin/dialctrl.pl show`;
+       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/>";
        }
-       print"</tr></table>";
 }
-       if ( $netsettings{'GREEN_DEV'} ) {
+
+
+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 ( $netsettings{'GREEN_DEV'} ) {
                my $sub=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
                print <<END;
-               <br>
-               <table width='80%' class='tbl'>
                <tr>
-                       <th>$Lang::tr{'network'}</th>
-                       <th>$Lang::tr{'ip address'}</th>
-                       <th>$Lang::tr{'status'}</th>
-               </tr>
-               <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'}/$sub
-               <td width='45%' align='center'>
+                       <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>';
        }
-       if ( $netsettings{'BLUE_DEV'} ) {
+if ( $netsettings{'BLUE_DEV'} ) {
                my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
                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'}/$sub
-               <td width='45%' align='center'>
+               <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 ( $netsettings{'ORANGE_DEV'} ) {
+if ( $netsettings{'ORANGE_DEV'} ) {
                my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
                print <<END;
-               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/firewall.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
-               <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}/$sub
-               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+               <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 align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br>
-               <td width='30%' align='center'>$ipsecip
-               <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+               <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
 }
 
@@ -322,14 +358,15 @@ if (($confighash{'ENABLED'} eq "on") ||
        $ovpnip="$ovpnip/$sub";
 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 style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
+                       <a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a>
                </td>
-               <td width='30%' align='center'>$ovpnip
-       <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+               <td style='width:30%; text-align:center;'>$ovpnip</td>
+               <td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
+       </tr>
 END
        }
-print"</td></tr></table>";
+print"</table>";
 &Header::closebox();
 
 #Check if there are any vpns configured (ipsec and openvpn)
@@ -353,7 +390,8 @@ foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpn
 if ($showbox){
 # Start of Box wich contains all vpn connections
        &Header::openbox('100%', 'center', $Lang::tr{'vpn'});
-#show ipsec connectiontable
+
+       #show ipsec connectiontable
        if ( $showipsec ) {
                my $ipsecip = $vpnsettings{'VPN_IP'};
                my @status = `/usr/local/bin/ipsecctrl I`;
@@ -363,12 +401,11 @@ if ($showbox){
                my $col="";
                my $count=0;
                print <<END;
-               <br>
-               <table width='80%' class='tbl'>
+               <table class='tbl' style='width:80%;'>
                <tr>
-                       <th width='40%'>$Lang::tr{'ipsec network'}</th>
-                       <th width='30%'>$Lang::tr{'ip address'}</th>
-                       <th width='30%'>$Lang::tr{'status'}</th>
+                       <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) {
@@ -378,43 +415,43 @@ END
                                $vpnsub=&General::iporsubtocidr($vpnsub);
                                $vpnip="$vpnip/$vpnsub";
                                if ($count % 2){
-                                       $col="bgcolor='$color{'color22'}'";
+                                       $col = $color{'color22'};
                                }else{
-                                       $col="bgcolor='$color{'color20'}'";
-                               }
-                               if ($id % 2) {
-                                       print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
-                               } else {
-                                       print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
+                                       $col = $color{'color20'};
                                }
-                               my $active = "<td bgcolor='${Header::colourred}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
+                               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>";
+
+                               my $activecolor = $Header::colourred;
+                               my $activestatus = $Lang::tr{'capsclosed'};
                                if ($vpnconfig{$key}[0] eq 'off') {
-                                       $active = "<td bgcolor='${Header::colourblue}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
+                                       $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/ )){
-                                                       $active = "<td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td>";
+                                                       $activecolor = $Header::colourgreen;
+                                                       $activestatus = $Lang::tr{'capsopen'};
                                                }
                                        }
                                }
-                               print "$active</td>";
+                               print "<td style='text-align:center; color:white; background-color:$activecolor;'><b>$activestatus</b></td>";
+                               print "</tr>";
                        }
                }
-               print "</tr></table>";
+               print "</table>";
        }
 
-###
-# Check if there is any OpenVPN connection configured.
-###
-
+       # Check if there is any OpenVPN connection configured.
        if ( $showovpn ){
                print <<END;
-               <br>
-               <table width='80%' class='tbl'>
+               <br/>
+               <table class='tbl' style='width:80%;'>
                <tr>
-                       <th width='40%'>$Lang::tr{'openvpn network'}</th>
-                       <th width='30%'>$Lang::tr{'ip address'}</th>
-                       <th width='30%'>$Lang::tr{'status'}</th>
+                       <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
 
                # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
@@ -441,9 +478,9 @@ END
                                                $display = $tustate[1];
                                        }
                                        if ($count %2){
-                                               $col="bgcolor='$color{'color22'}'";
+                                               $col = $color{'color22'};
                                        }else{
-                                               $col="bgcolor='$color{'color20'}'";
+                                               $col = $color{'color20'};
                                        }
                                        $active='off';
                                        #make cidr from ip
@@ -452,16 +489,16 @@ END
                                        my $vpnip="$vpnip/$vpnsub";
                                        print <<END;
                                        <tr>
-                                               <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn'><font color='white'>$ovpnconfig{$dkey}[1]</font></td>
-                                               <td align='center' $col>$vpnip</td>
-                                               <td align='center' bgcolor='$display_colour' ><b><font color='#FFFFFF'>$display</font></b></td>
+                                               <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' align='center'>$Lang::tr{'ovpn no connections'}</td></tr>";
+                       print "<tr><td colspan='3' style='text-align:center;'>$Lang::tr{'ovpn no connections'}</td></tr>";
                }
                print"</table>";
        }
@@ -481,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
@@ -496,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 {
@@ -505,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>";
                }
        }
 }
@@ -517,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>";
        }
 }
 
@@ -525,24 +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) {
        &Header::openbox('100%','center', );
-       print "<table width='80%' class='tbl'>";
+       print "<table class='tbl' style='width:80%;'>";
        print "<tr><th>$Lang::tr{'fwhost hint'}</th></tr>";
-       print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
+       print "<tr><td style='color:white; background-color:$Header::colourred;'>$warnmessage</td></tr>";
+    print "</table>";
        &Header::closebox();
 }
 
-print "<div align='center'>";
 &Pakfire::dblist("upgrade", "notice");
 if ( -e "/var/run/need_reboot" ) {
-       print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
+       print "<div style='text-align:center; color:red;'>";
+       print "<br/><br/>$Lang::tr{'needreboot'}!";
+       print "</div>";
 }
 
-print "</div>";
-
 &Header::closebigbox();
 &Header::closepage();
+

diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index f354a45bfc0dcfddba10e6a7388b2ecce4fac6b1..86b1b75ba26773a205bf6b91f946e79972ba65dc 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -129,7 +129,7 @@ print <<END;
        <link rel="shortcut icon" href="/favicon.ico" />
        <script type="text/javascript" src="/include/jquery.js"></script>
 
-       <script language="javascript" type="text/javascript">
+       <script type="text/javascript">
                function swapVisibility(id) {
                        \$('#' + id).toggle();
                }
@@ -238,7 +238,7 @@ sub openbox {
        $align = $_[1];
        $caption = $_[2];
 
-       print "<div class='post' align='$align'>\n";
+       print "<div class='post' style='text-align:$align;'>\n";
 
        if ($caption) {
                print "<h2>$caption</h2>\n";

diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl
index 88f54924b0da3e272fce0582ede547e16ec9c2b8..b0abab7b111407da692f90b9fc1ce736466c2a3f 100644 (file)
--- a/src/scripts/dialctrl.pl
+++ b/src/scripts/dialctrl.pl
@@ -162,8 +162,10 @@ else {
 
 print <<END
 <br />$Lang::tr{'since'} $update
-<tr><td colspan='3' align='center'>$Lang::tr{'connections'}: $up | $Lang::tr{'disconnects'}: $down | $Lang::tr{'attemps'}: $rec
-<tr><td><b>$Lang::tr{'total connection time'}:</b><td align='right'>$current<td align='left'> ~ $ontime%
+<table style='width:60%'>
+<tr><td>$Lang::tr{'connections'}: $up</td><td>$Lang::tr{'disconnects'}: $down</td><td>$Lang::tr{'attemps'}: $rec</td></tr>
+<tr><td><b>$Lang::tr{'total connection time'}:</b><td>$current</td><td> ~ $ontime%</td></tr>
+</table>
 END
 ;
        }