Hinzugefügt:

* Morningreconnect Script Geändert: * Neue Spamassassin Version. 3.1.3 * Interface umfangreich bearbeitet in Layout und angezeigten Texten. * DHCP-Leases-Error gefixt * lq-Graph pingt nun nach www.heise.de * IP-Anzeige für PPPoE/DSL gefixt. * Connectionstate vom IPCop übernommen. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@164 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-27 03:07:43 +02:00 · 2006-06-06 19:12:22 +00:00
parent 90350ff3f3
commit 986e08d996
43 changed files with 461 additions and 344 deletions
--- a/html/cgi-bin/aliases.cgi
+++ b/html/cgi-bin/aliases.cgi
@@ -17,7 +17,7 @@ use strict;
 #use Carp ();
 #local $SIG{__WARN__} = \&Carp::cluck;

-require 'CONFIG_ROOT/general-functions.pl';	# replace CONFIG_ROOT with /var/ipfire in case of manual install
+require '/var/ipfire/general-functions.pl';	# replace /var/ipfire with /var/ipfire in case of manual install
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";

--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -22,7 +22,7 @@ use strict;
 use File::Copy;
 use Sys::Hostname;

-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";

--- a/html/cgi-bin/changepw.cgi
+++ b/html/cgi-bin/changepw.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -23,7 +23,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";

--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -13,7 +13,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";

@@ -36,6 +36,8 @@ Projektleiter - Michael Tremer
 (<a href='mailto:m.s.tremer\@gmail.com'>m.s.tremer\@gmail.com</a>)<br />
 Projektmitglied &amp; Sponsor - Detlef Lampart
 (<a href='mailto:info\@delaco.de'>info\@delaco.de</a>)<br />
+Projektmitglied &amp; Developer - Heiner Irgendwas...
+(<a href='mailto:email\@fehlt.com'>email\@fehlt.com</a>)<br />
 Projektmitglied &amp; Supporter - Silvio Rechenbach
 (<a href='mailto:sr\@tne.de'>sr\@tne.de</a>)<br />
 Sponsor - Karsten Rechenbach
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -25,7 +25,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";
 #workaround to suppress a warning when a variable is used only once
--- a/html/cgi-bin/dial.cgi
+++ b/html/cgi-bin/dial.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/dmzholes.cgi
+++ b/html/cgi-bin/dmzholes.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/fwhits.cgi
+++ b/html/cgi-bin/fwhits.cgi
@@ -28,43 +28,43 @@ my $graphdir = "/home/httpd/html/graphs";
 my @LOCALCHECK=();
 my $errormessage="";

-&Header::openpage('firewall graphs', 1, ' <META HTTP-EQUIV="Refresh" CONTENT="300"> <META HTTP-EQUIV="Cache-Control" content="no-cache"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> ');
+&Header::openpage($Lang::tr{'firewall graphs'}, 1, ' <META HTTP-EQUIV="Refresh" CONTENT="300"> <META HTTP-EQUIV="Cache-Control" content="no-cache"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> ');

 &Header::openbigbox('100%', 'left', '', $errormessage);
 print <<END;
 <table width="100%" align="center">
 	<tr>
 		<td align="left">
-			<a href=/cgi-bin/fwhits.cgi?graph=line>show lines</a>
+			<a href=/cgi-bin/fwhits.cgi?graph=line>$Lang::tr{'show lines'}</a>
 			&nbsp;
-			<a href=/cgi-bin/fwhits.cgi?graph=area>show areas</a>
+			<a href=/cgi-bin/fwhits.cgi?graph=area>$Lang::tr{'show areas'}</a>
 		</td>
 	</tr>
 </table>
 END
 if ($cgigraphs[1] eq "line") {
-	        &Header::openbox('100%', 'center', "daily firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-day-line.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-day-line.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "weekly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-week-line.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-week-line.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "monthly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-month-line.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-month-line.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "yearly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-year-line.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-year-line.png' border='0' />";
@@ -73,28 +73,28 @@ if ($cgigraphs[1] eq "line") {
 }
 else
 {
-	        &Header::openbox('100%', 'center', "daily firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-day-area.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-day-area.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "weekly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-week-area.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-week-area.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "monthly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-month-area.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-month-area.png' border='0' />";
 		print "<br />\n";
 	        &Header::closebox();

-	        &Header::openbox('100%', 'center', "yearly firewallhits");
+	        &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
 		my $ftime = localtime((stat("$graphdir/firewallhits-year-area.png"))[9]);
 		print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
 		print "<img src='/graphs/firewallhits-year-area.png' border='0' />";
--- a/html/cgi-bin/graphs.cgi
+++ b/html/cgi-bin/graphs.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/hosts.cgi
+++ b/html/cgi-bin/hosts.cgi
@@ -17,7 +17,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";

--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -18,7 +18,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";

--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -67,21 +67,17 @@ my $dialButtonDisabled = "disabled='disabled'";
 &Header::openbigbox('', 'center');
 &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));

-if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
-	if ($connstate =~ /$Lang::tr{'connected'}/) {
-	    if ($ddnssettings{'BEHINDROUTER'} eq 'FETCH_IP') {
-	        if (open(IPADDR,"${General::swroot}/ddns/ipcache")) {
-	   	    $ipaddr = <IPADDR>;
-	    	    close IPADDR;
-	    	    chomp ($ipaddr);
-		}
-	    }
-	    if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
-	   	my $ipaddr = <IPADDR>;
-	    	close IPADDR;
-	    	chomp ($ipaddr);
-	    }
-        }
+if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
+	if (open(IPADDR,"${General::swroot}/ddns/ipcache")) {
+   	    $ipaddr = <IPADDR>;
+    	    close IPADDR;
+    	    chomp ($ipaddr);
+	}
+	if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
+	    my $ipaddr = <IPADDR>;
+	    close IPADDR;
+	    chomp ($ipaddr);
+	}
 } elsif ($modemsettings{'VALID'} eq 'no') {
 	print "$Lang::tr{'modem settings have errors'}\n </b></font>\n";
 } else {
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -18,7 +18,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";

--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -15,7 +15,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";

--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -20,7 +20,7 @@ use Getopt::Std;
 #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";

--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -18,7 +18,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";

--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -15,7 +15,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";

@@ -250,7 +250,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})

 &Header::showhttpheaders();

-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'system logs'}, 1, '');

 &Header::openbigbox('100%', 'left', '', $errormessage);

--- a/html/cgi-bin/logs.cgi/proxylog.dat
+++ b/html/cgi-bin/logs.cgi/proxylog.dat
@@ -15,7 +15,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";

--- a/html/cgi-bin/logs.cgi/summary.dat
+++ b/html/cgi-bin/logs.cgi/summary.dat
@@ -15,7 +15,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";

--- a/html/cgi-bin/modem.cgi
+++ b/html/cgi-bin/modem.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/netstatus.cgi
+++ b/html/cgi-bin/netstatus.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -16,7 +16,7 @@
 #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";

--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -17,7 +17,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";

@@ -50,7 +50,7 @@ $checked{'AUTOUPD'}{'off'} = '';
 $checked{'AUTOUPD'}{'on'} = '';
 $checked{'AUTOUPD'}{$pakfiresettings{'AUTOUPD'}} = "checked='checked'";

-&Header::openpage($Lang::tr{'pakfire configuration'}, 1, $refresh);
+&Header::openpage($Lang::tr{'pakfire configuration'}, 1);

 &Header::openbigbox('100%', 'left', '', $errormessage);

--- 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";

--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -19,7 +19,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";

--- a/html/cgi-bin/proxygraphs.cgi
+++ b/html/cgi-bin/proxygraphs.cgi
@@ -11,7 +11,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";

--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -15,7 +15,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";

--- a/html/cgi-bin/shaping.cgi
+++ b/html/cgi-bin/shaping.cgi
@@ -13,7 +13,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";

--- a/html/cgi-bin/shutdown.cgi
+++ b/html/cgi-bin/shutdown.cgi
@@ -13,7 +13,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";

--- a/html/cgi-bin/status.cgi
+++ b/html/cgi-bin/status.cgi
@@ -15,7 +15,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";

@@ -41,7 +41,7 @@ my %servicenames =
 	$Lang::tr{'secure shell server'} => 'sshd',
 	$Lang::tr{'vpn'} => 'pluto',
 	$Lang::tr{'web proxy'} => 'squid',
-	$Lang::tr{'openvpn'} => 'openvpn'
+	'OpenVPN' => 'openvpn'
 );

 my $iface = '';
--- a/html/cgi-bin/upload.cgi
+++ b/html/cgi-bin/upload.cgi
@@ -16,7 +16,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";

--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.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";

--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -17,7 +17,7 @@ use Time::Local;
 #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";

--- a/html/cgi-bin/xtaccess.cgi
+++ b/html/cgi-bin/xtaccess.cgi
@@ -16,7 +16,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";