Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on

1 files changed, 14 insertions, 9 deletions

diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index 773458c..f402ca8 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -26,6 +26,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 	POSSIBILITY OF SUCH DAMAGE.

 */

+/*

+	pfSense_BUILDER_BINARIES:	/usr/bin/killall

+	pfSense_MODULE:	shaper

+*/

 

 ##|+PRIV

 ##|*IDENT=page-firewall-trafficshaper-layer7

@@ -48,7 +52,6 @@ read_dummynet_config();
 $avail_behaviours_limiter = get_dummynet_name_list();

 $show_proto_form = false;

 

-

 //More variables

 $pgtitle = array("Firewall","Traffic Shaper", "Layer7");

 

@@ -63,8 +66,10 @@ $default_layer7shaper_msg .= "</td></tr>";
 read_layer7_config();

 

 if($_GET['reset'] <> "") {

-        mwexec("killall -9 pfctl php");

-	mwexec("killall -9 ipfw-classifyd"); //kill all ipfw-classifyd processes

+	/* XXX: Huh!? Why are we killing php here? */

+	mwexec("killall -9 pfctl php");

+	// kill all ipfw-classifyd processes

+	mwexec("killall -9 ipfw-classifyd"); 

 	exit;

 }

 

@@ -141,8 +146,8 @@ else if ($_POST) {
 		if(sizeof($dupes) == 0 && !$input_errors) {

 			$l7r->wconfig();

 			write_config();

-			mark_subsystem_dirty('shaper');
-
+			mark_subsystem_dirty('shaper');

+

 			read_layer7_config();

 		}

 		else {

@@ -168,14 +173,14 @@ else if ($_POST) {
 		$retval = 0;

 		$retval = filter_configure();

 		$savemsg = get_std_save_message($retval);

-
+

 		if(stristr($retval, "error") <> true)

 			$savemsg = get_std_save_message($retval);

 		else

 			$savemsg = $retval;

 

-		clear_subsystem_dirty('shaper');
-
+		clear_subsystem_dirty('shaper');

+

 		if($container) {

 			$output_form .= $container->build_form();

 		} else {

@@ -185,7 +190,7 @@ else if ($_POST) {
 	} else if ($_POST['delete']) {

 		$container->delete_l7c();

 		write_config();

-		mark_subsystem_dirty('shaper');
+		mark_subsystem_dirty('shaper');

 		unset($container);

 		

 		header("Location: firewall_shaper_layer7.php");