missed some inc files for opnsense/core#2670

opnsense · Nov 29, 2018 · 94c0467 · 94c0467
1 parent d3f7e3d
commit 94c0467
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/net/frr/src/etc/inc/plugins.inc.d/frr.inc b/net/frr/src/etc/inc/plugins.inc.d/frr.inc
@@ -45,7 +45,7 @@ function frr_firewall($fw)
     $ospf = new \OPNsense\Quagga\OSPF();
 
     if ((string)$ospf->enabled == '1') {
-        foreach ($ospf->networks->network->__items as $network) {
+        foreach ($ospf->networks->network->iterateItems() as $network) {
             if ((string)$network->enabled == '1') {
                 $fw->registerFilterRule(
                     1, /* priority */

diff --git a/net/ftp-proxy/src/etc/inc/plugins.inc.d/ftpproxy.inc b/net/ftp-proxy/src/etc/inc/plugins.inc.d/ftpproxy.inc
@@ -30,7 +30,7 @@ function ftpproxy_enabled()
 {
     $model = new \OPNsense\FtpProxy\FtpProxy();
 
-    foreach ($model->ftpproxy->__items as $server) {
+    foreach ($model->ftpproxy->iterateItems() as $server) {
         if ($server->enabled == '1') {
             return true;
         }

diff --git a/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc b/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc
@@ -40,7 +40,7 @@ function quagga_firewall($fw)
 {
     if (ospfd_enabled()) {
         $ospf = new \OPNsense\Quagga\OSPF();
-        foreach ($ospf->networks->network->__items as $network) {
+        foreach ($ospf->networks->network->iterateItems() as $network) {
             if ((string)$network->enabled == '1') {
                 $fw->registerFilterRule(
                     1, /* priority */

diff --git a/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc b/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc
@@ -30,7 +30,7 @@ function tinc_enabled()
 {
     $mdl = new \OPNsense\Tinc\Tinc();
 
-    foreach ($mdl->networks->network->__items as $network) {
+    foreach ($mdl->networks->network->iterateItems() as $network) {
         if ($network->enabled == '1') {
             return true;
         }
@@ -49,7 +49,7 @@ function tinc_syslog()
     );
     $mdl = new \OPNsense\Tinc\Tinc();
 
-    foreach ($mdl->networks->network->__items as $network) {
+    foreach ($mdl->networks->network->iterateItems() as $network) {
         if ($network->enabled == '1') {
             $logfacilities['tinc']['facility'][] = 'tinc.'.$network->name;
         }

diff --git a/security/tor/src/opnsense/scripts/tor/get_hostnames b/security/tor/src/opnsense/scripts/tor/get_hostnames
@@ -37,7 +37,7 @@ use \OPNsense\Tor\HiddenService;
 
 $hostnames = array();
 $services = new HiddenService();
-foreach ($services->service->__items as $service) {
+foreach ($services->service->iterateItems() as $service) {
     $directory_name = ((string)$service->name);
     $hostnamefile = TOR_DATA_DIR . '/' . $directory_name . '/hostname';
     if (file_exists($hostnamefile)) {