]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/qos.cgi
QOS: IP-Addresses can now be simple IP-Address or IP-Address and subnet
[people/teissler/ipfire-2.x.git] / html / cgi-bin / qos.cgi
index 396f88195fe2df74c7b871b6c1c7a16dd4149e2c..6d4d025bfdbc228283fe472127bcf3d521e61394 100644 (file)
@@ -1,17 +1,29 @@
 #!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use RRDs;
 use strict;
 # enable only the following on debugging purpose
 # use warnings;
-use CGI::Carp 'fatalsToBrowser';
+use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -52,8 +64,6 @@ my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-&Header::showhttpheaders();
-
 $qossettings{'ENABLED'} = 'off';
 $qossettings{'EDIT'} = 'no';
 $qossettings{'OUT_SPD'} = '';
@@ -63,10 +73,7 @@ $qossettings{'DEF_INC_SPD'} = '';
 $qossettings{'DEFCLASS_INC'} = '';
 $qossettings{'DEFCLASS_OUT'} = '';
 $qossettings{'ACK'} = '';
-$qossettings{'MTU'} = '1492';
-$qossettings{'SFQ_PERTUB'} = '10';
-$qossettings{'QLENGTH'} = '30';
-$qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
+$qossettings{'RED_DEV'} = 'ppp0';
 $qossettings{'IMQ_DEV'} = 'imq0';
 $qossettings{'VALID'} = 'yes';
 ### Values that have to be initialized
@@ -103,13 +110,26 @@ $qossettings{'TOS'} = '';
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 &Header::getcgihash(\%qossettings);
 
+$qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
+
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
-&Header::openpage('QoS', 1, '');
-&Header::openbigbox('100%', 'left', '', $errormessage);
+my @querry = split(/\?/,$ENV{'QUERY_STRING'});
+$querry[0] = '' unless defined $querry[0];
+$querry[1] = 'hour' unless defined $querry[1];
+
+if ( $querry[0] ne ""){
+       print "Content-type: image/png\n\n";
+       binmode(STDOUT);
+       &Graphs::updateqosgraph($querry[0],$querry[1]);
+}else{
+       &Header::showhttpheaders();
+
+       &Header::openpage('QoS', 1, '');
+       &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
 ############################################################################################################################
@@ -127,10 +147,10 @@ END
 ;
                close FILE;
        } else {
-               $qossettings{'ACTION'} = 'Parentklasse hinzufuegen';
+               $qossettings{'ACTION'} = $Lang::tr{'parentclass add'};
        }
 }
-elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten')
+elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'edit'})
 {
        open( FILE, "< $classfile" ) or die "Unable to read $classfile";
        @classes = <FILE>;
@@ -159,7 +179,7 @@ elsif ($qossettings{'DOCLASS'} eq 'Bearbeiten')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'DOCLASS'} eq 'Loeschen')
+elsif ($qossettings{'DOCLASS'} eq $Lang::tr{'delete'})
 {
        open( FILE, "< $classfile" ) or die "Unable to read $classfile";
        @tmp = <FILE>;
@@ -205,9 +225,9 @@ END
 ;
                close FILE;
        } else {
-               $qossettings{'ACTION'} = 'Unterklasse hinzufuegen';
+               $qossettings{'ACTION'} = $Lang::tr{'qos add subclass'};
        }
-} elsif ($qossettings{'DOSCLASS'} eq 'Loeschen')
+} elsif ($qossettings{'DOSCLASS'} eq $Lang::tr{'delete'})
 {
        open( FILE, "< $subclassfile" ) or die "Unable to read $classfile";
        @tmp = <FILE>;
@@ -231,15 +251,29 @@ END
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
-                       $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+               if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+                       if (! &General::validipandmask($qossettings{'QIP'}) ) {
+                               $qossettings{'VALID'} = 'no';
+                               $message = $Lang::tr{'The source IP address is invalid.'};
+                       }
+               }else{
+                       if ( &General::validip($qossettings{'QIP'}) ) {
+                               $qossettings{'VALID'} = 'no';
+                               $message = $Lang::tr{'The source IP address is invalid.'};
+                       }
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
-                       $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+               if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
+                       if ( &General::validipandmask($qossettings{'DIP'}) ) {
+                               $qossettings{'VALID'} = 'no';
+                               $message = $Lang::tr{'The destination IP address is invalid.'};
+                       }
+               }else{
+                       if ( &General::validip($qossettings{'DIP'}) ) {
+                               $qossettings{'VALID'} = 'no';
+                               $message = $Lang::tr{'The destination IP address is invalid.'};
+                       }
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -259,9 +293,9 @@ END
 ;
                close FILE;
        } else {
-               $qossettings{'ACTION'} = 'Level7-Regel hinzufuegen';
+               $qossettings{'ACTION'} = $Lang::tr{'Add Level7 rule'};
        }
-} elsif ($qossettings{'DOLEVEL7'} eq 'Loeschen')
+} elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'delete'})
 {
        open( FILE, "< $level7file" ) or die "Unable to read $level7file";
        @l7rules = <FILE>;
@@ -271,7 +305,7 @@ END
        {
                @l7ruleline = split( /\;/, $l7ruleentry );
                if ( ($l7ruleline[0] eq $qossettings{'CLASS'}) && ($l7ruleline[2] eq $qossettings{'L7PROT'}))
-            {$message = "Level7-Regel ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) wurde geloescht.";}
+            {$message = "$Lang::tr{'Level7 Rule'} ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) $Lang::tr{'was deleted'}.";}
       else
         { open( FILE, ">> $level7file" ) or die "Unable to read $level7file";
           print FILE $l7ruleentry;
@@ -279,7 +313,7 @@ END
         }
          }
        open( FILE, "< $level7file" ) or system("touch $level7file");close FILE;
-       } elsif ($qossettings{'DOLEVEL7'} eq 'Bearbeiten')
+       } elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'edit'})
 {
        open( FILE, "< $level7file" ) or die "Unable to read $level7file";
        @l7rules = <FILE>;
@@ -306,15 +340,15 @@ END
 if ($qossettings{'DOPORT'} eq $Lang::tr{'save'})
 {
        if ( $qossettings{'QIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'QIP'}) ) { 
+               unless ( &General::validip($qossettings{'QIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Quell-IP-Adresse ist ungueltig."; 
+                       $message = "$Lang::tr{'The source IP address is invalid.'}";
                }
        }
        if ( $qossettings{'DIP'} ne '' ) {
-               unless ( &General::validip($qossettings{'DIP'}) ) { 
+               unless ( &General::validip($qossettings{'DIP'}) ) {
                        $qossettings{'VALID'} = 'no';
-                       $message = "Die Ziel-IP-Adresse ist ungueltig."; 
+                       $message = "$Lang::tr{'The destination IP address is invalid.'}";
                }
        }
        if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -334,9 +368,9 @@ END
 ;
                close FILE;
        } else {
-               $qossettings{'ACTION'} = 'Port-Regel hinzufuegen';
+               $qossettings{'ACTION'} = $Lang::tr{'Add Port Rule'};
        }
-} elsif ($qossettings{'DOPORT'} eq 'Loeschen')
+} elsif ($qossettings{'DOPORT'} eq $Lang::tr{'delete'})
 {
        open( FILE, "< $portfile" ) or die "Unable to read $portfile";
        @portrules = <FILE>;
@@ -352,7 +386,7 @@ END
        }
        close FILE;
        $message = "$Lang::tr{'Port Rule'} ($qossettings{'CLASS'} - $qossettings{'PPROT'}) $Lang::tr{'was deleted'}.";
-}  elsif ($qossettings{'DOPORT'} eq 'Bearbeiten')
+}  elsif ($qossettings{'DOPORT'} eq $Lang::tr{'edit'})
 {
        open( FILE, "< $portfile" ) or die "Unable to read $portfile";
        @portrules = <FILE>;
@@ -393,7 +427,7 @@ $qossettings{'CLASS'};$qossettings{'DEVICE'};$qossettings{'TOS'};
 END
 ;
        close FILE;
-} 
+}
 elsif ($qossettings{'DOTOS'} eq 'Loeschen')
 {
        open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
@@ -410,7 +444,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen')
        }
        close FILE;
        $message = "$Lang::tr{'TOS Rule'} ($qossettings{'CLASS'} - $qossettings{'TOS'}) $Lang::tr{'was deleted'}.";
-} elsif ($qossettings{'DOTOS'} eq 'Bearbeiten')
+} elsif ($qossettings{'DOTOS'} eq $Lang::tr{'edit'})
 {
        open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
        @tosrules = <FILE>;
@@ -438,16 +472,16 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen')
 ############################################################################################################################
 ############################################################################################################################
 
-if ($qossettings{'ACTION'} eq 'Start')
+if ($qossettings{'ACTION'} eq $Lang::tr{'start'})
 {
+       $qossettings{'ENABLED'} = 'on';
+       &General::writehash("${General::swroot}/qos/settings", \%qossettings);
        system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
        system("/usr/bin/touch /var/ipfire/qos/enable");
        system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
        system("logger -t ipfire 'QoS started'");
-       $qossettings{'ENABLED'} = 'on';
-       &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
-elsif ($qossettings{'ACTION'} eq 'Stop')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'})
 {
        system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
        unlink "/var/ipfire/qos/bin/qos.sh";
@@ -456,7 +490,7 @@ elsif ($qossettings{'ACTION'} eq 'Stop')
        $qossettings{'ENABLED'} = 'off';
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
-elsif ($qossettings{'ACTION'} eq 'Neustart')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'})
 {
        if ($qossettings{'ENABLED'} eq 'on'){
                system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
@@ -475,7 +509,106 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
        }
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
-elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
+{
+       if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) {
+               my @UP;
+               #print "UP<br />";
+               for(my $i = 1; $i <= 10; $i++) {
+               $UP[$i] = int($qossettings{'OUT_SPD'} / $i );
+               #print $i."=".$UP[$i]." ";
+               }
+               my @DOWN;
+               #print "<br /><br />Down<br />";
+               for(my $i = 1; $i <= 20; $i++) {
+               $DOWN[$i] = int($qossettings{'INC_SPD'} / $i);
+               #print $i."=".$DOWN[$i]." ";
+               }
+               open( FILE, "> $classfile" ) or die "Unable to write $classfile";
+               print FILE <<END
+imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP;
+imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
+imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
+imq0;210;6;1;$DOWN[1];;;0;Default;
+imq0;220;7;1;$DOWN[1];;;1;P2P;
+$qossettings{'RED_DEV'};101;1;$UP[2];$UP[1];;;8;ACKs;
+$qossettings{'RED_DEV'};102;2;$UP[3];$UP[1];;;8;VoIP;
+$qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic;
+$qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default;
+$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
+$qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
+END
+;
+               close FILE;
+               open( FILE, "> $level7file" ) or die "Unable to write $level7file";
+               print FILE <<END
+102;$qossettings{'RED_DEV'};dns;;;
+102;$qossettings{'RED_DEV'};rtp;;;
+102;$qossettings{'RED_DEV'};skypetoskype;;;
+103;$qossettings{'RED_DEV'};ssh;;;
+103;$qossettings{'RED_DEV'};rdp;;;
+104;$qossettings{'RED_DEV'};http;;;
+104;$qossettings{'RED_DEV'};ssl;;;
+104;$qossettings{'RED_DEV'};pop3;;;
+120;$qossettings{'RED_DEV'};applejuice;;;
+120;$qossettings{'RED_DEV'};bittorrent;;;
+200;imq0;rtp;;;
+200;imq0;skypetoskype;;;
+203;imq0;ssh;;;
+203;imq0;rdp;;;
+204;imq0;http;;;
+204;imq0;pop3;;;
+204;imq0;ssl;;;
+220;imq0;applejuice;;;
+220;imq0;bittorrent;;;
+END
+;
+               close FILE;
+               open( FILE, "> $portfile" ) or die "Unable to write $portfile";
+               print FILE <<END
+101;$qossettings{'RED_DEV'};icmp;;;;;
+102;$qossettings{'RED_DEV'};tcp;;;;53;
+102;$qossettings{'RED_DEV'};udp;;;;53;
+103;$qossettings{'RED_DEV'};esp;;;;;
+103;$qossettings{'RED_DEV'};tcp;;1194;;;
+103;$qossettings{'RED_DEV'};udp;;1194;;;
+103;$qossettings{'RED_DEV'};tcp;;;;1194;
+103;$qossettings{'RED_DEV'};udp;;;;1194;
+103;$qossettings{'RED_DEV'};udp;;4500;;4500;
+103;$qossettings{'RED_DEV'};udp;;500;;500;
+104;$qossettings{'RED_DEV'};tcp;;;;80;
+200;imq0;icmp;;;;;
+203;imq0;esp;;;;;
+203;imq0;tcp;;;;1194;
+203;imq0;udp;;;;1194;
+203;imq0;tcp;;1194;;;
+203;imq0;udp;;1194;;;
+203;imq0;udp;;4500;;4500;
+203;imq0;udp;;500;;500;
+204;imq0;tcp;;80;;;
+END
+;
+               close FILE;
+               if ($qossettings{'DEF_INC_SPD'} eq '') {
+                       $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9);
+               }
+               if ($qossettings{'DEF_OUT_SPD'} eq '') {
+                       $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9);
+               }
+               $qossettings{'DEFCLASS_INC'} = "210";
+               $qossettings{'DEFCLASS_OUT'} = "110";
+               $qossettings{'ACK'} ="101";
+               $qossettings{'ENABLED'} = 'on';
+               &General::writehash("${General::swroot}/qos/settings", \%qossettings);
+               system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+               system("/usr/bin/touch /var/ipfire/qos/enable");
+               system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
+               system("logger -t ipfire 'QoS started'");
+       } else {
+               $message = $Lang::tr{'qos enter bandwidths'};
+       }
+}
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
 {
        &Header::openbox('100%', 'left', 'QoS Status');
        if ($qossettings{'ENABLED'} eq 'on'){
@@ -489,30 +622,30 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'parentclass add'} )
 {
        &parentclass();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Unterklasse hinzufuegen')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'qos add subclass'})
 {
        &subclass();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Regel hinzufuegen')
+elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'})
 {
        &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'});
        print <<END
                <table>
                <tr><td align='center'>$Lang::tr{'Choose Rule'}
                <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' />
+                       <input type="button" onClick="swapVisibility('l7rule')" value='$Lang::tr{'Level7 Rule'}' />
+                       <input type="button" onClick="swapVisibility('portrule')" value='$Lang::tr{'Port Rule'}' />
+                       <input type="button" onClick="swapVisibility('tosrule')" value='$Lang::tr{'TOS rule'}' />
                </table>
 END
 ;
@@ -542,21 +675,14 @@ END
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Erweiterte Einstellungen')
-{
-       &expert();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit
-}
-if ($qossettings{'ACTIONBW'} eq 'Andern')
+if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" )
 {
        &changebandwidth();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-if ($qossettings{'ACTIONDEF'} eq 'Andern')
+if ($qossettings{'ACTIONDEF'} eq "$Lang::tr{'modify'}" )
 {
        &changedefclasses();
        &Header::closebigbox();
@@ -587,7 +713,7 @@ if ($errormessage) {
 ############################################################################################################################
 ############################################################################################################################
 
-&Header::openbox('100%', 'center', 'Quality of Service');
+&Header::openbox('100%', 'center', );
 
 print <<END
   <form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -595,15 +721,18 @@ print <<END
 END
 ;
        if ( $message ne "" ) {
-               print "<tr><td colspan='2' align='center'><font color='red'>$message</font>";
+               print "<tr><td colspan='2' align='center'><font color='red'>$message</font></tr>";
        }
        print <<END
-               <tr><td width='50%' align='left'><b>Quality of Service:</b>
-                   <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font>
-               <tr><td width='100%' align='center' colspan='2'>
-               <input type='submit' name='ACTION' value="Start" /> 
-               <input type='submit' name='ACTION' value="Stop" /> 
-               <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
+               <tr><td width='50%' align='left'><b>Quality of Service:</b></td>
+                   <td width='50%' align='center' bgcolor='$statuscolor'><font color='white'>$status</font></td></tr>
+                   <tr>
+                               <td colspan='2'><br></td>
+                       </tr>
+               <tr><td width='100%' align='right' colspan='2'>
+               <input type='submit' name='ACTION' value="$Lang::tr{'start'}">
+               <input type='submit' name='ACTION' value="$Lang::tr{'stop'}">
+               <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" ></td></tr></table></form>
 END
 ;
        if (($qossettings{'OUT_SPD'} ne '') && ($qossettings{'INC_SPD'} ne '')) {
@@ -611,9 +740,9 @@ END
     <form method='post' action='$ENV{'SCRIPT_NAME'}'>
          <table width='66%'>
                <tr><td colspan='3'>&nbsp;
-               <tr><td width='40%' align='right'>$Lang::tr{'downlink speed'}:  <td width='40%' align='left'>$qossettings{'INC_SPD'} kbps
-                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='Andern' />
-               <tr><td width='40%' align='right'>$Lang::tr{'uplink speed'}:    <td width='40%' align='left'>$qossettings{'OUT_SPD'} kbps
+               <tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}:  <td width='30%' align='left'>$qossettings{'INC_SPD'}
+                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='$Lang::tr{'modify'}' />
+               <tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}:    <td width='30%' align='left'>$qossettings{'OUT_SPD'}
                </table></form>
 END
 ;
@@ -623,20 +752,20 @@ END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='66%'>
                <tr><td colspan='3'><hr />
-               <tr><td width='40%' align='right'>$Lang::tr{'downlink std class'}:      <td width='40%' align='left'>$qossettings{'DEFCLASS_INC'}       
-                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
-               <tr><td width='40%' align='right'>$Lang::tr{'uplink std class'}:        <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
-               <tr><td width='40%' align='right'>ACKs:                         <td width='40%' align='left'>$qossettings{'ACK'}
+               <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}
+                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='$Lang::tr{'modify'}' />
+               <tr><td width='50%' align='right'>$Lang::tr{'uplink std class'}:        <td width='30%' align='left'>$qossettings{'DEFCLASS_OUT'}
+               <tr><td width='50%' align='right'>ACKs:                         <td width='30%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr />
                <tr><td colspan='3' width='100%' align='center'>
                </table>
                </form>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table border='0' cellpadding='0' cellspacing='0'>
-                       <tr><td><input type='submit' name='ACTION' value='Parentklasse hinzufuegen' />
-                           <td><input type='submit' name='ACTION' value='Erweiterte Einstellungen' />
-                           <td><input type='submit' name='ACTION' value='Statusinformationen' />
-                       </tr></table>
+               <table width='66%' border='0'>
+                       <tr><td width='100%' align='center'>
+                            <input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
+                            <input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
+                       </td></tr></table>
        </form>
 END
 ;
@@ -657,28 +786,12 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
        exit
 }
 
-&Header::openbox('100%', 'center', $Lang::tr{'info'});
-&Graphs::overviewgraph("3240",$qossettings{'RED_DEV'});
-&Graphs::overviewgraph("3240",$qossettings{'IMQ_DEV'});
-print <<END
-       <table>
-               <tr><td colspan='9' align='center' valign='middle'><img alt="" src='/images/addblue.gif' />&nbsp;$Lang::tr{'add subclass'} | <img alt="" src='/images/addgreen.gif' />&nbsp;$Lang::tr{'Add Rule'} | <img alt="" src='/images/edit.gif' />&nbsp;$Lang::tr{'edit'} | <img alt="" src='/images/delete.gif' />&nbsp;$Lang::tr{'delete'} &nbsp;
-               <tr><td colspan='9' align='right' valign='middle'><b>$Lang::tr{'TOS Bits'}:</b>&nbsp;&nbsp;<b>0</b> - $Lang::tr{'disabled'} | <b>8</b> - $Lang::tr{'min delay'} | <b>4</b> - $Lang::tr{'max throughput'} | <b>2</b> - $Lang::tr{'max reliability'} | <b>1</b> - $Lang::tr{'min costs'} &nbsp;
-END
-;
-if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png")) {
-       print <<END
-               <tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'RED_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png" border='0' /></a></td></tr>
-               <tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'IMQ_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png" border='0' /></a></td></tr>
-END
-;}
-else 
-{
-print $Lang::tr{'no information available'};
-}
-print "\t</table>";
-
-&Header::closebox();
+       &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'}, $Lang::tr{'downlink'}");
+       &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
+       &Header::closebox();
 
 &showclasses($qossettings{'RED_DEV'});
 &showclasses($qossettings{'IMQ_DEV'});
@@ -686,6 +799,8 @@ print "\t</table>";
 &Header::closebigbox();
 &Header::closepage();
 
+}
+
 ############################################################################################################################
 ############################################################################################################################
 
@@ -695,18 +810,18 @@ sub changedefclasses {
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='66%'>
                <tr><td width='100%' colspan='3'>$Lang::tr{'no filter pass'}
-               <tr><td width='33%' align='right'>Download:<td width='33%' align='left'><select name='DEFCLASS_INC'>
+               <tr><td width='33%' align='right'>$Lang::tr{'download'}:<td width='33%' align='left'><select name='DEFCLASS_INC'>
 END
 ;
                for ( $c = 200 ; $c <= 220 ; $c++ )
                {
                        if ( $qossettings{'DEFCLASS_INC'} ne $c )
-                       { print "<option value='$c'>$c</option>\n"; } 
+                       { print "<option value='$c'>$c</option>\n"; }
                        else    { print "<option selected value='$c'>$c</option>\n"; }
                }
                print <<END
                </select><td width='33%' align='center'>&nbsp;
-               <tr><td width='33%' align='right'>Upload:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
+               <tr><td width='33%' align='right'>$Lang::tr{'upload'}:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
 END
 ;
                for ( $c = 100 ; $c <= 120 ; $c++ )
@@ -749,15 +864,15 @@ sub changebandwidth {
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='DEF_OUT_SPD' value='' /><input type='hidden' name='DEF_INC_SPD' value='' />
                <table width='66%'>
-               <tr><td width='100%' colspan='3'>$Lang::tr{'down and up speed'}
-               <tr><td width='33%' align='right'>$Lang::tr{'downlink speed'}:
-                   <td width='33%' align='left'><input type='text' name='INC_SPD' maxlength='8' value="$qossettings{'INC_SPD'}" /> &nbsp; kbps
-                   <td width='33%' align='center'>&nbsp;
-               <tr><td width='33%' align='right'>$Lang::tr{'uplink speed'}:
-                   <td width='33%' align='left'><input type='text' name='OUT_SPD' maxlength='8' value="$qossettings{'OUT_SPD'}" /> &nbsp; kbps
-                   <td width='33%' align='center'><input type='submit' name='ACTION' value="$Lang::tr{'save'}" />&nbsp;<input type='reset' name='ACTION' value="$Lang::tr{'reset'}" />
+               <tr><td width='100%' colspan='3'>$Lang::tr{'down and up speed'}</td></tr>
+               <tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}:</td>
+                               <td width='30%' align='left'><input type='text' name='INC_SPD' maxlength='8' value="$qossettings{'INC_SPD'}" /></td>
+                               <td width='20%' align='center' rowspan='2'><input type='submit' name='ACTION' value="$Lang::tr{'template'}" /><br /><input type='submit' name='ACTION' value="$Lang::tr{'save'}" /><br /><input type='reset' name='ACTION' value="$Lang::tr{'reset'}" /></td></tr>
+               <tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}:</td>
+                               <td width='30%' align='left'><input type='text' name='OUT_SPD' maxlength='8' value="$qossettings{'OUT_SPD'}" /></td></tr>
                </table>
                </form>
+               <font color='red'>$Lang::tr{'template warning'}</font>
 END
 ;
        }
@@ -774,7 +889,7 @@ END
        if ( $message ne "" ) {
                print "<tr><td colspan='3' align='center'>$message";
        }
-       if ( $qossettings{'EDIT'} eq 'yes' ) { 
+       if ( $qossettings{'EDIT'} eq 'yes' ) {
                print "<input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' />";
                print "<input type='hidden' name='DEVICE' value='$qossettings{'DEVICE'}' />";
        }
@@ -784,7 +899,7 @@ END
                    <td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='DEVICE' disabled>";
                } else {
                        print "<select name='DEVICE'>";
@@ -801,7 +916,7 @@ END
                <tr><td width='33%' align='right'>$Lang::tr{'Class'}:<td width='33%' align='left'>
 END
 ;
-               if ( $qossettings{'EDIT'} eq 'yes' ) { 
+               if ( $qossettings{'EDIT'} eq 'yes' ) {
                        print "<select name='CLASS' disabled>";
                } else {
                        print "<select name='CLASS'>";
@@ -846,13 +961,17 @@ END
                <tr><td width='33%' align='right'>Ceilburst:
                    <td width='33%' align='left'><input type='text' size='20' name='CBURST' maxlength='8' value="$qossettings{'CBURST'}" />
                    <td width='33%' align='center'>&nbsp;
+END
+;
+                       $selected{'TOS'}{$qossettings{'TOS'}} = "selected='selected'";
+print <<END
                <tr><td width='33%' align='right'>TOS-Bit:
                    <td width='33%' align='left'><select name='TOS'>
-                               <option value='0'>$Lang::tr{'disabled'} (0)</option>
-                               <option value='8'>$Lang::tr{'min delay'} (8)</option>
-                               <option value='4'>$Lang::tr{'max throughput'} (4)</option>
-                               <option value='2'>$Lang::tr{'max reliability'} (2)</option>
-                               <option value='1'>$Lang::tr{'min costs'} (1)</option></select>
+                               <option value='0' $selected{'TOS'}{'0'}>$Lang::tr{'disabled'} (0)</option>
+                               <option value='8' $selected{'TOS'}{'8'}>$Lang::tr{'min delay'} (8)</option>
+                               <option value='4' $selected{'TOS'}{'4'}>$Lang::tr{'max throughput'} (4)</option>
+                               <option value='2' $selected{'TOS'}{'2'}>$Lang::tr{'max reliability'} (2)</option>
+                               <option value='1' $selected{'TOS'}{'1'}>$Lang::tr{'min costs'} (1)</option></select>
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'remark'}:
                    <td width='66%' colspan='2' align='left'><input type='text' name='REMARK' size='40' maxlength='40' value="$qossettings{'REMARK'}" /> <img alt="" alt='blob' src='/blob.gif' />
@@ -965,7 +1084,7 @@ END
                        next if -d "/etc/l7-protocols/protocols/$direntry";
                        @proto = split( /\./, $direntry );
                        if ( $proto[0] eq $qossettings{'L7PROT'} ) {
-                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";                        
+                               print "<option value='$proto[0]' selected>$proto[0]</option>\n";
                        } else {
                                print "<option value='$proto[0]'>$proto[0]</option>\n";
                        }
@@ -974,11 +1093,12 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
-                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
                    <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
+               <tr><td colspan="3" align='center'><font color="red"><em>$Lang::tr{'qos warning'}</em></font>
                </table></form>
 END
 ;
@@ -1003,7 +1123,7 @@ END
                                @tmpline = split( /\ /, $direntry );
                                next if $tmpline[0] =~ "#";
                                if ( $tmpline[0] eq $qossettings{'PPROT'} ) {
-                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";                    
+                                       print "<option value='$tmpline[0]' selected>$tmpline[0]</option>\n";
                                } else {
                                        print "<option value='$tmpline[0]'>$tmpline[0]</option>\n";
                                }
@@ -1011,16 +1131,16 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'source port'}:
-                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' />
+                   <td width='33%' align='left'><input type='text' name='QPORT' maxlength='11' value='$qossettings{'QPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'destination port'}:
-                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' />
+                   <td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'source ip'}:
-                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
+                   <td width='33%' align='left'><input type='text' name='QIP' maxlength='31' value='$qossettings{'QIP'}' />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='31' value='$qossettings{'DIP'}' />
                    <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value='$Lang::tr{'save'}' />
                </table></form>
 END
@@ -1047,7 +1167,7 @@ END
                <tr><td width='50%' align='left'>$Lang::tr{'min delay'} (8)             <td width='50%'><input type="radio" name="TOS" value="8" $checked[8] />
                <tr><td width='50%' align='left'>$Lang::tr{'max throughput'} (4)                <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
                <tr><td width='50%' align='left'>$Lang::tr{'max reliability'} (2)       <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
-               <tr><td width='50%' align='left'$Lang::tr{'min costs'} (1)                      <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
+               <tr><td width='50%' align='left'>$Lang::tr{'min costs'} (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
@@ -1078,7 +1198,7 @@ sub showclasses {
                        @classline = split( /\;/, $classentry );
                        if ( $classline[0] eq $qossettings{'DEV'} )
                        {
-                         &Header::openbox('100%', 'center', "Klasse: $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>
@@ -1102,23 +1222,23 @@ sub showclasses {
                                        <table border='0'><tr>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$classline[1]' />
-                                               <input type='hidden' name='ACTION' value='Unterklasse hinzufuegen' />
-                                               <input type='image' alt='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
+                                               <input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' />
+                                               <input type='image' alt='$Lang::tr{'add subclass'}' title='$Lang::tr{'add subclass'}' src='/images/addblue.gif' />
                                        </form>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$classline[1]' />
-                                               <input type='hidden' name='ACTION' value='Regel hinzufuegen' />
-                                               <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+                                               <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
+                                               <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' 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='DOCLASS' value='Bearbeiten' />
-                                               <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                                               <input type='hidden' name='DOCLASS' value='$Lang::tr{'edit'}' />
+                                               <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' 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='DOCLASS' value='Loeschen' />
-                                               <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                                               <input type='hidden' name='DOCLASS' value='$Lang::tr{'delete'}' />
+                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
                                        </form>
                                        </table>
                                    </td>
@@ -1142,14 +1262,14 @@ END
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$l7ruleline[0]' />
                                                <input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
-                                               <input type='hidden' name='DOLEVEL7' value='Bearbeiten' />
-                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif' />
+                                               <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'edit'}' />
+                                               <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
                                        </form>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$l7ruleline[0]' />
                                                <input type='hidden' name='L7PROT' value='$l7ruleline[2]' />
-                                               <input type='hidden' name='DOLEVEL7' value='Loeschen' />
-                                               <input type='image' alt='Loeschen' src='/images/delete.gif' />
+                                               <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'delete'}' />
+                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
                                        </form>
                                        </table>
 END
@@ -1185,14 +1305,14 @@ END
 ;
                                                if ($portruleline[4]) {
                                                        print <<END
-                                   <i>Quell-Port:</i> $portruleline[4]
+                                   <i>$Lang::tr{'source port'}:</i> $portruleline[4]
 END
 ;
                                                }
                                                print "<td align='center' colspan='2'>";
                                                if ($portruleline[6]) {
                                                        print <<END
-                                   <i>Ziel-Port:</i> $portruleline[6]
+                                   <i>$Lang::tr{'destination port'}:</i> $portruleline[6]
 END
 ;
                                                }
@@ -1207,8 +1327,8 @@ END
                                                <input type='hidden' name='QPORT' value='$portruleline[4]' />
                                                <input type='hidden' name='DIP' value='$portruleline[5]' />
                                                <input type='hidden' name='DPORT' value='$portruleline[6]' />
-                                               <input type='hidden' name='DOPORT' value='Bearbeiten' />
-                                               <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                                               <input type='hidden' name='DOPORT' value='$Lang::tr{'edit'}' />
+                                               <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
                                        </form>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='CLASS' value='$portruleline[0]' />
@@ -1217,8 +1337,8 @@ END
                                                <input type='hidden' name='QPORT' value='$portruleline[4]' />
                                                <input type='hidden' name='DIP' value='$portruleline[5]' />
                                                <input type='hidden' name='DPORT' value='$portruleline[6]' />
-                                               <input type='hidden' name='DOPORT' value='Loeschen' />
-                                               <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                                               <input type='hidden' name='DOPORT' value='$Lang::tr{'delete'}' />
+                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
                                        </form>
                                    </table>
 END
@@ -1265,15 +1385,15 @@ END
                                                                <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='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                                                               <input type='hidden' name='DOTOS' value='$Lang::tr{'edit'}' />
+                                                               <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' 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='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                                                               <input type='hidden' name='DOTOS' value='$Lang::tr{'delete'}' />
+                                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
                                                        </form>
                                                </table>
 END
@@ -1300,18 +1420,18 @@ END
                                                <table border='0'><tr>
                                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                        <input type='hidden' name='CLASS' value='$subclassline[2]' />
-                                                       <input type='hidden' name='ACTION' value='Regel hinzufuegen' />
-                                                       <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' />
+                                                       <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' />
+                                                       <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' 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='DOSCLASS' value='Bearbeiten' />
-                                                       <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                                                       <input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' />
+                                                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' 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='DOSCLASS' value='Loeschen' />
-                                                       <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                                                       <input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' />
+                                                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
                                                </form>
                                                </table>
 END
@@ -1327,29 +1447,6 @@ END
                        }
        }
        }
-
-sub expert
-{
-       &Header::openbox('100%', 'center', $Lang::tr{'expertoptions'});
-       print <<END
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <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'}' />
-                   <td width='33%' align='center'>$Lang::tr{'mtu QoS'}
-               <tr><td width='33%' align='right'>$Lang::tr{'Queuelenght'}:<td width='33%' align='left'>
-                       <input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
-                   <td width='33%' align='center'>&nbsp;
-               <tr><td width='33%' align='right'>SFQ Perturb:<td width='33%' align='left'>
-                       <input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value='$qossettings{'SFQ_PERTUB'}' />
-                   <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
-               </table>
-               </form>
-END
-;
-       &Header::closebox();
-}
-
 sub validminbwdth {
        if ( $qossettings{'VALID'} eq 'yes' ) {
                if ( $qossettings{'DEVICE'} eq $qossettings{'RED_DEV'} ) {
@@ -1390,7 +1487,7 @@ sub validclass {
                } elsif ( $qossettings{'DEVICE'} eq $qossettings{'IMQ_DEV'} ) {
                        if ($qossettings{'CLASS'} lt 200 || $qossettings{'CLASS'} ge 221) {
                                $qossettings{'VALID'} = 'no';
-                               $message = "Die Klassennummer passt nicht zum angegebenen Interface.";
+                               $message = "$Lang::tr{'The class number does not match the specified interface.'}";
                        }
                }
                open( FILE, "< $classfile" ) or die "Unable to read $classfile";