public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c101827318705aca4ffc9ae955d921f3b92d98b4
Date: Tue, 25 Feb 2014 22:05:51 +0100	[thread overview]
Message-ID: <20140225210551.EFCF820AC4@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 60465 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c101827318705aca4ffc9ae955d921f3b92d98b4 (commit)
       via  25bd6edaaf0158ece48f4f3732ff8933bc188028 (commit)
       via  f2b8668fc8d3590e426d716068b3b59f0f58a3a1 (commit)
       via  50294f93c21d7a8c9bad7bfde953856d45040999 (commit)
       via  4e7c3114cade2f653d703d8a64db7bc4f15f18eb (commit)
       via  52ecb188bcc2fd922fca816f80b6db609d89002a (commit)
       via  66f6b279b0622aa2244ace040bdb8848831d06e0 (commit)
       via  c010871ab16111a57d518406c188e43837799600 (commit)
       via  429c1a3fc9b169f4fe26c163129b907ed473dbe1 (commit)
       via  d7fe5d797070741cf0c211b65305861dd4f28071 (commit)
       via  0f43165084d0e9ee74c7f8b06fafb997ca37fd39 (commit)
       via  8b40eca59ec98f19544e68342db7ee24d5983aa6 (commit)
       via  be7534e3fa84649724195a452404155044ed30fb (commit)
      from  a7c5afa453e30622de900bcac55fada19e470faa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c101827318705aca4ffc9ae955d921f3b92d98b4
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 17:47:12 2014 +0100

    firewalllogs*.dat: Reduce amount of code to set row bgcolor
    
    Replace 10 if statements with duplicated code for print
    and setting background color by using a variable and
    one if statement.

commit 25bd6edaaf0158ece48f4f3732ff8933bc188028
Merge: f2b8668 c010871
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 25 22:02:34 2014 +0100

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

commit f2b8668fc8d3590e426d716068b3b59f0f58a3a1
Merge: 50294f9 be7534e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 25 22:01:34 2014 +0100

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

commit 50294f93c21d7a8c9bad7bfde953856d45040999
Merge: 4e7c311 8b40eca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 25 22:01:14 2014 +0100

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

commit 4e7c3114cade2f653d703d8a64db7bc4f15f18eb
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Sat Feb 22 08:04:24 2014 +0100

    index.cgi: Add /red/local-ipaddress query.
    
    Fixes# 10480. Added if loop for local-ipaddress query.

commit 52ecb188bcc2fd922fca816f80b6db609d89002a
Merge: 66f6b27 a7c5afa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 25 12:23:33 2014 +0100

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 66f6b279b0622aa2244ace040bdb8848831d06e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 25 12:23:09 2014 +0100

    Reload all firewall rules when /etc/init.d/firewall reload is executed.

commit c010871ab16111a57d518406c188e43837799600
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 15:23:39 2014 +0100

    index.cgi: Make html valid, and improve dialup and vpn display
    
    Make the html validate. One part of the changes is to
    move style from using deprecated attributes to using
    style attribute on tag.
    The other part is to make sure that tables, rows and cells
    are properly closed and nested.
    
    Use a table for showing output from the dialctrl script.

commit 429c1a3fc9b169f4fe26c163129b907ed473dbe1
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 12:38:41 2014 +0100

    connections.cgi: Make the html pass html validation

commit d7fe5d797070741cf0c211b65305861dd4f28071
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 12:03:35 2014 +0100

    aliases.cgi: Make the html pass html validation

commit 0f43165084d0e9ee74c7f8b06fafb997ca37fd39
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 12:14:41 2014 +0100

    ipfire theme: Fix align on div, and fix javascript tag
    
    Remove align attribute on div for openbox, rather use
    style attribute with text-align, since align attribute
    causes html validation warnings, since it is deprecated.
    
    Remove deprecated and useless attribute on javascript tag.

commit 8b40eca59ec98f19544e68342db7ee24d5983aa6
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 11:59:55 2014 +0100

    cgi-bin: Remove font tags with no effect, and style tags
    
    The font tag is deprecated, so clean up html by removing
    font tags that have no effect.
    
    For font tags that have an effect, move the styling to
    the tag controlling the text output.
    
    The aim is to get one step further towards validating html.

commit be7534e3fa84649724195a452404155044ed30fb
Author: Alf Høgemark <alf(a)i100.no>
Date:   Sat Feb 22 07:07:57 2014 +0100

    qos.cgi: Show class description in listing, and graph description
    
    When listing the defined qos classes when qos.cgi is initially
    displayed, include the description of the class.
    
    Add upload heading for red graph and download graph for imq graph,
    since it is not obvious what the graphs means.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/armv5tel/initscripts |   1 -
 config/rootfiles/common/i586/initscripts     |   1 -
 config/rootfiles/core/76/filelists/firewall  |   1 -
 config/rootfiles/core/76/update.sh           |   3 +
 html/cgi-bin/aliases.cgi                     |  50 +++--
 html/cgi-bin/connections.cgi                 | 144 +++++++--------
 html/cgi-bin/dnsforward.cgi                  |   8 +-
 html/cgi-bin/index.cgi                       | 261 ++++++++++++++++-----------
 html/cgi-bin/logs.cgi/firewalllogip.dat      |  43 ++---
 html/cgi-bin/logs.cgi/firewalllogport.dat    |  41 ++---
 html/cgi-bin/media.cgi                       |   4 +-
 html/cgi-bin/qos.cgi                         |   6 +-
 html/cgi-bin/upnp.cgi                        |  11 +-
 html/html/themes/ipfire/include/functions.pl |   4 +-
 langs/de/cgi-bin/de.pl                       |   2 +
 langs/en/cgi-bin/en.pl                       |   2 +
 lfs/initscripts                              |   2 -
 src/initscripts/init.d/firewall              |   3 +
 src/scripts/dialctrl.pl                      |   6 +-
 19 files changed, 316 insertions(+), 277 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 531e612..bf4dd52 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -81,7 +81,6 @@ etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/20-RL-firewall
-etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
 etc/rc.d/init.d/networking/red.up/23-RS-snort
 etc/rc.d/init.d/networking/red.up/24-RS-qos
 etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index a3acc1f..3b91181 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -83,7 +83,6 @@ etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/20-RL-firewall
-etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
 etc/rc.d/init.d/networking/red.up/23-RS-snort
 etc/rc.d/init.d/networking/red.up/24-RS-qos
 etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/core/76/filelists/firewall b/config/rootfiles/core/76/filelists/firewall
index 1c58191..e770307 100644
--- a/config/rootfiles/core/76/filelists/firewall
+++ b/config/rootfiles/core/76/filelists/firewall
@@ -1,5 +1,4 @@
 etc/rc.d/init.d/firewall
-etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/optionsfw.cgi
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index 2da9408..150045b 100644
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -204,6 +204,9 @@ rm -f /usr/sbin/ntptime
 rm -f /usr/sbin/ntptrace
 rm -f /usr/sbin/tickadj
 
+# Remove old firewall helper link
+rm -f /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi
index 8d6b19d..09f6ea3 100644
--- 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 d566cf7..c7220f6 100644
--- 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/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index 5f051d2..b66fa46 100644
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -207,20 +207,20 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
 print <<END
 <table width='100%'>
 	<tr>
-		<td width='20%' class='base'><font>$Lang::tr{'dnsforward zone'}:</font></td>
+		<td width='20%' class='base'>$Lang::tr{'dnsforward zone'}:</td>
 		<td><input type='text' name='ZONE' value='$cgiparams{'ZONE'}' size='24' /></td>
 		<td width='30%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
 	</tr>
 
 	<tr>
-		<td width='20%' class='base'><font>$Lang::tr{'dnsforward forward_server'}:</font></td>
+		<td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}:</td>
 		<td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td>
 	</tr>
 </table>
 
 <table width='100%'>
 	<tr>
-		<td width ='20%' class='base'><font class='boldbase'>$Lang::tr{'remark'}:</font>&nbsp;<img src='/blob.gif' alt='*' /></td>
+		<td width ='20%' class='base'>$Lang::tr{'remark'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 		<td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td>
 	</tr>
 </table>
@@ -229,7 +229,7 @@ print <<END
 
 <table width='100%'>
 	<tr>
-		<td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' />&nbsp;<font class='base'>$Lang::tr{'this field may be blank'}</font></td>
+		<td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' />&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' />
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ca98e72..c5ccae8 100644
--- 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(a)ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)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        #
@@ -158,6 +158,11 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || (
     	    close IPADDR;
     	    chomp ($ipaddr);
 	}
+	if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
+	    $ipaddr = <IPADDR>;
+	    close IPADDR;
+	    chomp ($ipaddr);
+	}
 } elsif ($modemsettings{'VALID'} eq 'no') {
 	print "$Lang::tr{'modem settings have errors'}\n </b></font>\n";
 } else {
@@ -166,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
 	}
 
@@ -187,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
 	}
 
@@ -209,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
 }
 
@@ -317,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)
@@ -348,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`;
@@ -358,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) {
@@ -373,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.
@@ -436,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
@@ -447,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>";
 	}
@@ -476,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
@@ -491,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 {
@@ -500,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>";
 		}
 	}
 }
@@ -512,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>";
 	}
 }
 
@@ -520,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/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index f671ab8..e4e8451 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -427,16 +427,12 @@ for($s=0;$s<$lines;$s++)
   $percent = $value[$s] * 100 / $linesjc;
   $percent = sprintf("%.f", $percent);
   $total = $total + $value[$s];
-  if ( ($color % 10) == 1 ){print "<tr>"; $col="bcolor='$color{'color1'}'";}
-  if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
-  if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
-  if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
-  if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
-  if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
-  if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
-  if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
-  if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
-  if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
+  my $colorIndex = $color % 10;
+  if($colorIndex == 0) {
+    $colorIndex = 10;
+  }
+  $col="bgcolor='$color{\"color$colorIndex\"}'";
+  print "<tr>";
   
   my $gi = Geo::IP::PurePerl->new();
   my $ccode = $gi->country_code_by_name($key[$s]);
@@ -456,16 +452,12 @@ for($s=0;$s<$lines;$s++)
 
 if($cgiparams{'otherspie'} == 2 ){}
 else{
-if ( ($color % 10) == 1 ){print "<tr>"; $col="bcolor='$color{'color1'}'";}
-if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
-if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
-if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
-if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
-if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
-if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
-if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
-if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
-if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
+  my $colorIndex = $color % 10;
+  if($colorIndex == 0) {
+    $colorIndex = 10;
+  }
+  $col="bgcolor='$color{\"color$colorIndex\"}'";
+  print "<tr>";
 
 if ( $linesjc ne "0")
 {
@@ -504,7 +496,10 @@ sub findkey {
       last;
     }
   }
-}sub checkversion {
-        #Automatic Updates is disabled
-        return "0","0";
-        }
+}
+
+sub checkversion {
+    #Automatic Updates is disabled
+    return "0","0";
+}
+
diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index ba10601..9f7ce3a 100644
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -429,16 +429,12 @@ for($s=0;$s<$lines;$s++)
   $percent = $value[$s] * 100 / $linesjc;
   $percent = sprintf("%.f", $percent);
   $total = $total + $value[$s];
-  if ( ($color % 10) == 1 ){print "<tr>"; $col="bgcolor='$color{'color1'}'";}
-  if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
-  if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
-  if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
-  if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
-  if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
-  if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
-  if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
-  if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
-  if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
+  my $colorIndex = $color % 10;
+  if($colorIndex == 0) {
+    $colorIndex = 10;
+  }
+  $col="bgcolor='$color{\"color$colorIndex\"}'";
+  print "<tr>";
 
   $color++;
   print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
@@ -450,16 +446,12 @@ for($s=0;$s<$lines;$s++)
 
 if($cgiparams{'otherspie'} == 2 ){}
 else{
-if ( ($color % 10) == 1 ){print "<tr>"; $col="bgcolor='$color{'color1'}'";}
-if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
-if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
-if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
-if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
-if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
-if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
-if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
-if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
-if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
+  my $colorIndex = $color % 10;
+  if($colorIndex == 0) {
+    $colorIndex = 10;
+  }
+  $col="bgcolor='$color{\"color$colorIndex\"}'";
+  print "<tr>";
 
 if ( $linesjc ne "0")
 {
@@ -487,6 +479,7 @@ END
 &Header::closepage();
 
 sub findkey {
+  my $v;
   foreach $v (@keytabjc) {
     if ($tabjc{$v} eq $_[0]) {
       delete $tabjc{$v};
@@ -497,7 +490,9 @@ sub findkey {
     }
   }
 }
+
 sub checkversion {
-        #Automatic Updates is disabled
-        return "0","0";
-        }
+    #Automatic Updates is disabled
+    return "0","0";
+}
+
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 7e8e32e..2aec3cc 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -206,9 +206,9 @@ sub diskbox {
 
 		if ( $status[1]=~/standby/){
 			my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]);
-			print"<b>Disk $disk status:<font color='#FF0000'>".$status[1]."</font></b> ($Lang::tr{'since'} $ftime)";
+			print"<b>Disk $disk status:<span style='color:#FF0000'>".$status[1]."</b> ($Lang::tr{'since'} $ftime)";
 		}else{
-			print"<b>Disk $disk status:<font color='#00FF00'>".$status[1]."</font></b>";
+			print"<b>Disk $disk status:<span style='color:#00FF00'>".$status[1]."</b>";
 		}
 	}
 
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index f3539cd..dee6f41 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -772,10 +772,10 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
 	exit
 }
 
-	&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}");
+	&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}");
 	&Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325");
 	&Header::closebox();
-	&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}");
+	&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}");
 	&Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
 	&Header::closebox();
 
@@ -1184,7 +1184,7 @@ sub showclasses {
 	  		@classline = split( /\;/, $classentry );
 	  		if ( $classline[0] eq $qossettings{'DEV'} )
 	  		{
-	  		  &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1]");
+	  		  &Header::openbox('100%', 'center', "$Lang::tr{'Class'}: $classline[1] $classline[8]");
 	  			print <<END
 				<table border='0' width='100%' cellspacing='0'>
 				<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
index ee341e1..07dfa26 100644
--- a/html/cgi-bin/upnp.cgi
+++ b/html/cgi-bin/upnp.cgi
@@ -133,7 +133,7 @@ print <<END
 <table width='95%' cellspacing='0'>
 END
 ;
-if ( $message ne "" ) {print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";}
+if ( $message ne "" ) {print "<tr><td colspan='3' style='text-align:center; color:red;'>$message</td></tr>";}
 
 my $lines = 0;
 my $key = '';
@@ -199,9 +199,9 @@ print "</table>";
 ############################################################################################################################
 
 sub isrunning
-	{
+{
 	my $cmd = $_[0];
-	my $status = "<td bgcolor='${Header::colourred}' align='center'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+	my $status = "<td bgcolor='${Header::colourred}' style='text-align:center; color:white;'><b>$Lang::tr{'stopped'}</b></td>";
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
@@ -219,9 +219,10 @@ sub isrunning
 				{if (/^Name:\W+(.*)/) {$testcmd = $1; }}
 			close FILE;
 			if ($testcmd =~ /$exename/)
-				{$status = "<td bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";}
+				{$status = "<td style='color:white; background-color:${Header::colourgreen};'><b>$Lang::tr{'running'}</b></td>";}
 			}
 		}
 
 		return $status;
-	}
+}
+
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index f354a45..86b1b75 100644
--- 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/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4518f60..e951b68 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -743,6 +743,7 @@
 'donation-text' => '<strong>IPFire</strong> wird von Freiwilligen in ihrer Freizeit betrieben und auch betreut. Um dieses Projekt am Laufen zu halten, entstehen uns natürlich auch Kosten. Wenn Sie uns unterstützen wollen, würden wir uns über eine kleine Spende sehr freuen.',
 'dos charset' => 'DOS Charset',
 'down and up speed' => 'Geben Sie bitte hier ihre Download- bzw. Upload-Geschwindigkeit ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
+'downlink' => 'Downlink',
 'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)',
 'downlink std class' => 'Downloadstandardklasse',
 'download' => 'herunterladen',
@@ -2193,6 +2194,7 @@
 'updxlrtr weekly' => 'wöchentlich',
 'updxlrtr year' => 'einem Jahr',
 'upgrade' => 'upgrade',
+'uplink' => 'Uplink',
 'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)',
 'uplink std class' => 'Uploadstandardklasse',
 'upload' => 'Hochladen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 921e1b1..d8cfdc7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -768,6 +768,7 @@
 'done' => 'Do it',
 'dos charset' => 'DOS Charset',
 'down and up speed' => 'Enter your Down- and Uplink-Speed <br /> and then press <i>Save</i>.',
+'downlink' => 'Downlink',
 'downlink speed' => 'Downlink speed (kbit/sec)',
 'downlink std class' => 'downlink standard class',
 'download' => 'download',
@@ -2231,6 +2232,7 @@
 'updxlrtr weekly' => 'weekly',
 'updxlrtr year' => 'one year',
 'upgrade' => 'upgrade',
+'uplink' => 'Uplink',
 'uplink speed' => 'Uplink speed (kbit/sec)',
 'uplink std class' => 'uplink standard class',
 'upload' => 'Upload',
diff --git a/lfs/initscripts b/lfs/initscripts
index f9ee45f..28387f3 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -181,8 +181,6 @@ $(TARGET) :
 
 	ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 	ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
-	ln -sf ../../../../../usr/local/bin/firewallctrl \
-		/etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
 	ln -sf ../../../../../usr/local/bin/snortctrl \
 		/etc/rc.d/init.d/networking/red.up/23-RS-snort
 	ln -sf ../../../../../usr/local/bin/qosctrl \
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index ddc4a4a..2c280f2 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -281,6 +281,9 @@ iptables_red() {
 		iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
 
 	fi
+
+	# Reload all rules.
+	firewallctrl
 }
 
 # See how we were called.
diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl
index 88f5492..b0abab7 100644
--- 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
 ;
 	}


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2014-02-25 21:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140225210551.EFCF820AC4@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox