From f8e86531edab16835f888cbc2461bc6ecc3bebee Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 14 Nov 2016 07:38:39 +0100
Subject: [PATCH] net/ftp-proxy: use model for easier iteration code

PR: https://github.com/opnsense/plugins/issues/52
Suggested by: @adschellevis
---
 .../src/etc/inc/plugins.inc.d/ftpproxy.inc       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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
index 97b614854..0d17a7055 100644
--- a/net/ftp-proxy/src/etc/inc/plugins.inc.d/ftpproxy.inc
+++ b/net/ftp-proxy/src/etc/inc/plugins.inc.d/ftpproxy.inc
@@ -28,22 +28,14 @@
 
 function ftpproxy_enabled()
 {
-    global $config;
+    $model = new \OPNsense\FtpProxy\FtpProxy();
 
-    if (isset($config['OPNsense']['ftpproxies']['ftpproxy'][0])) {
-        foreach ($config['OPNsense']['ftpproxies']['ftpproxy'] as $ftpproxy) {
-            if (isset($ftpproxy['enabled']) && $ftpproxy['enabled']) {
-                return true;
-            }
+    foreach ($model->ftpproxy->__items as $server) {
+        if ($server->enabled == '1') {
+            return true;
         }
     }
 
-    /* we should always make arrays for these, too many potential bugs: */
-    if (isset($config['OPNsense']['ftpproxies']['ftpproxy']['enabled']) &&
-        $config['OPNsense']['ftpproxies']['ftpproxy']['enabled']) {
-        return true;
-    }
-
     return false;
 }