From b5b351be09f2d778c45f0aef2f92d547dea58320 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 22 Feb 2006 20:18:22 +0000
Subject: Unbreak status -> queues

Ticket #824
---
 usr/local/www/status_queues.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index 22fd1f2..f86be3d 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -1,3 +1,4 @@
+#!/usr/local/bin/php
 <?php
 /* $Id$ */
 /*
@@ -31,7 +32,7 @@
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
-	mwexec("killall -9 pfctl pfctl");
+	mwexec("killall pfctl pfctl");
 	Header("Location: status_queues.php");
 	exit;
 }
@@ -50,7 +51,7 @@ foreach($pfctl_vsq_array as $pfctl) {
 			$a_queues[] = $match_array[1][0];	
 }
 
-$pgtitle = "Status: Traffic Shaper: Queues";
+$pgtitle = "Status: Traffic shaper: Queues";
 include("head.inc");
 
 ?>
@@ -148,12 +149,7 @@ While(!Connection_Aborted()) {
 
 		echo "<script language='javascript'>\n";
 
-		/* Since pps can be 0, let's not divide by zero */
-		if ($total_packets_s == 0) {
-			$packet_s = round(400 * (1 - $packet_sampled / $total_packets_s), 0);
-		} else {
-			$packet_s = 0;
-		}
+		$packet_s = round(400 * (1 - $packet_sampled / $total_packets_s), 0);
 
 		echo "document.queue{$i}widthb.style.width='{$packet_s}px';\n";
 		echo "document.queue{$i}widtha.style.width='" . (400 - $packet_s) . "px';\n";
@@ -178,10 +174,12 @@ While(!Connection_Aborted()) {
 		echo "Redirecting to <a href=\"status_queues.php\">Queue Status</a>.<p>";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url={$_SERVER['PHP_SELF']}\">";
 		mwexec("/usr/bin/killall pfctl");
+		mwexec("/usr/bin/killall pfctl php");
 		exit;
 	}
 }
 
-mwexec("/usr/bin/killall pfctl");
+mwexec("/usr/bin/killall pfctl pfctl");
+mwexec("/usr/bin/killall pfctl php");
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.1