From c8bc87f6ec1cf3ac7553424abb338991dc5c1a84 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 2 Jul 2015 00:08:08 +0200
Subject: [PATCH] src: remove stale shaper mentions

---
 src/etc/inc/upgrade_config.inc | 31 -------------------------------
 src/etc/rc.filter_synchronize  |  2 --
 src/etc/rc.initial.setlanip    |  2 --
 src/www/diag_backup.php        |  2 --
 4 files changed, 37 deletions(-)

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 1d770d79c..2c8de173d 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -281,13 +281,10 @@ function upgrade_015_to_016() {
 function upgrade_016_to_017() {
 	global $config;
 	/* wipe previous shaper configuration */
-	unset($config['shaper']['queue']);
-	unset($config['shaper']['rule']);
 	unset($config['interfaces']['wan']['bandwidth']);
 	unset($config['interfaces']['wan']['bandwidthtype']);
 	unset($config['interfaces']['lan']['bandwidth']);
 	unset($config['interfaces']['lan']['bandwidthtype']);
-	$config['shaper']['enable'] = FALSE;
 }
 
 
@@ -365,30 +362,12 @@ function upgrade_019_to_020() {
 	}
 }
 
-function upgrade_020_to_021() {
-	global $config;
-	/* shaper scheduler moved */
-	if(isset($config['system']['schedulertype'])) {
-		$config['shaper']['schedulertype'] = $config['system']['schedulertype'];
-		unset($config['system']['schedulertype']);
-	}
-}
-
-
 function upgrade_021_to_022() {
 	global $config;
 	/* move gateway to wan interface */
 	$config['interfaces']['wan']['gateway'] = $config['system']['gateway'];
 }
 
-function upgrade_022_to_023() {
-	global $config;
-	if(isset($config['shaper'])) {
-		/* wipe previous shaper configuration */
-		unset($config['shaper']);
-	}
-}
-
 function upgrade_024_to_025() {
 	global $config;
 	$config['interfaces']['wan']['use_rrd_gateway'] = $config['system']['use_rrd_gateway'];
@@ -638,16 +617,6 @@ function upgrade_040_to_041() {
 	}
 }
 
-
-function upgrade_041_to_042() {
-	global $config;
-	if (isset($config['shaper']))
-		unset($config['shaper']);
-	if (isset($config['ezshaper']))
-		unset($config['ezshaper']);
-}
-
-
 function upgrade_042_to_043() {
 	global $config;
 	/* migrate old interface gateway to the new gateways config */
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize
index 0f1534fc2..80dc87e19 100755
--- a/src/etc/rc.filter_synchronize
+++ b/src/etc/rc.filter_synchronize
@@ -295,8 +295,6 @@ if (is_array($config['hasync'])) {
 			$config['wol'] = array();
 		$sections[] = 'wol';
 	}
-	if ($hasync['synchronizetrafficshaper'] != "" and is_array($config['shaper']))
-		$sections[] = 'shaper';
 	if ($hasync['synchronizestaticroutes'] != "") {
 		if (!is_array($config['staticroutes']))
 			$config['staticroutes'] = array();
diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip
index b7c0b87a6..ae951575c 100755
--- a/src/etc/rc.initial.setlanip
+++ b/src/etc/rc.initial.setlanip
@@ -438,8 +438,6 @@ if(!$config['interfaces']['lan']) {
 		unset($config['dhcpd']['lan']);
 	if($config['dhcpdv6']['lan'])
 		unset($config['dhcpdv6']['lan']);
-	unset($config['shaper']);
-	unset($config['ezshaper']);
 	unset($config['nat']);
 	if (!$dry_run) {
 		system("rm /var/dhcpd/var/db/* >/dev/null 2>/dev/null");
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index 40194a148..187bc20a7 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -154,7 +154,6 @@ function spit_out_select_items($name, $showall) {
 		       "staticroutes" => gettext("Static routes"),
 		       "sysctl" => gettext("System tunables"),
 		       "snmpd" => gettext("SNMP Server"),
-		       "shaper" => gettext("Traffic Shaper"),
 		       "vlans" => gettext("VLANS"),
 		       "wol" => gettext("Wake on LAN")
 		);
@@ -342,7 +341,6 @@ if ($_POST) {
 								if($m0n0wall_upgrade == true) {
 									if($config['system']['gateway'] <> "")
 										$config['interfaces']['wan']['gateway'] = $config['system']['gateway'];
-									unset($config['shaper']);
 									/* optional if list */
 									$ifdescrs = get_configured_interface_list(true, true);
 									/* remove special characters from interface descriptions */