From e8babc92b0c612fe53d8695bfef871a77f453c32 Mon Sep 17 00:00:00 2001
From: delaco <delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 23 Sep 2006 17:37:59 +0000
Subject: [PATCH] Fixes fuer den Buildprozess. (applejuice, mysql) Quality of
 Service: TOS-Regeln und TOS-Matches hinzugefuegt, Graphen uebersichtlicher
 angeordnet.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@295 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 config/qos/makeqosscripts.pl  |  80 ++++++-
 doc/packages-list.txt         |   1 -
 html/cgi-bin/qos.cgi          | 389 +++++++++++++++++++++++++++-------
 lfs/applejuice                |   3 +-
 lfs/configroot                |   2 +-
 lfs/mysql                     |   1 +
 make.sh                       |   4 +-
 src/misc-progs/qosctrl.c      |   2 +-
 src/paks/applejuice/ROOTFILES | 264 +++++++++++------------
 9 files changed, 533 insertions(+), 213 deletions(-)

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index de5804724d..a2bd5add4c 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -9,7 +9,7 @@
 
 use strict;
 # enable only the following on debugging purpose
-use warnings;
+# use warnings;
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -26,14 +26,17 @@ my $classentry = "";
 my $subclassentry = "";
 my $l7ruleentry = "";
 my $portruleentry = "";
+my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();
 my @subclasses = ();
 my @l7rules = ();
 my @portrules = ();
+my @tosrules = ();
 my @tmpline = ();
 my @classline = ();
 my @subclassline = ();
+my @tosruleline = ();
 my @l7ruleline = ();
 my @portruleline = ();
 my @proto = ();
@@ -42,6 +45,7 @@ my $classfile = "/var/ipfire/qos/classes";
 my $subclassfile = "/var/ipfire/qos/subclasses";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
+my $tosfile = "/var/ipfire/qos/tosconfig";
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
@@ -57,6 +61,7 @@ $qossettings{'ACK'} = '';
 $qossettings{'MTU'} = '1492';
 $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} = 'imq0';
+$qossettings{'TOS'} = '';
 $qossettings{'VALID'} = 'yes';
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -73,6 +78,9 @@ close FILE;
 open( FILE, "< $portfile" ) or die "Unable to read $portfile";
 @portrules = <FILE>;
 close FILE;
+open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
+@tosrules = <FILE>;
+close FILE;
 
 ############################################################################################################################
 ############################################################################################################################
@@ -116,6 +124,7 @@ case "\$1" in
 		echo "[iptables]"
 		iptables -t mangle -L QOS-OUT -v -x 2> /dev/null
 		iptables -t mangle -L QOS-INC -v -x 2> /dev/null
+		iptables -t mangle -L QOS-TOS -v -x 2> /dev/null
 		exit 0
 	  ;;
 	esac
@@ -230,7 +239,9 @@ print <<END
 
 	### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
 	iptables -t mangle -N QOS-OUT
+	iptables -t mangle -N QOS-TOS
 	iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
+	iptables -t mangle -A POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
 
 	### MARK ACKs
 	iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags SYN,RST SYN -j TOS --set-tos 4
@@ -264,6 +275,23 @@ print <<END
 	iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags ALL ACK,FIN -j MARK --set-mark $qossettings{'ACK'}
 	iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags ALL ACK,FIN -j RETURN
 
+	### SET TOS
+END
+;
+  	foreach $tosruleentry (sort @tosrules)
+  	{
+  		@tosruleline = split( /\;/, $tosruleentry );
+		$qossettings{'CLASS'} = $tosruleline[0];
+		$qossettings{'TOS'} = abs $tosruleline[2] * 2;
+  		if ( $tosruleline[1] eq $qossettings{'RED_DEV'} )
+  		{
+			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j RETURN\n";
+		}
+	}
+
+print <<END
+
 	### SET LEVEL7-RULES
 END
 ;
@@ -464,6 +492,25 @@ print <<END
 	iptables -t mangle -N QOS-INC
 	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
 	iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
+
+	### SET TOS
+END
+;
+  	foreach $tosruleentry (sort @tosrules)
+  	{
+  		@tosruleline = split( /\;/, $tosruleentry );
+		$qossettings{'CLASS'} = $tosruleline[0];
+		$qossettings{'TOS'} = abs $tosruleline[2] * 2;
+  		if ( $tosruleline[1] eq $qossettings{'IMQ_DEV'} )
+  		{
+			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j RETURN\n";
+		}
+
+	}
+
+print <<END
 
 	### SET LEVEL7-RULES
 END
@@ -553,6 +600,33 @@ print <<END
 	### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
 	iptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}
 
+	### SETTING TOS BITS
+END
+;
+	foreach $classentry (sort @classes)
+	{
+		@classline = split( /\;/, $classentry );
+		$qossettings{'CLASS'} = $classline[1];
+		$qossettings{'TOS'} = abs $classline[7] * 2;
+		if ($qossettings{'TOS'} ne "0") {
+			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
+			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j RETURN\n";
+		}
+	}
+	foreach $subclassentry (sort @subclasses)
+	{
+		@subclassline = split( /\;/, $subclassentry );
+		$qossettings{'SUBCLASS'} = $subclassline[1];
+		$qossettings{'TOS'} = $subclassline[8];
+		$qossettings{'TOS'} = abs $qossettings{'TOS'} * 2;
+		if ($qossettings{'TOS'} ne "0") {
+			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
+			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j RETURN\n";
+		}
+	}
+
+print <<END
+
 	## STARTING COLLECTOR
 	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
 	/usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
@@ -572,11 +646,15 @@ print <<END
 	rmmod imq
 	# REMOVE & FLUSH CHAINS
 	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
+	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
 	iptables -t mangle --flush  QOS-OUT
 	iptables -t mangle --delete-chain QOS-OUT
 	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
 	iptables -t mangle --flush  QOS-INC
 	iptables -t mangle --delete-chain QOS-INC
+	iptables -t mangle --flush  QOS-TOS
+	iptables -t mangle --delete-chain QOS-TOS
 	rmmod sch_htb
 	echo "Quality of Service was successfully cleared!"
   ;;
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5dcafffbae..80f9ac7e34 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -246,7 +246,6 @@
 * wget-1.10.2
 * wireless_tools.28
 * wput-0.6
-* xampp-linux-1.5.3a
 * xinetd-2.3.14
 * xmbmon205
 * xvidcore-1.1.0
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 94e63b2c82..721cfc0fee 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -10,7 +10,7 @@
 use RRDs;
 use strict;
 # enable only the following on debugging purpose
-use warnings;
+# use warnings;
 use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
@@ -28,22 +28,27 @@ my $classentry = "";
 my $subclassentry = "";
 my $l7ruleentry = "";
 my $portruleentry = "";
+my $tosruleentry = "";
 my @tmp = ();
 my @classes = ();
 my @subclasses = ();
 my @l7rules = ();
 my @portrules = ();
+my @tosrules = ();
 my @tmpline = ();
 my @classline = ();
 my @subclassline = ();
 my @l7ruleline = ();
 my @portruleline = ();
+my @tosruleline = ();
 my @proto = ();
-my %selected= () ;
+my %selected= ();
+my @checked = ();
 my $classfile = "/var/ipfire/qos/classes";
 my $subclassfile = "/var/ipfire/qos/subclasses";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
+my $tosfile = "/var/ipfire/qos/tosconfig";
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
 &Header::showhttpheaders();
@@ -67,6 +72,8 @@ $qossettings{'VALID'} = 'yes';
 $qossettings{'ACTION'} = '';
 $qossettings{'ACTIONDEF'} = '';
 $qossettings{'ACTIONBW'} = '';
+$qossettings{'RED_DEV_SEL'} = '';
+$qossettings{'IMQ_DEV_SEL'} = '';
 $qossettings{'PRIO'} = '';
 $qossettings{'SPD'} = '';
 $qossettings{'CLASS'} = '';
@@ -89,6 +96,7 @@ $qossettings{'DOPORT'} = '';
 $qossettings{'CLASS'} = '';
 $qossettings{'CLASSPRFX'} = '';
 $qossettings{'DEV'} = '';
+$qossettings{'TOS'} = '';
 
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -108,7 +116,7 @@ if ($qossettings{'DOCLASS'} eq $Lang::tr{'save'})
 	if ( $qossettings{'VALID'} eq 'yes' ) {
 		open( FILE, ">> $classfile" ) or die "Unable to write $classfile";
 		print FILE <<END
-$qossettings{'DEVICE'};$qossettings{'CLASS'};$qossettings{'PRIO'};$qossettings{'MINBWDTH'};$qossettings{'MAXBWDTH'};$qossettings{'BURST'};$qossettings{'CBURST'};
+$qossettings{'DEVICE'};$qossettings{'CLASS'};$qossettings{'PRIO'};$qossettings{'MINBWDTH'};$qossettings{'MAXBWDTH'};$qossettings{'BURST'};$qossettings{'CBURST'};$qossettings{'TOS'};
 END
 ;
 		close FILE;
@@ -184,7 +192,7 @@ if ($qossettings{'DOSCLASS'} eq $Lang::tr{'save'})
 	if ( $qossettings{'VALID'} eq 'yes' ) {
 		open( FILE, ">> $subclassfile" ) or die "Unable to write $subclassfile";
 		print FILE <<END
-$qossettings{'DEVICE'};$qossettings{'CLASS'};$qossettings{'SCLASS'};$qossettings{'PRIO'};$qossettings{'MINBWDTH'};$qossettings{'MAXBWDTH'};$qossettings{'BURST'};$qossettings{'CBURST'};
+$qossettings{'DEVICE'};$qossettings{'CLASS'};$qossettings{'SCLASS'};$qossettings{'PRIO'};$qossettings{'MINBWDTH'};$qossettings{'MAXBWDTH'};$qossettings{'BURST'};$qossettings{'CBURST'};$qossettings{'TOS'};
 END
 ;
 		close FILE;
@@ -321,6 +329,68 @@ END
 ############################################################################################################################
 ############################################################################################################################
 
+if ($qossettings{'DOTOS'} eq $Lang::tr{'save'})
+{
+	if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
+		$qossettings{'DEVICE'} = $qossettings{'RED_DEV'};
+	} elsif ($qossettings{'CLASS'} >= 1000 && $qossettings{'CLASS'} < 1021) {
+		$qossettings{'DEVICE'} = $qossettings{'RED_DEV'};
+	} elsif ($qossettings{'CLASS'} >= 200 && $qossettings{'CLASS'} < 221) {
+		$qossettings{'DEVICE'} = $qossettings{'IMQ_DEV'};
+	} elsif ($qossettings{'CLASS'} >= 2000 && $qossettings{'CLASS'} < 2021) {
+		$qossettings{'DEVICE'} = $qossettings{'IMQ_DEV'};
+	}
+	open( FILE, ">> $tosfile" ) or die "Unable to write $tosfile";
+	print FILE <<END
+$qossettings{'CLASS'};$qossettings{'DEVICE'};$qossettings{'TOS'};
+END
+;
+	close FILE;
+} 
+elsif ($qossettings{'DOTOS'} eq 'Loeschen')
+{
+	open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
+	@tosrules = <FILE>;
+	close FILE;
+	open( FILE, "> $tosfile" ) or die "Unable to read $tosfile";
+  	foreach $tosruleentry (sort @tosrules)
+  	{
+  		@tosruleline = split( /\;/, $tosruleentry );
+  		unless ( ($tosruleline[0] eq $qossettings{'CLASS'}) && ($tosruleline[2] eq $qossettings{'TOS'}))
+  		{
+			print FILE $tosruleentry;
+		}
+	}
+	close FILE;
+	$message = "TOS-Regel ($qossettings{'CLASS'} - $qossettings{'TOS'}) wurde geloescht.";
+} elsif ($qossettings{'DOTOS'} eq 'Bearbeiten')
+{
+	open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
+	@tosrules = <FILE>;
+	close FILE;
+	open( FILE, "> $tosfile" ) or die "Unable to write $tosfile";
+	foreach $tosruleentry (sort @tosrules)
+	{
+		@tosruleline = split( /\;/, $tosruleentry );
+		if (( $tosruleline[0] eq $qossettings{'CLASS'} ) && ( $tosruleline[2] eq $qossettings{'TOS'} )) {
+			$qossettings{'DEVICE'} = $tosruleline[1];
+			$qossettings{'CLASS'} = $tosruleline[0];
+			$qossettings{'TOS'} = $tosruleline[2];
+			$qossettings{'EDIT'} = 'yes';
+		} else {
+			print FILE $tosruleentry;
+		}
+	}
+	close FILE;
+	&tosrule();
+	&Header::closebigbox();
+	&Header::closepage();
+	exit
+}
+
+############################################################################################################################
+############################################################################################################################
+
 if ($qossettings{'ACTION'} eq 'Start')
 {
 	system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
@@ -374,25 +444,39 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
 }
 elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung')
 {
-	&Header::openbox('100%', 'left', 'QoS Graphen');
-	print <<END
-	<table width='100%'><tr><td colspan='2' align='center'><font color='red'>Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden.</font>
-	</table>
-END
-;
-	&Header::closebox();
 	open( FILE, "< $classfile" ) or die "Unable to read $classfile";
 	@classes = <FILE>;
 	close FILE;
 	open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
 	@subclasses = <FILE>;
 	close FILE;
+	&Header::openbox('100%', 'left', 'QoS Graphen');
+	print <<END
+	<table width='100%'>	<tr><td align='center'><font color='red'>Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden.</font>
+				<tr><td align='center'><b>Klasse:</b> 
+END
+;
+  	foreach $classentry (sort @classes)
+  	{
+  		@classline = split( /\;/, $classentry );
+		$qossettings{'CLASS'}=$classline[1];
+		print <<END
+		<input type="button" onClick="swapVisibility('$qossettings{'CLASS'}')" value='$qossettings{'CLASS'}'>
+END
+;
+	}
+	print <<END
+	</table>
+END
+;
+	&Header::closebox();
   	foreach $classentry (sort @classes)
   	{
   		@classline = split( /\;/, $classentry );
 		$qossettings{'DEV'}=$classline[0];
 		$qossettings{'CLASS'}=$classline[1];
 		&gengraph($qossettings{'DEV'},$qossettings{'CLASS'});
+		print "<div id='$qossettings{'CLASS'}' style='display: none'>";
 		&Header::openbox('100%', 'center', "$qossettings{'CLASS'} ($qossettings{'DEV'})");
 		print <<END
 		<table>
@@ -416,8 +500,9 @@ END
 ;
 			}
 		}
-	print "\t\t</table>";
-	&Header::closebox();	
+		print "\t\t</table>";
+		&Header::closebox();	
+		print "</div>\n";
 	}
 print <<END
 	</table>
@@ -442,16 +527,41 @@ elsif ($qossettings{'ACTION'} eq 'Unterklasse hinzufuegen')
 	&Header::closepage();
 	exit
 }
-elsif ($qossettings{'ACTION'} eq 'Level7-Regel hinzufuegen')
+elsif ($qossettings{'ACTION'} eq 'Regel hinzufuegen')
 {
-	&level7rule();
-	&Header::closebigbox();
-	&Header::closepage();
-	exit
-}
-elsif ($qossettings{'ACTION'} eq 'Port-Regel hinzufuegen')
-{
-	&portrule();
+	&Header::openbox('100%', 'center', 'Regel hinzufuegen');
+	print <<END
+		<table>
+		<tr><td align='center'>Waehlen sie <u>eine</u> der untenstehenden Regeln aus.
+		<tr><td align='center'>
+			<input type="button" onClick="swapVisibility('l7rule')" value='Level7-Regel'>
+			<input type="button" onClick="swapVisibility('portrule')" value='Port-Regel'>
+			<input type="button" onClick="swapVisibility('tosrule')" value='TOS-Regel'>
+		</table>
+END
+;
+	&Header::closebox();
+	print <<END
+		<div id='l7rule' style='display: none'>
+END
+;
+		&level7rule();
+	print <<END
+		</div>
+		<div id='portrule' style='display: none'>
+END
+;
+		&portrule();
+	print <<END
+		</div>
+		<div id='tosrule' style='display: none'>
+END
+;
+		&tosrule();
+	print <<END
+		</div>
+END
+;
 	&Header::closebigbox();
 	&Header::closepage();
 	exit
@@ -567,6 +677,7 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
 
 &showclasses();
 &showl7rules();
+&showtosrules();
 &showportrules();
 
 &Header::closebigbox();
@@ -729,6 +840,14 @@ END
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>Ceilburst:
 		    <td width='33%' align='left'><input type='text' name='CBURST' maxlength='8' value=$qossettings{'CBURST'}>
+		    <td width='33%' align='center'>&nbsp;
+		<tr><td width='33%' align='right'>TOS-Bit:
+		    <td width='33%' align='left'><select name='TOS'>
+				<option value='0'>Ausgeschaltet (0)</option>
+				<option value='8'>Minimale Verzoegerung (8)</option>
+				<option value='4'>Maximaler Durchsatz (4)</option>
+				<option value='2'>Maximale Zuverlaessigkeit (2)</option>
+				<option value='1'>Minimale Kosten (1)</option></select>
 		    <td width='33%' align='center'><input type='submit' name='DOCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
 		</table></form>
 END
@@ -794,6 +913,14 @@ END
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>Ceilburst:
 		    <td width='33%' align='left'><input type='text' name='CBURST' maxlength='8' value=$qossettings{'CBURST'}>
+		    <td width='33%' align='center'>&nbsp;
+		<tr><td width='33%' align='right'>TOS-Bit:
+		    <td width='33%' align='left'><select name='TOS'>
+				<option value='0'>Ausgeschaltet (0)</option>
+				<option value='8'>Minimale Verzoegerung (8)</option>
+				<option value='4'>Maximaler Durchsatz (4)</option>
+				<option value='2'>Maximale Zuverlaessigkeit (2)</option>
+				<option value='1'>Minimale Kosten (1)</option></select>
 		    <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}>
 							<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'}>
 							<input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
@@ -891,6 +1018,33 @@ END
 	&Header::closebox();
 }
 
+sub tosrule {
+	&Header::openbox('100%', 'center', 'TOS-Regel');
+	if ($qossettings{'TOS'}) {
+		$checked[$qossettings{'TOS'}] = "checked";
+	}
+	print <<END
+		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+		<table width='66%'>
+END
+;
+	if ( $message ne "" ) {
+		print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";
+	}
+	print <<END
+		<tr><td colspan='2' width='100%'>Aktuelle Klasse: $qossettings{'CLASS'}
+		<tr><td width='100%' colspan='2'>Aktivieren oder deaktivieren sie die TOS-Bits <br> und klicken Sie danach auf <i>Speichern</i>.
+		<tr><td width='50%' align='left'>Minimale Verzoegerung (8)		<td width='50%'><input type="radio" name="TOS" value="8" $checked[8]>
+		<tr><td width='50%' align='left'>Maximaler Durchsatz (4)		<td width='50%'><input type="radio" name="TOS" value="4" $checked[4]>
+		<tr><td width='50%' align='left'>Maximale Zuverlaessigkeit (2)	<td width='50%'><input type="radio" name="TOS" value="2" $checked[2]>
+		<tr><td width='50%' align='left'>Minimale Kosten (1)			<td width='50%'><input type="radio" name="TOS" value="1" $checked[1]>
+		<tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}><input type='submit' name='DOTOS' value=$Lang::tr{'save'} />
+		</table></form>
+END
+;
+	&Header::closebox();
+}
+
 sub showclasses {
 	open( FILE, "< $classfile" ) or die "Unable to read $classfile";
 	@classes = <FILE>;
@@ -909,7 +1063,8 @@ sub showclasses {
 		    <td bgcolor='lightgrey' width='10%'>Maximale Bandbreite
 		    <td bgcolor='lightgrey' width='10%'>Burst
 		    <td bgcolor='lightgrey' width='10%'>Ceil Burst
-		    <td bgcolor='lightgrey' width='30%'>Aktionen
+		    <td bgcolor='lightgrey' width='10%'>TOS
+		    <td bgcolor='lightgrey' width='20%'>Aktionen
 END
 ;
 	  	foreach $classentry (sort @classes)
@@ -925,13 +1080,9 @@ END
 				    <td align='center' bgcolor='#EAEAEA'>$classline[4]
 				    <td align='center' bgcolor='#EAEAEA'>$classline[5]
 				    <td align='center' bgcolor='#EAEAEA'>$classline[6]
+				    <td align='center' bgcolor='#EAEAEA'>$classline[7]
 				    <td align='right'  bgcolor='#EAEAEA'>
 					<table border='0'><tr>
-					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='DOCLASS' value='Bearbeiten'>
-						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
 						<input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
@@ -939,13 +1090,13 @@ END
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
-						<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+						<input type='hidden' name='ACTION' value='Regel hinzufuegen'>
+						<input type='image' alt='Regel hinzufuegen' src='/images/addgreen.gif'>
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
-						<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+						<input type='hidden' name='DOCLASS' value='Bearbeiten'>
+						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
@@ -967,22 +1118,18 @@ END
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
+							    <td align='center' bgcolor='#FAFAFA'>$subclassline[8]
 							    <td align='right'  bgcolor='#FAFAFA'>
 						<table border='0'><tr>
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]'>
-							<input type='hidden' name='DOSCLASS' value='Bearbeiten'>
-							<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-						</form>
-						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-							<input type='hidden' name='CLASS' value='$subclassline[2]'>
-							<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
-							<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+							<input type='hidden' name='ACTION' value='Regel hinzufuegen'>
+							<input type='image' alt='Regel hinzufuegen' src='/images/addgreen.gif'>
 						</form>
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]'>
-							<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
-							<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+							<input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+							<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
 						</form>
 						<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='CLASS' value='$subclassline[2]'>
@@ -996,7 +1143,7 @@ END
 				}
 	  		}
 	  	}
-		print "\t<tr><td colspan='8' bgcolor='lightgrey' height='2'>";
+		print "\t<tr><td colspan='9' bgcolor='lightgrey' height='2'>";
 	  	foreach $classentry (sort @classes)
 	  	{
 	  		@classline = split( /\;/, $classentry );
@@ -1010,13 +1157,9 @@ END
 				    <td align='center' bgcolor='#EAEAEA'>$classline[4]
 				    <td align='center' bgcolor='#EAEAEA'>$classline[5]
 				    <td align='center' bgcolor='#EAEAEA'>$classline[6]
+				    <td align='center' bgcolor='#EAEAEA'>$classline[7]
 				    <td align='right'  bgcolor='#EAEAEA'>
 					<table border='0'><tr>
-					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='DOCLASS' value='Bearbeiten'>
-						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
 						<input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
@@ -1024,13 +1167,13 @@ END
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
-						<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+						<input type='hidden' name='ACTION' value='Regel hinzufuegen'>
+						<input type='image' alt='Regel hinzufuegen' src='/images/addgreen.gif'>
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
-						<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
-						<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+						<input type='hidden' name='DOCLASS' value='Bearbeiten'>
+						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
 					</form>
 					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='CLASS' value='$classline[1]'>
@@ -1052,22 +1195,18 @@ END
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
 							    <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
+							    <td align='center' bgcolor='#FAFAFA'>$subclassline[8]
 							    <td align='right'  bgcolor='#FAFAFA'>
 							<table border='0'><tr>
 							<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 								<input type='hidden' name='CLASS' value='$subclassline[2]'>
-								<input type='hidden' name='DOSCLASS' value='Bearbeiten'>
-								<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-							</form>
-							<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-								<input type='hidden' name='CLASS' value='$subclassline[2]'>
-								<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
-								<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+								<input type='hidden' name='ACTION' value='Regel hinzufuegen'>
+								<input type='image' alt='Regel hinzufuegen' src='/images/addgreen.gif'>
 							</form>
 							<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 								<input type='hidden' name='CLASS' value='$subclassline[2]'>
-								<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
-								<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+								<input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+								<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
 							</form>
 							<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 								<input type='hidden' name='CLASS' value='$subclassline[2]'>
@@ -1082,7 +1221,8 @@ END
 	  		}
 	  	}
 		print <<END
-		<tr><td colspan='8' align='right' valign='middle'><b>Legende:</b>&nbsp;&nbsp;<img src='/images/edit.gif'>&nbsp;Klasse bearbeiten | <img src='/images/addblue.gif'>&nbsp;Unterklasse hinzufuegen | <img src='/images/addgreen.gif'>&nbsp;Level7-Regel hinzufuegen | <img src='/images/add.gif'>&nbsp;Port-Regel hinzufuegen | <img src='/images/delete.gif'>&nbsp;Klasse loeschen &nbsp;
+		<tr><td colspan='9' align='right' valign='middle'><b>Legende:</b>&nbsp;&nbsp;<img src='/images/addblue.gif'>&nbsp;Unterklasse hinzufuegen | <img src='/images/addgreen.gif'>&nbsp;Regel hinzufuegen | <img src='/images/edit.gif'>&nbsp;Klasse bearbeiten | <img src='/images/delete.gif'>&nbsp;Klasse loeschen &nbsp;
+		<tr><td colspan='9' align='right' valign='middle'><b>TOS-Bits:</b>&nbsp;&nbsp;<b>0</b> - Deaktiviert | <b>8</b> - Minimale Verzoegerung | <b>4</b> - Maximaler Durchsatz | <b>2</b> - Maximale Zuverlaessigkeit | <b>1</b> - Minimale Kosten &nbsp;
 		</table>
 END
 ;
@@ -1284,21 +1424,122 @@ END
 	}
 }
 
+sub showtosrules {
+	open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
+	@tosrules = <FILE>;
+	close FILE;
+	if (@tosrules) {
+		&Header::openbox('100%', 'center', 'TOS-Regeln');
+		print <<END
+		<table border='0' width='100%' cellspacing='0'>
+		<tr><td bgcolor='lightgrey' width='10%'>Interface
+		    <td bgcolor='lightgrey' width='10%'>Klasse
+		    <td bgcolor='lightgrey' width='10%'>TOS-Bit
+		    <td bgcolor='lightgrey' width='50%'>TOS-Beschreibung
+		    <td bgcolor='lightgrey' width='20%'>Aktionen
+END
+;
+	  	foreach $tosruleentry (sort @tosrules)
+	  	{
+	  		@tosruleline = split( /\;/, $tosruleentry );
+	  		if ( $tosruleline[1] eq $qossettings{'RED_DEV'} )
+	  		{
+	  			print <<END
+				<tr><td align='center' bgcolor='#EAEAEA'>$tosruleline[1]
+				    <td align='center' bgcolor='#EAEAEA'>$tosruleline[0]
+				    <td align='center' bgcolor='#EAEAEA'>$tosruleline[2]
+				    <td align='center' bgcolor='#EAEAEA'>
+END
+;
+				if ( $tosruleline[2] eq "8") {
+					print "Minimale Verzoegerung\n";
+				} elsif ( $tosruleline[2] eq "4") {
+					print "Maximaler Durchsatz\n";
+				} elsif ( $tosruleline[2] eq "2") {
+					print "Maximaler Durchsatz\n";
+				} elsif ( $tosruleline[2] eq "1") {
+					print "Minimale Kosten\n";
+				} else { print "&nbsp;\n"; }
+				print <<END
+				    <td align='right'  bgcolor='#EAEAEA'>
+				    <table border='0'><tr>
+					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+						<input type='hidden' name='CLASS' value='$tosruleline[0]'>
+						<input type='hidden' name='DEV' value='$tosruleline[1]'>
+						<input type='hidden' name='TOS' value='$tosruleline[2]'>
+						<input type='hidden' name='DOTOS' value='Bearbeiten'>
+						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+					</form>
+					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+						<input type='hidden' name='CLASS' value='$tosruleline[0]'>
+						<input type='hidden' name='DEV' value='$tosruleline[1]'>
+						<input type='hidden' name='TOS' value='$tosruleline[2]'>
+						<input type='hidden' name='DOTOS' value='Loeschen'>
+						<input type='image' alt='Loeschen' src='/images/delete.gif'>
+					</form>
+				    </table>
+END
+;
+	  		}
+	  	}
+		print "\t<tr><td colspan='8' bgcolor='lightgrey' height='2'>";
+	  	foreach $tosruleentry (sort @tosrules)
+	  	{
+	  		@tosruleline = split( /\;/, $tosruleentry );
+	  		if ( $tosruleline[1] eq $qossettings{'IMQ_DEV'} )
+	  		{
+	  			print <<END
+				<tr><td align='center' bgcolor='#EAEAEA'>$tosruleline[1]
+				    <td align='center' bgcolor='#EAEAEA'>$tosruleline[0]
+				    <td align='center' bgcolor='#EAEAEA'>$tosruleline[2]
+				    <td align='center' bgcolor='#EAEAEA'>
+END
+;
+				if ( $tosruleline[2] eq "8") {
+					print "Minimale Verzoegerung\n";
+				} elsif ( $tosruleline[2] eq "4") {
+					print "Maximaler Durchsatz\n";
+				} elsif ( $tosruleline[2] eq "2") {
+					print "Maximaler Durchsatz\n";
+				} elsif ( $tosruleline[2] eq "1") {
+					print "Minimale Kosten\n";
+				} else { print "&nbsp;\n"; }
+				print <<END
+				    <td align='right'  bgcolor='#EAEAEA'>
+				    <table border='0'><tr>
+					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+						<input type='hidden' name='CLASS' value='$tosruleline[0]'>
+						<input type='hidden' name='DEV' value='$tosruleline[1]'>
+						<input type='hidden' name='TOS' value='$tosruleline[2]'>
+						<input type='hidden' name='DOTOS' value='Bearbeiten'>
+						<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+					</form>
+					<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+						<input type='hidden' name='CLASS' value='$tosruleline[0]'>
+						<input type='hidden' name='DEV' value='$tosruleline[1]'>
+						<input type='hidden' name='TOS' value='$tosruleline[2]'>
+						<input type='hidden' name='DOTOS' value='Loeschen'>
+						<input type='image' alt='Loeschen' src='/images/delete.gif'>
+					</form>
+				    </table>
+END
+;
+	  		}
+	  	}
+		print <<END
+		<tr><td colspan='8' align='right' valign='middle'><b>Legende:</b>&nbsp;&nbsp;<img src='/images/edit.gif'>&nbsp;Regel bearbeiten | <img src='/images/delete.gif'>&nbsp;Regel loeschen &nbsp;
+		</table>
+END
+;
+		&Header::closebox();
+	}
+}
+
 sub expert
 {
 	&Header::openbox('100%', 'center', 'Expertenoptionen:');
 	print <<END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<!--		<table width='66%'>
-		<tr><td width='100%' colspan='3'>Diese Einstellungen sollten sie nur veraendern, wenn sie wirklich wissen, was sie tun.
-		<tr><td width='33%' align='right'>Download-Rate 90\%:<td width='33%' align='left'>
-			<input type='text' name='DEF_INC_SPD' maxlength='8' required='4' value=$qossettings{'DEF_INC_SPD'}>
-		    <td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>Upload-Rate 90\%:<td width='33%' align='left'>
-			<input type='text' name='DEF_OUT_SPD' maxlength='8' required='4' value=$qossettings{'DEF_OUT_SPD'}>
-		    <td width='33%' align='center'>&nbsp;
-		</table>
-		<hr> -->
 		<table width='66%'>
 		<tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
 			<input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'}>
@@ -1405,7 +1646,7 @@ sub gengraph {
 
 	RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
 		"--start", "-3240", "-aPNG", "-i", "-z",
-		"--alt-y-grid", "-w 800", "-h 150", "-r",
+		"--alt-y-grid", "-w 600", "-h 150", "-r",
 		"--color", "SHADEA#EAE9EE",
 		"--color", "SHADEB#EAE9EE",
 		"--color", "BACK#FFFFFF",
@@ -1425,7 +1666,7 @@ sub gengraph {
 
 	RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png",
 		"--start", "-3240", "-aPNG", "-i", "-z",
-		"--alt-y-grid", "-w 800", "-h 150", "-r",
+		"--alt-y-grid", "-w 600", "-h 150", "-r",
 		"--color", "SHADEA#EAE9EE",
 		"--color", "SHADEB#EAE9EE",
 		"--color", "BACK#FFFFFF",
@@ -1445,7 +1686,7 @@ sub gengraph {
 
 	RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png",
 		"--start", "-3240", "-aPNG", "-i", "-z",
-		"--alt-y-grid", "-w 800", "-h 150", "-r",
+		"--alt-y-grid", "-w 600", "-h 150", "-r",
 		"--color", "SHADEA#EAE9EE",
 		"--color", "SHADEB#EAE9EE",
 		"--color", "BACK#FFFFFF",
diff --git a/lfs/applejuice b/lfs/applejuice
index ac9a06bc2b..f1f973d53d 100644
--- a/lfs/applejuice
+++ b/lfs/applejuice
@@ -79,7 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
 	cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
-	cd $(DIR_APP) && cp -rfv phpaj /opt/lampp/htdocs
+	mkdir -p /home/httpd/phpaj
+	cd $(DIR_APP) && cp -rfv phpaj /home/httpd/phpaj
 	-mkdir /var/ipfire/applejuice
 	echo "RAMSIZE=64" > /var/ipfire/applejuice/settings
 	chown nobody.nobody /var/ipfire/applejuice -R
diff --git a/lfs/configroot b/lfs/configroot
index f3f4041752..ad89fdfb23 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -63,7 +63,7 @@ $(TARGET) :
 	    isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
 	    portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
 	    ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
-	    snort/settings vpn/config vpn/settings vpn/ipsec.conf \
+	    qos/tosconfig snort/settings vpn/config vpn/settings vpn/ipsec.conf \
 	    vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
 	        touch $(CONFIG_ROOT)/$$i; \
 	done
diff --git a/lfs/mysql b/lfs/mysql
index 9a716a4315..5f87c2f2db 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /srv/mysql
 	mysql_install_db --user=mysql --force
 	chgrp -v mysql /srv/mysql{,/test,/mysql}
+	chown mysql.mysql /srv/mysql/
 	install -v -m755 -o mysql -g mysql -d /var/run/mysql
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index eb03634650..286bd33277 100644
--- a/make.sh
+++ b/make.sh
@@ -608,6 +608,8 @@ buildipcop() {
   ipcopmake openldap
   ipcopmake apache2
   ipcopmake php
+  ipcopmake subversion
+  ipcopmake apache2 PASS=CONFIG
   ipcopmake arping
   ipcopmake beep
   ipcopmake bind
@@ -757,11 +759,9 @@ buildipcop() {
   ipcopmake etherwake
   ipcopmake ethereal
   ipcopmake tftp-hpa
-  ipcopmake subversion
   ipcopmake iptraf
   ipcopmake nagios
   ipcopmake yasuc
-  ipcopmake apache2 PASS=CONFIG
 }
 
 buildinstaller() {
diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c
index 37cfab6405..05cb5eed75 100644
--- a/src/misc-progs/qosctrl.c
+++ b/src/misc-progs/qosctrl.c
@@ -44,7 +44,7 @@ int main(int argc, char *argv[]) {
 	} else if (strcmp(argv[1], "restart") == 0) {
 		safe_system("/var/ipfire/qos/bin/qos.sh restart");
 	} else if (strcmp(argv[1], "generate") == 0) {
-		safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh 2>/dev/null");
+		safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh");
 	} else {
 		fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
 		exit(1);
diff --git a/src/paks/applejuice/ROOTFILES b/src/paks/applejuice/ROOTFILES
index 69de845d31..82fc43f2ad 100644
--- a/src/paks/applejuice/ROOTFILES
+++ b/src/paks/applejuice/ROOTFILES
@@ -2,136 +2,136 @@ etc/init.d/applejuice
 opt/applejuice
 opt/applejuice/ajcore.jar
 opt/applejuice/libajnetmask.so
-opt/lampp/htdocs/phpaj
-opt/lampp/htdocs/phpaj/export
-opt/lampp/htdocs/phpaj/export/Default.php
-opt/lampp/htdocs/phpaj/export/ajl.php
-opt/lampp/htdocs/phpaj/export/bb.php
-opt/lampp/htdocs/phpaj/export/html.php
-opt/lampp/htdocs/phpaj/index.php
-opt/lampp/htdocs/phpaj/language
-opt/lampp/htdocs/phpaj/language/deutsch.xml
-opt/lampp/htdocs/phpaj/language/english.xml
-opt/lampp/htdocs/phpaj/main
-opt/lampp/htdocs/phpaj/main/classes
-opt/lampp/htdocs/phpaj/main/classes/class_core.php
-opt/lampp/htdocs/phpaj/main/classes/class_downloads.php
-opt/lampp/htdocs/phpaj/main/classes/class_icons.php
-opt/lampp/htdocs/phpaj/main/classes/class_search.php
-opt/lampp/htdocs/phpaj/main/classes/class_server.php
-opt/lampp/htdocs/phpaj/main/classes/class_share.php
-opt/lampp/htdocs/phpaj/main/classes/class_uploads.php
-opt/lampp/htdocs/phpaj/main/directory.php
-opt/lampp/htdocs/phpaj/main/dl_parts.php
-opt/lampp/htdocs/phpaj/main/dl_users.php
-opt/lampp/htdocs/phpaj/main/downloads.php
-opt/lampp/htdocs/phpaj/main/extras.php
-opt/lampp/htdocs/phpaj/main/index.php
-opt/lampp/htdocs/phpaj/main/progressbar.php
-opt/lampp/htdocs/phpaj/main/search.php
-opt/lampp/htdocs/phpaj/main/server.php
-opt/lampp/htdocs/phpaj/main/settings.php
-opt/lampp/htdocs/phpaj/main/shareexport.php
-opt/lampp/htdocs/phpaj/main/sharefiles.php
-opt/lampp/htdocs/phpaj/main/shares.php
-opt/lampp/htdocs/phpaj/main/showparts.php
-opt/lampp/htdocs/phpaj/main/start.php
-opt/lampp/htdocs/phpaj/main/status.php
-opt/lampp/htdocs/phpaj/main/subs.php
-opt/lampp/htdocs/phpaj/main/top.php
-opt/lampp/htdocs/phpaj/main/uploads.php
-opt/lampp/htdocs/phpaj/minigui
-opt/lampp/htdocs/phpaj/minigui/downloads.php
-opt/lampp/htdocs/phpaj/minigui/index.php
-opt/lampp/htdocs/phpaj/minigui/minigui.php
-opt/lampp/htdocs/phpaj/plugins
-opt/lampp/htdocs/phpaj/plugins/ajl
-opt/lampp/htdocs/phpaj/plugins/ajl/ajl.php
-opt/lampp/htdocs/phpaj/plugins/ajl/icon.gif
-opt/lampp/htdocs/phpaj/plugins/ajl/info.php
-opt/lampp/htdocs/phpaj/plugins/register.php
-opt/lampp/htdocs/phpaj/plugins/sharestats
-opt/lampp/htdocs/phpaj/plugins/sharestats/info.php
-opt/lampp/htdocs/phpaj/plugins/sharestats/sharestats.php
-opt/lampp/htdocs/phpaj/plugins/versionchecker
-opt/lampp/htdocs/phpaj/plugins/versionchecker/info.php
-opt/lampp/htdocs/phpaj/plugins/versionchecker/versionchecker.php
-opt/lampp/htdocs/phpaj/plugins/wizard
-opt/lampp/htdocs/phpaj/plugins/wizard/icon.gif
-opt/lampp/htdocs/phpaj/plugins/wizard/info.php
-opt/lampp/htdocs/phpaj/plugins/wizard/wizard.php
-opt/lampp/htdocs/phpaj/plugins/wizard/wizard.xml
-opt/lampp/htdocs/phpaj/style
-opt/lampp/htdocs/phpaj/style/default
-opt/lampp/htdocs/phpaj/style/default/default_blue.css
-opt/lampp/htdocs/phpaj/style/default/default_green.css
-opt/lampp/htdocs/phpaj/style/default/default_grey.css
-opt/lampp/htdocs/phpaj/style/default/info.png
-opt/lampp/htdocs/phpaj/style/default/minus.png
-opt/lampp/htdocs/phpaj/style/default/os
-opt/lampp/htdocs/phpaj/style/default/os/bsd.png
-opt/lampp/htdocs/phpaj/style/default/os/linux.png
-opt/lampp/htdocs/phpaj/style/default/os/mac.png
-opt/lampp/htdocs/phpaj/style/default/os/na.png
-opt/lampp/htdocs/phpaj/style/default/os/netware.png
-opt/lampp/htdocs/phpaj/style/default/os/os2.png
-opt/lampp/htdocs/phpaj/style/default/os/solaris.png
-opt/lampp/htdocs/phpaj/style/default/os/win.png
-opt/lampp/htdocs/phpaj/style/default/plus.png
-opt/lampp/htdocs/phpaj/style/default/server
-opt/lampp/htdocs/phpaj/style/default/server/alt.gif
-opt/lampp/htdocs/phpaj/style/default/server/neu.gif
-opt/lampp/htdocs/phpaj/style/default/server/verbinde.gif
-opt/lampp/htdocs/phpaj/style/default/server/verbunden.gif
-opt/lampp/htdocs/phpaj/style/default/stop.png
-opt/lampp/htdocs/phpaj/style/default/tabs
-opt/lampp/htdocs/phpaj/style/default/tabs/download.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/extras.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/kill.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/logout.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/meinshare.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/optionen.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/server.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/start.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/suchen.gif
-opt/lampp/htdocs/phpaj/style/default/tabs/upload.gif
-opt/lampp/htdocs/phpaj/style/default/user
-opt/lampp/htdocs/phpaj/style/default/user/direct.png
-opt/lampp/htdocs/phpaj/style/default/user/indirect.png
-opt/lampp/htdocs/phpaj/style/default/user/tryindirect.png
-opt/lampp/htdocs/phpaj/style/default/user/unknown.png
-opt/lampp/htdocs/phpaj/style/default/warnung.gif
-opt/lampp/htdocs/phpaj/style/default/x.png
-opt/lampp/htdocs/phpaj/style/default_blue.php
-opt/lampp/htdocs/phpaj/style/default_green.php
-opt/lampp/htdocs/phpaj/style/default_grey.php
-opt/lampp/htdocs/phpaj/style/new
-opt/lampp/htdocs/phpaj/style/new.php
-opt/lampp/htdocs/phpaj/style/new/bg.png
-opt/lampp/htdocs/phpaj/style/new/new.css
-opt/lampp/htdocs/phpaj/style/tango
-opt/lampp/htdocs/phpaj/style/tango.php
-opt/lampp/htdocs/phpaj/style/tango/bg.png
-opt/lampp/htdocs/phpaj/style/tango/icons
-opt/lampp/htdocs/phpaj/style/tango/icons/direct.png
-opt/lampp/htdocs/phpaj/style/tango/icons/down.png
-opt/lampp/htdocs/phpaj/style/tango/icons/empty.png
-opt/lampp/htdocs/phpaj/style/tango/icons/extras.png
-opt/lampp/htdocs/phpaj/style/tango/icons/home.png
-opt/lampp/htdocs/phpaj/style/tango/icons/indirect.png
-opt/lampp/htdocs/phpaj/style/tango/icons/info.png
-opt/lampp/htdocs/phpaj/style/tango/icons/kill.png
-opt/lampp/htdocs/phpaj/style/tango/icons/logout.png
-opt/lampp/htdocs/phpaj/style/tango/icons/minus.png
-opt/lampp/htdocs/phpaj/style/tango/icons/plus.png
-opt/lampp/htdocs/phpaj/style/tango/icons/preferences.png
-opt/lampp/htdocs/phpaj/style/tango/icons/search.png
-opt/lampp/htdocs/phpaj/style/tango/icons/server.png
-opt/lampp/htdocs/phpaj/style/tango/icons/share.png
-opt/lampp/htdocs/phpaj/style/tango/icons/stop.png
-opt/lampp/htdocs/phpaj/style/tango/icons/up.png
-opt/lampp/htdocs/phpaj/style/tango/icons/warning.png
-opt/lampp/htdocs/phpaj/style/tango/icons/x.png
-opt/lampp/htdocs/phpaj/style/tango/tango.css
-opt/lampp/htdocs/phpaj/vars.php
+home/httpd/phpaj
+home/httpd/phpaj/export
+home/httpd/phpaj/export/Default.php
+home/httpd/phpaj/export/ajl.php
+home/httpd/phpaj/export/bb.php
+home/httpd/phpaj/export/html.php
+home/httpd/phpaj/index.php
+home/httpd/phpaj/language
+home/httpd/phpaj/language/deutsch.xml
+home/httpd/phpaj/language/english.xml
+home/httpd/phpaj/main
+home/httpd/phpaj/main/classes
+home/httpd/phpaj/main/classes/class_core.php
+home/httpd/phpaj/main/classes/class_downloads.php
+home/httpd/phpaj/main/classes/class_icons.php
+home/httpd/phpaj/main/classes/class_search.php
+home/httpd/phpaj/main/classes/class_server.php
+home/httpd/phpaj/main/classes/class_share.php
+home/httpd/phpaj/main/classes/class_uploads.php
+home/httpd/phpaj/main/directory.php
+home/httpd/phpaj/main/dl_parts.php
+home/httpd/phpaj/main/dl_users.php
+home/httpd/phpaj/main/downloads.php
+home/httpd/phpaj/main/extras.php
+home/httpd/phpaj/main/index.php
+home/httpd/phpaj/main/progressbar.php
+home/httpd/phpaj/main/search.php
+home/httpd/phpaj/main/server.php
+home/httpd/phpaj/main/settings.php
+home/httpd/phpaj/main/shareexport.php
+home/httpd/phpaj/main/sharefiles.php
+home/httpd/phpaj/main/shares.php
+home/httpd/phpaj/main/showparts.php
+home/httpd/phpaj/main/start.php
+home/httpd/phpaj/main/status.php
+home/httpd/phpaj/main/subs.php
+home/httpd/phpaj/main/top.php
+home/httpd/phpaj/main/uploads.php
+home/httpd/phpaj/minigui
+home/httpd/phpaj/minigui/downloads.php
+home/httpd/phpaj/minigui/index.php
+home/httpd/phpaj/minigui/minigui.php
+home/httpd/phpaj/plugins
+home/httpd/phpaj/plugins/ajl
+home/httpd/phpaj/plugins/ajl/ajl.php
+home/httpd/phpaj/plugins/ajl/icon.gif
+home/httpd/phpaj/plugins/ajl/info.php
+home/httpd/phpaj/plugins/register.php
+home/httpd/phpaj/plugins/sharestats
+home/httpd/phpaj/plugins/sharestats/info.php
+home/httpd/phpaj/plugins/sharestats/sharestats.php
+home/httpd/phpaj/plugins/versionchecker
+home/httpd/phpaj/plugins/versionchecker/info.php
+home/httpd/phpaj/plugins/versionchecker/versionchecker.php
+home/httpd/phpaj/plugins/wizard
+home/httpd/phpaj/plugins/wizard/icon.gif
+home/httpd/phpaj/plugins/wizard/info.php
+home/httpd/phpaj/plugins/wizard/wizard.php
+home/httpd/phpaj/plugins/wizard/wizard.xml
+home/httpd/phpaj/style
+home/httpd/phpaj/style/default
+home/httpd/phpaj/style/default/default_blue.css
+home/httpd/phpaj/style/default/default_green.css
+home/httpd/phpaj/style/default/default_grey.css
+home/httpd/phpaj/style/default/info.png
+home/httpd/phpaj/style/default/minus.png
+home/httpd/phpaj/style/default/os
+home/httpd/phpaj/style/default/os/bsd.png
+home/httpd/phpaj/style/default/os/linux.png
+home/httpd/phpaj/style/default/os/mac.png
+home/httpd/phpaj/style/default/os/na.png
+home/httpd/phpaj/style/default/os/netware.png
+home/httpd/phpaj/style/default/os/os2.png
+home/httpd/phpaj/style/default/os/solaris.png
+home/httpd/phpaj/style/default/os/win.png
+home/httpd/phpaj/style/default/plus.png
+home/httpd/phpaj/style/default/server
+home/httpd/phpaj/style/default/server/alt.gif
+home/httpd/phpaj/style/default/server/neu.gif
+home/httpd/phpaj/style/default/server/verbinde.gif
+home/httpd/phpaj/style/default/server/verbunden.gif
+home/httpd/phpaj/style/default/stop.png
+home/httpd/phpaj/style/default/tabs
+home/httpd/phpaj/style/default/tabs/download.gif
+home/httpd/phpaj/style/default/tabs/extras.gif
+home/httpd/phpaj/style/default/tabs/kill.gif
+home/httpd/phpaj/style/default/tabs/logout.gif
+home/httpd/phpaj/style/default/tabs/meinshare.gif
+home/httpd/phpaj/style/default/tabs/optionen.gif
+home/httpd/phpaj/style/default/tabs/server.gif
+home/httpd/phpaj/style/default/tabs/start.gif
+home/httpd/phpaj/style/default/tabs/suchen.gif
+home/httpd/phpaj/style/default/tabs/upload.gif
+home/httpd/phpaj/style/default/user
+home/httpd/phpaj/style/default/user/direct.png
+home/httpd/phpaj/style/default/user/indirect.png
+home/httpd/phpaj/style/default/user/tryindirect.png
+home/httpd/phpaj/style/default/user/unknown.png
+home/httpd/phpaj/style/default/warnung.gif
+home/httpd/phpaj/style/default/x.png
+home/httpd/phpaj/style/default_blue.php
+home/httpd/phpaj/style/default_green.php
+home/httpd/phpaj/style/default_grey.php
+home/httpd/phpaj/style/new
+home/httpd/phpaj/style/new.php
+home/httpd/phpaj/style/new/bg.png
+home/httpd/phpaj/style/new/new.css
+home/httpd/phpaj/style/tango
+home/httpd/phpaj/style/tango.php
+home/httpd/phpaj/style/tango/bg.png
+home/httpd/phpaj/style/tango/icons
+home/httpd/phpaj/style/tango/icons/direct.png
+home/httpd/phpaj/style/tango/icons/down.png
+home/httpd/phpaj/style/tango/icons/empty.png
+home/httpd/phpaj/style/tango/icons/extras.png
+home/httpd/phpaj/style/tango/icons/home.png
+home/httpd/phpaj/style/tango/icons/indirect.png
+home/httpd/phpaj/style/tango/icons/info.png
+home/httpd/phpaj/style/tango/icons/kill.png
+home/httpd/phpaj/style/tango/icons/logout.png
+home/httpd/phpaj/style/tango/icons/minus.png
+home/httpd/phpaj/style/tango/icons/plus.png
+home/httpd/phpaj/style/tango/icons/preferences.png
+home/httpd/phpaj/style/tango/icons/search.png
+home/httpd/phpaj/style/tango/icons/server.png
+home/httpd/phpaj/style/tango/icons/share.png
+home/httpd/phpaj/style/tango/icons/stop.png
+home/httpd/phpaj/style/tango/icons/up.png
+home/httpd/phpaj/style/tango/icons/warning.png
+home/httpd/phpaj/style/tango/icons/x.png
+home/httpd/phpaj/style/tango/tango.css
+home/httpd/phpaj/vars.php
 var/ipfire/applejuice
\ No newline at end of file
-- 
2.39.2