diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-01-09 00:40:01 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2015-01-09 00:40:01 -0600 |
commit | 23ca569527ad015e196b152bd3c0ac27314cf7c5 (patch) | |
tree | f33f7206dbf9b5b35c72f2225e16fc2625b3b4df /usr/local/www | |
parent | 79ac2ee0d2f64b2335d295a0667aa404dab9e9fc (diff) | |
download | pfsense-23ca569527ad015e196b152bd3c0ac27314cf7c5.zip pfsense-23ca569527ad015e196b152bd3c0ac27314cf7c5.tar.gz |
This broke a variety of things. Revert "Deprecated and non-static method messages"
This reverts commit 91b9a02fb131746c67fdf9f34282f123a13f1b13.
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/firewall_shaper.php | 2 | ||||
-rw-r--r-- | usr/local/www/firewall_shaper_layer7.php | 2 | ||||
-rw-r--r-- | usr/local/www/firewall_shaper_vinterface.php | 2 | ||||
-rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 96 | ||||
-rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | 96 |
5 files changed, 99 insertions, 99 deletions
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 24ff2a2..99ec1f6 100644 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -203,7 +203,7 @@ if ($_GET) { unset($input_errors); if ($addnewaltq) { - $altq = new altq_root_queue(); + $altq =& new altq_root_queue(); $altq->SetInterface($interface); switch ($altq->GetBwscale()) { diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php index 059f3aa..64e2457 100644 --- a/usr/local/www/firewall_shaper_layer7.php +++ b/usr/local/www/firewall_shaper_layer7.php @@ -130,7 +130,7 @@ else if ($_POST) { $l7r = $layer7_rules_list[$name]; $_POST['divert_port'] = $l7r->GetRPort(); } else { - $l7r = new layer7(); + $l7r =& new layer7(); $_POST['divert_port'] = $l7r->gen_divert_port(); } for($i=0; $_POST['protocol'][$i] <> ""; $i++) { diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index 82255bb..0930af1 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -204,7 +204,7 @@ if ($_GET) { if (!empty($dummynet_pipe_list[$qname])) $input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter"); else { - $dnpipe = new dnpipe_class(); + $dnpipe =& new dnpipe_class(); $dnpipe->ReadConfig($_POST); $dnpipe->validate_input($_POST, $input_errors); diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 2924038..82a2b82 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -671,7 +671,7 @@ function apply_all_choosen_items() { for ($i = 0; $i < $steps; $i++) { $tmppath = array(); - $altq = new altq_root_queue(); + $altq =& new altq_root_queue(); $altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]); $interfacelist[] = $config['ezshaper']['step2']["conn{$i}interface"]; @@ -768,9 +768,9 @@ function apply_all_choosen_items() { if ($sched != "PRIQ") { if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; @@ -799,11 +799,11 @@ function apply_all_choosen_items() { } if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qACK"; $tmpcf['priority'] = 6; @@ -829,11 +829,11 @@ function apply_all_choosen_items() { $qtmp->wconfig(); if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); if ($p2pcatchall) $tmpcf['name'] = "qOthersDefault"; @@ -861,11 +861,11 @@ function apply_all_choosen_items() { if ($p2p) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qP2P"; $tmpcf['priority'] = 1; @@ -911,11 +911,11 @@ function apply_all_choosen_items() { if ($voip) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qVoIP"; $tmpcf['priority'] = 7; @@ -951,11 +951,11 @@ function apply_all_choosen_items() { if ($games) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qGames"; $tmpcf['priority'] = 5; @@ -982,11 +982,11 @@ function apply_all_choosen_items() { if ($otherpriority) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersHigh"; $tmpcf['priority'] = 4; @@ -1012,11 +1012,11 @@ function apply_all_choosen_items() { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersLow"; $tmpcf['priority'] = 2; @@ -1057,7 +1057,7 @@ function apply_all_choosen_items() { $downbw = floatval($config['ezshaper']['step2']["conn{$i}download"]) * $downfactor; $tmppath = array(); - $altq = new altq_root_queue(); + $altq =& new altq_root_queue(); $altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]); $altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]); @@ -1152,11 +1152,11 @@ function apply_all_choosen_items() { if (!$p2pcatchall) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qLink"; $tmpcf['priority'] = 2; @@ -1182,9 +1182,9 @@ function apply_all_choosen_items() { if ($sched != "PRIQ") { if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; @@ -1212,11 +1212,11 @@ function apply_all_choosen_items() { } if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qACK"; $tmpcf['priority'] = 6; @@ -1242,11 +1242,11 @@ function apply_all_choosen_items() { if ($p2p) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qP2P"; $tmpcf['priority'] = 1; @@ -1292,11 +1292,11 @@ function apply_all_choosen_items() { if ($voip) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qVoIP"; $tmpcf['priority'] = 7; @@ -1332,11 +1332,11 @@ function apply_all_choosen_items() { if ($games) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qGames"; $tmpcf['priority'] = 5; @@ -1363,11 +1363,11 @@ function apply_all_choosen_items() { if ($otherpriority) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersHigh"; $tmpcf['priority'] = 4; @@ -1392,11 +1392,11 @@ function apply_all_choosen_items() { $qtmp->wconfig(); if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersLow"; $tmpcf['priority'] = 3; diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index c4b8c2d..c3e0e28 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -719,7 +719,7 @@ function apply_all_choosen_items() { for ($i = 0; $i < $steps; $i++) { $tmppath = array(); - $altq = new altq_root_queue(); + $altq =& new altq_root_queue(); $altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]); $interfacelist[] = $config['ezshaper']['step2']["conn{$i}interface"]; @@ -817,9 +817,9 @@ function apply_all_choosen_items() { if ($sched != "PRIQ") { if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; @@ -851,11 +851,11 @@ function apply_all_choosen_items() { } if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qACK"; $tmpcf['priority'] = 6; @@ -881,11 +881,11 @@ function apply_all_choosen_items() { $qtmp->wconfig(); if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); if ($p2pcatchall) $tmpcf['name'] = "qOthersDefault"; @@ -913,11 +913,11 @@ function apply_all_choosen_items() { if ($p2p) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qP2P"; $tmpcf['priority'] = 1; @@ -963,11 +963,11 @@ function apply_all_choosen_items() { if ($voip) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qVoIP"; $tmpcf['priority'] = 7; @@ -1003,11 +1003,11 @@ function apply_all_choosen_items() { if ($games) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qGames"; $tmpcf['priority'] = 5; @@ -1034,11 +1034,11 @@ function apply_all_choosen_items() { if ($otherpriority) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersHigh"; $tmpcf['priority'] = 4; @@ -1064,11 +1064,11 @@ function apply_all_choosen_items() { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersLow"; $tmpcf['priority'] = 2; @@ -1118,7 +1118,7 @@ function apply_all_choosen_items() { for ($i = 0; $i < $localint; $i++) { $tmppath = array(); - $altq = new altq_root_queue(); + $altq =& new altq_root_queue(); $altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]); $altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]); @@ -1215,11 +1215,11 @@ function apply_all_choosen_items() { if (!$p2pcatchall) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qLink"; $tmpcf['priority'] = 2; @@ -1245,9 +1245,9 @@ function apply_all_choosen_items() { if ($sched != "PRIQ") { if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; @@ -1275,11 +1275,11 @@ function apply_all_choosen_items() { } if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qACK"; $tmpcf['priority'] = 6; @@ -1306,11 +1306,11 @@ function apply_all_choosen_items() { if ($p2p) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qP2P"; $tmpcf['priority'] = 1; @@ -1356,11 +1356,11 @@ function apply_all_choosen_items() { if ($voip) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qVoIP"; $tmpcf['priority'] = 7; @@ -1396,11 +1396,11 @@ function apply_all_choosen_items() { if ($games) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qGames"; $tmpcf['priority'] = 5; @@ -1427,11 +1427,11 @@ function apply_all_choosen_items() { if ($otherpriority) { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersHigh"; $tmpcf['priority'] = 4; @@ -1457,11 +1457,11 @@ function apply_all_choosen_items() { if ($sched == "PRIQ") - $q = new priq_queue(); + $q =& new priq_queue(); else if ($sched == "CBQ") - $q = new cbq_queue(); + $q =& new cbq_queue(); else if ($sched == "HFSC") - $q = new hfsc_queue(); + $q =& new hfsc_queue(); $tmpcf = array(); $tmpcf['name'] = "qOthersLow"; $tmpcf['priority'] = 3; |