From 8409ffe6ea560086e70c23a3c9c117a436827607 Mon Sep 17 00:00:00 2001
From: Tim Wilkinson <tim.j.wilkinson@gmail.com>
Date: Fri, 11 Mar 2022 13:59:50 -0800
Subject: [PATCH] Fix tunnel disply order (#286)

---
 files/www/cgi-bin/vpn  | 24 ++++++++++--------------
 files/www/cgi-bin/vpnc | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/files/www/cgi-bin/vpn b/files/www/cgi-bin/vpn
index 2090c1d0..e8bc12e0 100755
--- a/files/www/cgi-bin/vpn
+++ b/files/www/cgi-bin/vpn
@@ -210,23 +210,19 @@ end
 local gci_vars = { "enabled", "name", "passwd", "netip", "contact" }
 function get_client_info()
     local c = 0
-    local all = cursor:get_all("vtun")
-    if all then
-        for _, myclient in pairs(all)
-        do
-            if myclient[".type"] == "client" then
-                for _, var in ipairs(gci_vars)
-                do
-                    local key = "client" .. c .. "_" .. var
-                    parms[key] = myclient[var]
-                    if not parms[key] then
-                        parms[key] = ""
-                    end
+    cursor:foreach("vtun", "client",
+        function(section)
+            for _, var in ipairs(gci_vars)
+            do
+                local key = "client" .. c .. "_" .. var
+                parms[key] = section[var]
+                if not parms[key] then
+                    parms[key] = ""
                 end
-                c = c + 1
             end
+            c = c + 1
         end
-    end
+    )
     parms.client_num = c
 end
 
diff --git a/files/www/cgi-bin/vpnc b/files/www/cgi-bin/vpnc
index 0237472c..336867e3 100755
--- a/files/www/cgi-bin/vpnc
+++ b/files/www/cgi-bin/vpnc
@@ -194,23 +194,19 @@ end
 local gci_vars = { "enabled", "host", "passwd", "netip", "contact" }
 function get_connection_info()
     local c = 0
-    local conns = cursor:get_all("vtun")
-    if conns then
-        for _, myconn in pairs(conns)
-        do
-            if myconn[".type"] == "server" then
-                for _, var in ipairs(gci_vars)
-                do
-                    local key = "conn" .. c .. "_" .. var
-                    parms[key] = myconn[var]
-                    if not parms[key] then
-                        parms[key] = ""
-                    end
+    cursor:foreach("vtun", "server",
+        function(section)
+            for _, var in ipairs(gci_vars)
+            do
+                local key = "conn" .. c .. "_" .. var
+                parms[key] = section[var]
+                if not parms[key] then
+                    parms[key] = ""
                 end
-                c = c + 1
             end
+            c = c + 1
         end
-    end
+    )
     parms.conn_num = c
 end