From afd1c0fe7d481ecab6b966ab01dcab2be61d5bcd Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 30 May 2016 16:38:43 +0200
Subject: [PATCH] (filter, plugin, pppoe) items->item

---
 src/etc/inc/filter.inc            | 4 ++--
 src/etc/inc/plugins.inc.d/vpn.inc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 28f61a5ae..3704201b4 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -1150,8 +1150,8 @@ function filter_nat_rules_automatic_tonathosts(&$FilterIflist, $with_descr = fal
     }
 
     /* PPPoE subnet */
-    if (isset($FilterIflist['pppoe']['items']) && is_array($FilterIflist['pppoe']['items'])) {
-        foreach ($FilterIflist['pppoe']['items'] as $pppoe) {
+    if (isset($FilterIflist['pppoe']['item']) && is_array($FilterIflist['pppoe']['item'])) {
+        foreach ($FilterIflist['pppoe']['item'] as $pppoe) {
             if (is_private_ip($pppoe['ip'])) {
                 $tonathosts[] = "{$pppoe['sa']}/{$pppoe['sn']}";
                 $descriptions[] = gettext("PPPoE server");
diff --git a/src/etc/inc/plugins.inc.d/vpn.inc b/src/etc/inc/plugins.inc.d/vpn.inc
index acfac87e0..0ec824c17 100644
--- a/src/etc/inc/plugins.inc.d/vpn.inc
+++ b/src/etc/inc/plugins.inc.d/vpn.inc
@@ -696,15 +696,15 @@ function vpn_interface()
     }
 
     if (isset($config['pppoes']['pppoe'])) {
-        $pppoeifs = array('items' => array());
+        $pppoeifs = array('item' => array());
         foreach($config['pppoes']['pppoe'] as $pppoe) {
             if ($pppoe['mode'] == "server") {
                 $item = array('ip' => $pppoe['localip'], 'sa' => $pppoe['remoteip']);
                 $item['sn'] = !empty($pppoe['pppoe_subnet']) ?  $pppoe['pppoe_subnet'] : "32";
-                $pppoeifs['items'][] = $item;
+                $pppoeifs['item'][] = $item;
             }
         }
-        if (count($pppoeifs['items'])) {
+        if (count($pppoeifs['item'])) {
             $pppoeifs['enable'] = true;
             $pppoeifs['if'] = 'pppoe';
             $pppoeifs['descr'] = 'pppoe';