From aa9fbd8a3a2b92eca7e29ea3f6ee506bbe3b5b9c Mon Sep 17 00:00:00 2001
From: devdatt <shreebhattji@urmic.org>
Date: Tue, 23 Dec 2025 01:40:11 +0530
Subject: [PATCH] update

---
 encoder/network.php | 27 ++++++++++++---------------
 encoder/static.php  | 45 ++++++++++++++++-----------------------------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/encoder/network.php b/encoder/network.php
index dce7b8c..4419973 100755
--- a/encoder/network.php
+++ b/encoder/network.php
@@ -136,32 +136,29 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
         $uses_vlan = ($primary_vlan !== '' || $secondary_vlan !== '');
 
-        /* ---------- No VLAN ---------- */
         if (!$uses_vlan) {
             $netplan['network']['ethernets'][$iface] =
                 build_interface($data['primary'], 'primary');
-        }
-        /* ---------- VLAN mode ---------- */ else {
-            // base interface must exist as {}
+        } else {
             $netplan['network']['ethernets'][$iface] = new stdClass();
 
             if ($primary_vlan !== '') {
-                $vif = "{$iface}.{$primary_vlan}";
-                $netplan['network']['vlans'][$vif] = array_merge([
-                    'id'   => (int)$primary_vlan,
-                    'link' => $iface
-                ], build_interface($data['primary'], 'primary'));
+                $netplan['network']['vlans']["{$iface}.{$primary_vlan}"] =
+                    array_merge(
+                        ['id' => (int)$primary_vlan, 'link' => $iface],
+                        build_interface($data['primary'], 'primary')
+                    );
             }
 
             if ($secondary_vlan !== '') {
-                $vif = "{$iface}.{$secondary_vlan}";
-                $netplan['network']['vlans'][$vif] = array_merge([
-                    'id'   => (int)$secondary_vlan,
-                    'link' => $iface
-                ], build_interface($data['secondary'], 'secondary'));
+                $netplan['network']['vlans']["{$iface}.{$secondary_vlan}"] =
+                    array_merge(
+                        ['id' => (int)$secondary_vlan, 'link' => $iface],
+                        build_interface($data['secondary'], 'secondary')
+                    );
             }
         }
-        
+
         $yaml = netplan_yaml($netplan);
         file_put_contents('/var/www/50-cloud-init.yaml', $yaml);
     }
diff --git a/encoder/static.php b/encoder/static.php
index be09a0c..159559b 100755
--- a/encoder/static.php
+++ b/encoder/static.php
@@ -81,7 +81,7 @@ function build_interface(array $d, string $key): array
     $addresses = [];
     $routes = [];
 
-    /* ---------- IPv4 ---------- */
+    /* IPv4 */
     switch ($d['mode'] ?? 'disabled') {
         case 'dhcp':
             $cfg['dhcp4'] = true;
@@ -89,14 +89,10 @@ function build_interface(array $d, string $key): array
 
         case 'static':
             if (!empty($d["network_{$key}_ip"]) && !empty($d["network_{$key}_subnet"])) {
-                $addresses[] =
-                    $d["network_{$key}_ip"] . '/' . $d["network_{$key}_subnet"];
+                $addresses[] = $d["network_{$key}_ip"] . '/' . $d["network_{$key}_subnet"];
             }
             if (!empty($d["network_{$key}_gateway"])) {
-                $routes[] = [
-                    'to'  => 'default',
-                    'via' => $d["network_{$key}_gateway"]
-                ];
+                $routes[] = ['to' => 'default', 'via' => $d["network_{$key}_gateway"]];
             }
             $cfg['dhcp4'] = false;
             break;
@@ -105,9 +101,9 @@ function build_interface(array $d, string $key): array
             $cfg['dhcp4'] = false;
     }
 
-    /* ---------- IPv6 ---------- */
+    /* IPv6 */
     switch ($d['modev6'] ?? 'disabled') {
-        case 'auto': // SLAAC
+        case 'auto':
             $cfg['accept-ra'] = true;
             $cfg['dhcp6'] = false;
             break;
@@ -119,14 +115,10 @@ function build_interface(array $d, string $key): array
 
         case 'static':
             if (!empty($d["network_{$key}_ipv6"]) && !empty($d["network_{$key}_ipv6_prefix"])) {
-                $addresses[] =
-                    $d["network_{$key}_ipv6"] . '/' . $d["network_{$key}_ipv6_prefix"];
+                $addresses[] = $d["network_{$key}_ipv6"] . '/' . $d["network_{$key}_ipv6_prefix"];
             }
             if (!empty($d["network_{$key}_ipv6_gateway"])) {
-                $routes[] = [
-                    'to'  => '::/0',
-                    'via' => $d["network_{$key}_ipv6_gateway"]
-                ];
+                $routes[] = ['to' => '::/0', 'via' => $d["network_{$key}_ipv6_gateway"]];
             }
             $cfg['dhcp6'] = false;
             $cfg['accept-ra'] = false;
@@ -153,9 +145,7 @@ function build_interface(array $d, string $key): array
     ]));
 
     if ($dns) {
-        $cfg['nameservers'] = [
-            'addresses' => $dns
-        ];
+        $cfg['nameservers'] = ['addresses' => $dns];
     }
 
     return $cfg;
@@ -164,7 +154,6 @@ function build_interface(array $d, string $key): array
 
 function netplan_yaml(array $data, int $indent = 0): string
 {
-
     $yaml = '';
     $pad  = str_repeat('  ', $indent);
 
@@ -175,11 +164,15 @@ function netplan_yaml(array $data, int $indent = 0): string
             continue;
         }
 
-        if (is_array($value) && array_keys($value) === range(0, count($value) - 1)) {
+        if (is_array($value) && !array_is_list($value)) {
+            $yaml .= "{$pad}{$key}:\n";
+            $yaml .= netplan_yaml($value, $indent + 1);
+            continue;
+        }
+
+        if (is_array($value) && array_is_list($value)) {
             foreach ($value as $item) {
-                if ($item instanceof stdClass) {
-                    $yaml .= "{$pad}- {}\n";
-                } elseif (is_array($item)) {
+                if (is_array($item)) {
                     $yaml .= "{$pad}-\n";
                     $yaml .= netplan_yaml($item, $indent + 1);
                 } else {
@@ -189,12 +182,6 @@ function netplan_yaml(array $data, int $indent = 0): string
             continue;
         }
 
-        if (is_array($value)) {
-            $yaml .= "{$pad}{$key}:\n";
-            $yaml .= netplan_yaml($value, $indent + 1);
-            continue;
-        }
-
         if (is_bool($value)) {
             $value = $value ? 'true' : 'false';
         }