summaryrefslogtreecommitdiffstats
path: root/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-01-09 01:20:05 +0545
committerChris Buechler <cmb@pfsense.org>2015-01-08 14:26:02 -0600
commitbad9dec5e64fbeef35090748248fcc0d1edc7bff (patch)
tree86605f1e9912a5e27f601514f7c1e8ab6b3fb5b7 /usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
parent7c1c70d5ea751213307fec9e522a7f032c0c9499 (diff)
downloadpfsense-bad9dec5e64fbeef35090748248fcc0d1edc7bff.zip
pfsense-bad9dec5e64fbeef35090748248fcc0d1edc7bff.tar.gz
Deprecated and non-static method messages
Fix various files that can emit messages like: PHP Strict Standards: Non-static method SimplePie_Misc::array_unique() should not be called statically, assuming $this from incompatible context in /etc/inc/simplepie/simplepie.inc on line 5508 php-fpm[16262]: /rc.newipsecdns: PHP ERROR: Type: 8192, File: /etc/inc/shaper.inc, Line: 4365, Message: Assigning the return value of new by reference is deprecated Some of these style messages have been reported on the forum, e.g. https://forum.pfsense.org/index.php?topic=86448.0 I had RSS widget on, and simplepie sent the system beserk telling about all this stuff.
Diffstat (limited to 'usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc')
-rw-r--r--usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc96
1 files changed, 48 insertions, 48 deletions
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 c3e0e28..c4b8c2d 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;
OpenPOWER on IntegriCloud