diff options
author | Phil Davis <phil.davis@inf.org> | 2015-01-09 01:20:05 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-01-09 01:20:05 +0545 |
commit | 91b9a02fb131746c67fdf9f34282f123a13f1b13 (patch) | |
tree | 5a8a4e9c38f4bb4bcdfd9e8f1be7eaa23a5670d9 /usr | |
parent | 6d1907a3d2d9729f37fe15d0291d3a0f9a85a25e (diff) | |
download | pfsense-91b9a02fb131746c67fdf9f34282f123a13f1b13.zip pfsense-91b9a02fb131746c67fdf9f34282f123a13f1b13.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')
-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 99ec1f6..24ff2a2 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 64e2457..059f3aa 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 0930af1..82255bb 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 82a2b82..2924038 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 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; |