Firewallhitgraphs gefixt.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / qos.cgi

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 42321c96fa7586031e6f98e9166537a263e9127c..3a0c8bfc5f4485652e9546ff187df2f7ef7cafca 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -396,7 +396,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';
@@ -616,7 +616,6 @@ if ($errormessage) {
 &Header::openbox('100%', 'center', 'Quality of Service');
 
 print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='33%'>
 END
 ;
@@ -636,7 +635,7 @@ END
                print <<END
                <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
 END
 ;
@@ -665,7 +664,6 @@ print "</table>";
 
 if ( ($qossettings{'OUT_SPD'} eq '') || ($qossettings{'INC_SPD'} eq '') ) {
        &changebandwidth();
-       &Header::closebox();
        &Header::closebigbox();
        &Header::closepage();
        exit
@@ -687,7 +685,7 @@ print <<END
                <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 "/home/httpd/html/graphs/qos-graph-$qossettings{'RED_DEV'}.png") && ( -e "/home/httpd/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png")) {
+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">
@@ -753,7 +751,7 @@ END
                </form>
 END
 ;
-       &Header::closebox();
+               &Header::closebox();
 }
 
 sub changebandwidth {
@@ -1300,7 +1298,7 @@ END
                                        }
                                }
 
-                               if ( -e "/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png") {
+                               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
@@ -1463,7 +1461,7 @@ sub gengraph {
        }
        my $color=random_hex_color(6);
 
-       RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
+       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",
@@ -1480,8 +1478,8 @@ sub gengraph {
                "LINE3:overlimits#0000FF:overlimits",
                "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j",
        );
-               $ERROR = RRDs::error;
-               print "$ERROR";
+       $ERROR = RRDs::error;
+       #print "$ERROR";
 }
 
 sub overviewgraph {
@@ -1494,7 +1492,7 @@ sub overviewgraph {
        my $ERROR="";
        my $count="1";
        my $color="#000000";
-       my @command=("/home/httpd/html/graphs/qos-graph-$qossettings{'DEV'}.png",
+       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",
@@ -1523,7 +1521,7 @@ sub overviewgraph {
        }
        RRDs::graph (@command);
        $ERROR = RRDs::error;
-       print "$ERROR";
+       #print "$ERROR";
 }
 
 sub random_hex_color {