]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/qos.cgi
Viele CGIs geaendert, einige Proxy Dateien hinzugefuegt, iptables aus dem menu geschm...
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / qos.cgi
index df96a5d25cbecdcb3efd52d3964dd5d77655cb51..0dfac7898835b3fd8eac3121f4dcd48baf5b1b4b 100644 (file)
@@ -102,6 +102,11 @@ $qossettings{'TOS'} = '';
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 &Header::getcgihash(\%qossettings);
 
+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);
 
@@ -255,24 +260,44 @@ END
        } else {
                $qossettings{'ACTION'} = 'Level7-Regel hinzufuegen';
        }
-} 
-elsif ($qossettings{'DOLEVEL7'} eq 'Loeschen')
+} elsif ($qossettings{'DOLEVEL7'} eq 'Loeschen')
 {
        open( FILE, "< $level7file" ) or die "Unable to read $level7file";
        @l7rules = <FILE>;
        close FILE;
-       open( FILE, "> $level7file" ) or die "Unable to read $level7file";
+  system("rm $level7file");
        foreach $l7ruleentry (sort @l7rules)
        {
                @l7ruleline = split( /\;/, $l7ruleentry );
-               if ( ($l7ruleline[0] ne $qossettings{'CLASS'}) && ($l7ruleline[2] ne $qossettings{'L7PROT'}))
-               {
-                       print FILE $l7ruleentry;
-               }
-       }
+               if ( ($l7ruleline[0] eq $qossettings{'CLASS'}) && ($l7ruleline[2] eq $qossettings{'L7PROT'}))
+            {$message = "Level7-Regel ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) wurde geloescht.";}
+      else
+        { open( FILE, ">> $level7file" ) or die "Unable to read $level7file";
+          print FILE $l7ruleentry;
+               close FILE;
+        }
+         }
+       open( FILE, "< $level7file" ) or system("touch $level7file");close FILE;
+       } elsif ($qossettings{'DOLEVEL7'} eq 'Bearbeiten')
+{
+       open( FILE, "< $level7file" ) or die "Unable to read $level7file";
+       @l7rules = <FILE>;
        close FILE;
-       $message = "Level7-Regel ($qossettings{'CLASS'} - $qossettings{'L7PROT'}) wurde geloescht.";
-}
+       system("rm $level7file");
+       foreach $l7ruleentry (sort @l7rules)
+       {
+               @l7ruleline = split( /\;/, $l7ruleentry );
+               if ( ($l7ruleline[0] eq $qossettings{'CLASS'}) && ($l7ruleline[2] eq $qossettings{'L7PROT'}))
+                       {$qossettings{'QIP'} = $l7ruleline[3];$qossettings{'DIP'} = $l7ruleline[4];}
+         else {
+                       open( FILE, ">> $level7file" ) or die "Unable to write $level7file";
+                       print FILE $l7ruleentry;
+                       close FILE;
+      }
+    }
+  &level7rule;
+  open( FILE, "< $level7file" ) or system("touch $level7file");close FILE;
+ }
 
 ############################################################################################################################
 ############################################################################################################################
@@ -326,7 +351,26 @@ END
        }
        close FILE;
        $message = "Port-Regel ($qossettings{'CLASS'} - $qossettings{'PPROT'}) wurde geloescht.";
-}
+}  elsif ($qossettings{'DOPORT'} eq 'Bearbeiten')
+{
+       open( FILE, "< $portfile" ) or die "Unable to read $portfile";
+       @portrules = <FILE>;
+       close FILE;
+       system("rm $portfile");
+       foreach $portruleentry (sort @portrules)
+       {
+               @portruleline = split( /\;/, $portruleentry );
+               if ( ($portruleline[0] eq $qossettings{'CLASS'}) && ($portruleline[2] eq $qossettings{'PPROT'}) && ($portruleline[3] eq $qossettings{'QIP'}) && ($portruleline[4] eq $qossettings{'QPORT'}) && ($portruleline[5] eq $qossettings{'DIP'}) && ($portruleline[6] eq $qossettings{'DPORT'}))
+                       {$qossettings{'CLASS'}=$portruleline[0];$qossettings{'PPROT'}=$portruleline[2];$qossettings{'QIP'}=$portruleline[3];$qossettings{'QPORT'}=$portruleline[4];$qossettings{'DIP'}=$portruleline[5];$qossettings{'DPORT'}=$portruleline[6];}
+         else {
+                       open( FILE, ">> $portfile" ) or die "Unable to write $portfile";
+                       print FILE $portruleentry;
+                       close FILE;
+      }
+    }
+   &portrule;
+  open( FILE, "< $portfile" ) or system("touch $portfile");close FILE;
+ }
 
 ############################################################################################################################
 ############################################################################################################################
@@ -396,7 +440,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen')
 if ($qossettings{'ACTION'} eq 'Start')
 {
        system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
-       system("/bin/touch /var/ipfire/qos/enable");
+       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';
@@ -444,77 +488,6 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung')
-{
-       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>
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png'>
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png'>
-               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png'>
-END
-;
-               foreach $subclassentry (sort @subclasses)
-               {
-                       @subclassline = split( /\;/, $subclassentry );
-                       if ($subclassline[1] eq $classline[1]) {
-                               $qossettings{'DEV'}=$subclassline[0];
-                               $qossettings{'SCLASS'}=$subclassline[2];
-                               &gengraph($qossettings{'DEV'},$qossettings{'SCLASS'});
-                               print <<END
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-packets.png'>
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-borrowed.png'>
-                               <tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-bytes.png'>
-END
-;
-                       }
-               }
-               print "\t\t</table>";
-               &Header::closebox();    
-               print "</div>\n";
-       }
-print <<END
-       </table>
-END
-;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit
-}
 elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
 {
        &parentclass();
@@ -616,8 +589,8 @@ if ($errormessage) {
 &Header::openbox('100%', 'center', 'Quality of Service');
 
 print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <table width='33%'>
+  <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='66%'>
 END
 ;
        if ( $message ne "" ) {
@@ -629,43 +602,48 @@ END
                <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'}" />
+               <input type='submit' name='ACTION' value="$Lang::tr{'restart'}" /></table></form>
 END
 ;
        if (($qossettings{'OUT_SPD'} ne '') && ($qossettings{'INC_SPD'} ne '')) {
                print <<END
+    <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+         <table width='66%'>
                <tr><td colspan='3'>&nbsp;
                <tr><td width='40%' align='right'>Downloadgeschwindigkeit:      <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'>
+                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='Andern' />
                <tr><td width='40%' align='right'>Uploadgeschwindigkeit:        <td width='40%' align='left'>$qossettings{'OUT_SPD'} kbps
+               </table></form>
 END
 ;
        }
        if (($qossettings{'DEFCLASS_OUT'} ne '') && ($qossettings{'DEFCLASS_INC'} ne '')&& ($qossettings{'ACK'} ne '')) {
                print <<END
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <table width='66%'>
                <tr><td colspan='3'><hr />
                <tr><td width='40%' align='right'>Downloadstandardklasse:       <td width='40%' align='left'>$qossettings{'DEFCLASS_INC'}       
-                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern'>
+                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
                <tr><td width='40%' align='right'>Uploadstandardklasse:         <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='40%' align='right'>ACKs:                         <td width='40%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr />
                <tr><td colspan='3' width='100%' align='center'>
-               <table boder='0' cellpadding='0' cellspacing='0'>
-                       <tr><td><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'>
-                           <td><input type='submit' name='ACTION' value='Erweiterte Einstellungen'>
-                       <tr><td><input type='submit' name='ACTION' value='Statusinformationen'>
-                           <td><input type='submit' name='ACTION' value='Grafische Auswertung'>
                </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>
        </form>
 END
 ;
        }
-print "</table>";
 &Header::closebox();
 
 if ( ($qossettings{'OUT_SPD'} eq '') || ($qossettings{'INC_SPD'} eq '') ) {
        &changebandwidth();
-       &Header::closebox();
        &Header::closebigbox();
        &Header::closepage();
        exit
@@ -679,20 +657,12 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
 }
 
 &Header::openbox('100%', 'center', $Lang::tr{'info'});
-&overviewgraph($qossettings{'RED_DEV'});
-&overviewgraph($qossettings{'IMQ_DEV'});
 print <<END
        <table>
-               <tr><td colspan='9' align='right' valign='middle'><img src='/images/addblue.gif'>&nbsp;Unterklasse hinzufuegen | <img src='/images/addgreen.gif'>&nbsp;Regel hinzufuegen | <img src='/images/edit.gif'>&nbsp;Bearbeiten | <img src='/images/delete.gif'>&nbsp;Loeschen &nbsp;
+               <tr><td colspan='9' align='center' valign='middle'><img alt="" src='/images/addblue.gif' />&nbsp;Unterklasse hinzufuegen | <img alt="" src='/images/addgreen.gif' />&nbsp;Regel hinzufuegen | <img alt="" src='/images/edit.gif' />&nbsp;Bearbeiten | <img alt="" src='/images/delete.gif' />&nbsp;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;
 END
 ;
-if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png")) {
-       print <<END
-               <tr><td colspan='9' align='center'><img src="/graphs/qos-graph-$qossettings{'RED_DEV'}.png">
-               <tr><td colspan='9' align='center'><img src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png">
-END
-;}
 print "\t</table>";
 
 &Header::closebox();
@@ -753,7 +723,7 @@ END
                </form>
 END
 ;
-       &Header::closebox();
+               &Header::closebox();
 }
 
 sub changebandwidth {
@@ -792,8 +762,8 @@ END
                print "<tr><td colspan='3' align='center'>$message";
        }
        if ( $qossettings{'EDIT'} eq 'yes' ) { 
-               print "<input type='hidden' name='CLASS' value=$qossettings{'CLASS'}>";
-               print "<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'}>";
+               print "<input type='hidden' name='CLASS' value=$qossettings{'CLASS'} />";
+               print "<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'} />";
        }
        print <<END
                <tr><td width='100%' colspan='3'>Geben sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.
@@ -872,7 +842,7 @@ END
                                <option value='1'>Minimale Kosten (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='blob' src='/blob.gif' />
+                   <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' />
                <tr><td width='33%' align='right'>&nbsp;
                    <td width='33%' align='left'>&nbsp;
                    <td width='33%' align='center'><input type='submit' name='DOCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
@@ -991,11 +961,11 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-IP-Adresse:
-                   <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='15' value=$qossettings{'QIP'} />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' 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'} />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' 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'} />
                </table></form>
 END
 ;
@@ -1028,17 +998,17 @@ END
        print <<END
                    </select><td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-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='5' value=$qossettings{'QPORT'} />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-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='5' value=$qossettings{'DPORT'} />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Quell-IP-Adresse:
-                   <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='15' value=$qossettings{'QIP'} />
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ziel-IP-Adresse:
-                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' 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'} />
+                   <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' 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
 ;
@@ -1061,11 +1031,11 @@ END
        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'} />
+               <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
 ;
@@ -1095,48 +1065,47 @@ sub showclasses {
                        @classline = split( /\;/, $classentry );
                        if ( $classline[0] eq $qossettings{'DEV'} )
                        {
-                               gengraph($qossettings{'DEV'},$classline[1]);
                                &Header::openbox('100%', 'center', "Klasse: $classline[1]");
                                print <<END
                                <table border='0' width='100%' cellspacing='0'>
-                               <tr><td bgcolor='lightgrey' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
-                                   <td bgcolor='lightgrey' width='10%' align='center'><b>Klasse</b>
-                                   <td bgcolor='lightgrey' width='10%' align='center'>Prioritaet
-                                   <td bgcolor='lightgrey' width='10%' align='center'>Garantierte Bandbreite
-                                   <td bgcolor='lightgrey' width='10%' align='center'>Maximale Bandbreite
-                                   <td bgcolor='lightgrey' width='10%' align='center'>Burst
-                                   <td bgcolor='lightgrey' width='10%' align='center'>Ceil Burst
-                                   <td bgcolor='lightgrey' width='10%' align='center'>TOS
-                                   <td bgcolor='lightgrey' width='20%' align='center'>Aktionen
-                               <tr><td align='center' bgcolor='#EAEAEA'>$classline[0]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[1]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[2]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[3]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[4]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[5]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[6]</td>
-                                   <td align='center' bgcolor='#EAEAEA'>$classline[7]</td>
-                                   <td align='right'  bgcolor='#EAEAEA'>
+                               <tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'><b>Klasse</b>
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>Prioritaet
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>Garantierte Bandbreite
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>Maximale Bandbreite
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>Burst
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>Ceil Burst
+                                   <td bgcolor='$color{'color20'}' width='10%' align='center'>TOS
+                                   <td bgcolor='$color{'color20'}' width='20%' align='center'>Aktionen
+                               <tr><td align='center' bgcolor='$color{'color22'}'>$classline[0]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[1]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[2]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[3]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[4]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[5]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[6]</td>
+                                   <td align='center' bgcolor='$color{'color22'}'>$classline[7]</td>
+                                   <td align='right'  bgcolor='$color{'color22'}'>
                                        <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='Unterklasse hinzufuegen' src='/images/addblue.gif'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]' />
+                                               <input type='hidden' name='ACTION' value='Unterklasse hinzufuegen' />
+                                               <input type='image' alt='Unterklasse hinzufuegen' 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='Regel hinzufuegen' src='/images/addgreen.gif'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]' />
+                                               <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='DOCLASS' value='Bearbeiten'>
-                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                               <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='DOCLASS' value='Loeschen'>
-                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]' />
+                                               <input type='hidden' name='DOCLASS' value='Loeschen' />
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif' />
                                        </form>
                                        </table>
                                    </td>
@@ -1219,24 +1188,24 @@ END
                                    <td align='right'>
                                    <table border='0'><tr>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
-                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
-                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
-                                               <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='Bearbeiten' src='/images/edit.gif'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]' />
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]' />
+                                               <input type='hidden' name='QIP' value='$portruleline[3]' />
+                                               <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='Bearbeiten' src='/images/edit.gif' />
                                        </form>
                                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
-                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
-                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
-                                               <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='Loeschen' src='/images/delete.gif'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]' />
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]' />
+                                               <input type='hidden' name='QIP' value='$portruleline[3]' />
+                                               <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='Loeschen' src='/images/delete.gif' />
                                        </form>
                                    </table>
 END
@@ -1280,18 +1249,18 @@ END
                                            <td align='right'>
                                                  <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'>
+                                                               <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'>
+                                                               <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
@@ -1299,10 +1268,6 @@ END
                                                }
                                        }
                                }
-
-                               if ( -e "/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png") {
-                                       print <<END
-                                       <tr><td colspan='9' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png'>
 END
 ;
                                }
@@ -1324,19 +1289,19 @@ END
                                                            <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='ACTION' value='Regel hinzufuegen'>
-                                                       <input type='image' alt='Regel hinzufuegen' src='/images/addgreen.gif'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]' />
+                                                       <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='DOSCLASS' value='Bearbeiten'>
-                                                       <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                                       <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='DOSCLASS' value='Loeschen'>
-                                                       <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]' />
+                                                       <input type='hidden' name='DOSCLASS' value='Loeschen' />
+                                                       <input type='image' alt='Loeschen' src='/images/delete.gif' />
                                                </form>
                                                </table>
 END
@@ -1351,7 +1316,6 @@ END
                        }
                }
        }
-}
 
 sub expert
 {
@@ -1360,13 +1324,13 @@ sub expert
                <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'}>
+                       <input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'} />
                    <td width='33%' align='center'>Diese Einstellung aendert die MTU nicht global sondern nur fuer das QoS.
                <tr><td width='33%' align='right'>Queue Laenge:<td width='33%' align='left'>
-                       <input type='text' name='QLENGTH' maxlength='8' required='2' value=$qossettings{'QLENGTH'}>
+                       <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'}>
+                       <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>
@@ -1451,86 +1415,3 @@ sub validsubclass {
                }
        }
 }
-
-sub gengraph {
-       $qossettings{'DEV'} = shift;
-       $qossettings{'CLASS'} = shift;
-       my $ERROR="";
-       if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
-               $qossettings{'CLASSPRFX'} = '1';
-       } else { 
-               $qossettings{'CLASSPRFX'} = '2';
-       }
-       my $color=random_hex_color(6);
-
-       RRDs::graph ("/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
-               "--start", "-3240", "-aPNG", "-i", "-z",
-               "--alt-y-grid", "-w 600", "-h 150", "-r",
-               "--color", "SHADEA#EAE9EE",
-               "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#FFFFFF",
-               "-t $qossettings{'CLASS'} ($qossettings{'DEV'})",
-               "DEF:pkts=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:pkts:AVERAGE",
-               "DEF:dropped=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:dropped:AVERAGE",
-               "DEF:overlimits=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:overlimits:AVERAGE",
-               "AREA:pkts$color:packets",
-               "GPRINT:pkts:LAST:total packets\\:%8.3lf %s packets\\j",
-               "LINE3:dropped#FF0000:dropped",
-               "GPRINT:dropped:LAST:dropped packets\\:%8.3lf %s packets\\j",
-               "LINE3:overlimits#0000FF:overlimits",
-               "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j",
-       );
-               $ERROR = RRDs::error;
-               print "$ERROR";
-}
-
-sub overviewgraph {
-       $qossettings{'DEV'} = shift;
-       if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
-               $qossettings{'CLASSPRFX'} = '1';
-       } else { 
-               $qossettings{'CLASSPRFX'} = '2';
-       }
-       my $ERROR="";
-       my $count="1";
-       my $color="#000000";
-       my @command=("/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'DEV'}.png",
-               "--start", "-3240", "-aPNG", "-i", "-z",
-               "--alt-y-grid", "-w 600", "-h 150", "-r",
-               "--color", "SHADEA#EAE9EE",
-               "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#FFFFFF",
-               "-t Auslastung auf ($qossettings{'DEV'})"
-       );
-       open( FILE, "< $classfile" ) or die "Unable to read $classfile";
-       @classes = <FILE>;
-       close FILE;
-       foreach $classentry (sort @classes)
-       {
-               @classline = split( /\;/, $classentry );
-               if ( $classline[0] eq $qossettings{'DEV'} )
-               {
-                       $color=random_hex_color(6);
-                       push(@command, "DEF:$classline[1]=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bits:AVERAGE");
-
-                       if ($count eq "1") {
-                               push(@command, "AREA:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j");
-                       } else {
-                               push(@command, "STACK:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j");
-                       }
-                       $count++;
-               }
-       }
-       RRDs::graph (@command);
-       $ERROR = RRDs::error;
-       print "$ERROR";
-}
-
-sub random_hex_color {
-    my $size = shift;
-    $size = 6 if $size !~ /^3|6$/;
-    my @hex = ( 0 .. 9, 'a' .. 'f' );
-    my @color;
-    push @color, @hex[rand(@hex)] for 1 .. $size;
-    return join('', '#', @color);
-}
\ No newline at end of file