Am Pakfire weitergearbeitet.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / portfw.cgi

diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index fcd77e5483093935000b067a53bfca0a6366139c..7aaa54dee367b76272c4415a1c77df0b5e33b05e 100644 (file)
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -30,7 +30,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -38,6 +38,11 @@ require "${General::swroot}/header.pl";
 my @dummy = ( ${Header::colouryellow} );
 undef (@dummy);
 
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
 my %cgiparams=();
 my %selected=();
 my %checked=();
@@ -714,9 +719,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
        }
 }
 print <<END
-       <td width='5%' align='right'>
-               <a href='${General::adminmanualurl}/section-firewall.html#section-port-forwarding' target='_blank'>
-               <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+       <td width='5%' align='right'>&nbsp;</td>
        </tr>
 </table>
 END
@@ -766,10 +769,10 @@ while (<RULES>)
                print "<tr bgcolor='${Header::colouryellow}'>\n";
        } else {
                if ($id % 2) {
-                       print "<tr bgcolor='${Header::table1colour}'>\n"; 
+                       print "<tr bgcolor='$color{'color22'}'>\n"; 
                }
                else {
-                       print "<tr bgcolor='${Header::table2colour}'>\n";
+                       print "<tr bgcolor='$color{'color20'}'>\n";
                }
        }