]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/qos.cgi
WebCyrAdm - Dateien verschoben und nicht in Paket geaendert. Sorry.
[people/teissler/ipfire-2.x.git] / html / cgi-bin / qos.cgi
index 29e449ce804d943771dde689f6297b11fc868d22..94e63b2c82a02e8577395e9b211ce72eb24c0002 100644 (file)
@@ -7,6 +7,7 @@
 # (c) The IPFire Team
 #
 
+use RRDs;
 use strict;
 # enable only the following on debugging purpose
 use warnings;
@@ -19,7 +20,7 @@ require "${General::swroot}/header.pl";
 my %qossettings = ();
 my %checked = ();
 my %netsettings = ();
-my $message = "";
+my $message = '';
 my $errormessage = "";
 my $c = "";
 my $direntry = "";
@@ -85,43 +86,15 @@ $qossettings{'DOCLASS'} = '';
 $qossettings{'DOSCLASS'} = '';
 $qossettings{'DOLEVEL7'} = '';
 $qossettings{'DOPORT'} = '';
+$qossettings{'CLASS'} = '';
+$qossettings{'CLASSPRFX'} = '';
+$qossettings{'DEV'} = '';
 
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 &Header::getcgihash(\%qossettings);
 
 &Header::openpage('QoS', 1, '');
-
-print <<END
-<script type="text/javascript">
-<!--
-function BorderOn (id) { id.className='btnOn'  }
-function BorderOff(id) { id.className='btnOff' }
-//-->
-</script>
-<style type=text/css>
-.btnOn {
-       border-right: #D5F0FF 2px Inset;
-       border-top: #D5F0FF 2px Inset;
-       border-left: #D5F0FF 2px Inset;
-       border-bottom: #D5F0FF 2px Inset;
-       text-align: Center;
-       text-decoration: None;
-       background-color: #FFFFFF;
-}
-.btnOff {
-       border-right: #D5F0FF 2px Outset;
-       border-top: #D5F0FF 2px Outset;
-       border-left: #D5F0FF 2px Outset;
-       border-bottom: #D5F0FF 2px Outset;
-       text-align: Center;
-       text-decoration: None;
-       background-color: #FFFFFF;
-}
-</style>
-END
-;
-
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
@@ -206,11 +179,6 @@ elsif ($qossettings{'DOCLASS'} eq 'Loeschen')
 
 if ($qossettings{'DOSCLASS'} eq $Lang::tr{'save'})
 {
-       if ($qossettings{'SCLASS'} >= 1000 && $qossettings{'CLASS'} < 1021) {
-               $qossettings{'DEVICE'} = $qossettings{'RED_DEV'};
-       } elsif ($qossettings{'SCLASS'} >= 2000 && $qossettings{'CLASS'} < 2021) {
-               $qossettings{'DEVICE'} = $qossettings{'IMQ_DEV'};
-       }
        &validsubclass();
        &validminbwdth();
        if ( $qossettings{'VALID'} eq 'yes' ) {
@@ -355,22 +323,29 @@ END
 
 if ($qossettings{'ACTION'} eq 'Start')
 {
-       system("sleep 2 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &");
+       system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
        system("/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')
 {
+       system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
        unlink "/var/ipfire/qos/bin/qos.sh";
        unlink "/var/ipfire/qos/enable";
+       system("logger -t ipfire 'QoS stopped'");
        $qossettings{'ENABLED'} = 'off';
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
 elsif ($qossettings{'ACTION'} eq 'Neustart')
 {
        if ($qossettings{'ENABLED'} eq 'on'){
-               system("sleep 2 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &");
+               system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
+               system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+               system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
+               system("logger -t ipfire 'QoS restarted'");
        }
 }
 elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
@@ -383,6 +358,76 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
        }
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 }
+elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+{
+       &Header::openbox('100%', 'left', 'QoS Status');
+       if ($qossettings{'ENABLED'} eq 'on'){
+               my $output = "";
+               $output = `/usr/local/bin/qosctrl status`;
+               $output = &Header::cleanhtml($output,"y");
+               print "<pre>$output</pre>\n";
+       } else { print "QoS ist nicht aktiviert!"; }
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit
+}
+elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung')
+{
+       &Header::openbox('100%', 'left', 'QoS Graphen');
+       print <<END
+       <table width='100%'><tr><td colspan='2' align='center'><font color='red'>Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden.</font>
+       </table>
+END
+;
+       &Header::closebox();
+       open( FILE, "< $classfile" ) or die "Unable to read $classfile";
+       @classes = <FILE>;
+       close FILE;
+       open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
+       @subclasses = <FILE>;
+       close FILE;
+       foreach $classentry (sort @classes)
+       {
+               @classline = split( /\;/, $classentry );
+               $qossettings{'DEV'}=$classline[0];
+               $qossettings{'CLASS'}=$classline[1];
+               &gengraph($qossettings{'DEV'},$qossettings{'CLASS'});
+               &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 <<END
+       </table>
+END
+;
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit
+}
 elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
 {
        &parentclass();
@@ -491,7 +536,13 @@ END
                <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'><input type='submit' name='ACTION' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)' value='Erweiterte Einstellungen'>
+               <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>
 END
 ;
@@ -743,7 +794,9 @@ END
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>Ceilburst:
                    <td width='33%' align='left'><input type='text' name='CBURST' maxlength='8' value=$qossettings{'CBURST'}>
-                   <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}><input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
+                   <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}>
+                                                       <input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'}>
+                                                       <input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
                </table></form>
 END
 ;
@@ -865,7 +918,6 @@ END
                        if ( $classline[0] eq $qossettings{'RED_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$classline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[2]
@@ -908,7 +960,6 @@ END
                                        @subclassline = split( /\;/, $subclassentry );
                                        if ( $subclassline[1] eq $classline[1] ) {
                                                print <<END
-                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                        <tr><td align='center' bgcolor='#FFFFFF'>Subklasse:
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[2]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[3]
@@ -916,12 +967,29 @@ END
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
-                                                           <td align='right'  bgcolor='#FAFAFA'><input type='hidden' name='CLASS' value='$subclassline[2]'>
-                                                               <button type='submit' name='DOSCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='DOSCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
+                                                           <td align='right'  bgcolor='#FAFAFA'>
+                                               <table border='0'><tr>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+                                                       <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                                       <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                                       <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
                                                </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'>
+                                               </form>
+                                               </table>
 END
 ;
                                        }
@@ -935,7 +1003,6 @@ END
                        if ( $classline[0] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$classline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[2]
@@ -978,7 +1045,6 @@ END
                                        @subclassline = split( /\;/, $subclassentry );
                                        if ( $subclassline[1] eq $classline[1] ) {
                                                print <<END
-                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                        <tr><td align='center' bgcolor='#FFFFFF'>Subklasse:
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[2]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[3]
@@ -986,12 +1052,29 @@ END
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
-                                                           <td align='right'  bgcolor='#FAFAFA'><input type='hidden' name='CLASS' value='$subclassline[2]'>
-                                                               <button type='submit' name='DOSCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='DOSCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                                               </form>
+                                                           <td align='right'  bgcolor='#FAFAFA'>
+                                                       <table border='0'><tr>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+                                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                                       </form>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                                               <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                                       </form>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                                               <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+                                                       </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'>
+                                                       </form>
+                                                       </table>
 END
 ;
                                        }
@@ -1060,7 +1143,6 @@ END
                        if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$l7ruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
@@ -1118,7 +1200,6 @@ END
                        if ( $portruleline[1] eq $qossettings{'RED_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$portruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[2]
@@ -1127,15 +1208,28 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[6]
                                    <td align='right'  bgcolor='#EAEAEA'>
-                                       <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]'>
-                                       <button type='submit' name='DOPORT' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOPORT' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <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'>
+                                       </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'>
+                                       </form>
+                                   </table>
 END
 ;
                        }
@@ -1147,7 +1241,6 @@ END
                        if ( $portruleline[1] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$portruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[2]
@@ -1156,15 +1249,28 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[6]
                                    <td align='right'  bgcolor='#EAEAEA'>
-                                       <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]'>
-                                       <button type='submit' name='DOPORT' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOPORT' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <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'>
+                                       </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'>
+                                       </form>
+                                   </table>
 END
 ;
                        }
@@ -1183,7 +1289,7 @@ sub expert
        &Header::openbox('100%', 'center', 'Expertenoptionen:');
        print <<END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='66%'>
+<!--           <table width='66%'>
                <tr><td width='100%' colspan='3'>Diese Einstellungen sollten sie nur veraendern, wenn sie wirklich wissen, was sie tun.
                <tr><td width='33%' align='right'>Download-Rate 90\%:<td width='33%' align='left'>
                        <input type='text' name='DEF_INC_SPD' maxlength='8' required='4' value=$qossettings{'DEF_INC_SPD'}>
@@ -1192,7 +1298,7 @@ sub expert
                        <input type='text' name='DEF_OUT_SPD' maxlength='8' required='4' value=$qossettings{'DEF_OUT_SPD'}>
                    <td width='33%' align='center'>&nbsp;
                </table>
-               <hr>
+               <hr> -->
                <table width='66%'>
                <tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
                        <input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'}>
@@ -1217,7 +1323,7 @@ sub validminbwdth {
                } elsif ( $qossettings{'DEVICE'} eq $qossettings{'IMQ_DEV'} ) {
                        $qossettings{'SPD'} = $qossettings{'INC_SPD'};
                }
-               unless ( ( $qossettings{'MINBDWTH'} >= 0 ) && ( $qossettings{'MINBDWTH'} <= $qossettings{'SPD'} ) ) {
+               unless ( ( $qossettings{'MINBWDTH'} >= 1 ) && ( $qossettings{'MINBWDTH'} <= $qossettings{'SPD'} ) ) {
                        $qossettings{'VALID'} = 'no';
                        $message = "Mindestbandbreite ist ungueltig.";
                }
@@ -1286,3 +1392,73 @@ 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';
+       }
+
+       RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
+               "--start", "-3240", "-aPNG", "-i", "-z",
+               "--alt-y-grid", "-w 800", "-h 150", "-r",
+               "--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#00FFFF: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";
+
+       RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png",
+               "--start", "-3240", "-aPNG", "-i", "-z",
+               "--alt-y-grid", "-w 800", "-h 150", "-r",
+               "--color", "SHADEA#EAE9EE",
+               "--color", "SHADEB#EAE9EE",
+               "--color", "BACK#FFFFFF",
+               "-t $qossettings{'CLASS'} ($qossettings{'DEV'})",
+               "DEF:lended=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:lended:AVERAGE",
+               "DEF:borrowed=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:borrowed:AVERAGE",
+               "DEF:giants=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:giants:AVERAGE",
+               "AREA:lended#99ff99:lended",
+               "GPRINT:lended:LAST:lended\\:%8.3lf %s packets\\j",
+               "LINE3:borrowed#f70566:borrowed",
+               "GPRINT:borrowed:LAST:borrowed\\:%8.3lf %s packets\\j",
+               "LINE3:giants#05ad05:giants",
+               "GPRINT:giants:LAST:giants\\:%8.3lf %s packets\\j",
+       );
+               $ERROR = RRDs::error;
+               print "$ERROR";
+
+       RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png",
+               "--start", "-3240", "-aPNG", "-i", "-z",
+               "--alt-y-grid", "-w 800", "-h 150", "-r",
+               "--color", "SHADEA#EAE9EE",
+               "--color", "SHADEB#EAE9EE",
+               "--color", "BACK#FFFFFF",
+               "-t $qossettings{'CLASS'} ($qossettings{'DEV'})",
+               "DEF:bits=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:bits:AVERAGE",
+               "DEF:bytes=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}.rrd:bytes:AVERAGE",
+               "CDEF:kbytes=bytes,1024,/",
+               "CDEF:kbits=bits,1024,/,8,/",
+               "AREA:kbytes#FFBE7D:kbytes",
+               "GPRINT:kbytes:LAST:rate\\: %8.3lf kbytes\\j",
+       );
+               $ERROR = RRDs::error;
+               print "$ERROR";
+
+
+}
\ No newline at end of file