From 735388531042679710d78e7359744dccc3aa4ded Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 29 Jun 2021 22:58:11 +0200
Subject: [PATCH] Fixed saving empty vlans

---
 application/Pop/Pop.php           | 2 ++
 application/Pop/PopController.php | 6 +++---
 application/Pop/PopModel.php      | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/Pop/Pop.php b/application/Pop/Pop.php
index d242218dc..b877eb907 100644
--- a/application/Pop/Pop.php
+++ b/application/Pop/Pop.php
@@ -1,6 +1,8 @@
 <?php
 
 class Pop extends mfBaseModel {
+  protected $forcestr = ['vlan_public', 'vlan_nat', 'vlan_ipv6'];
+  
   private $network;
   
   public function getProperty($name) {
diff --git a/application/Pop/PopController.php b/application/Pop/PopController.php
index 001c28da2..26ea002f0 100644
--- a/application/Pop/PopController.php
+++ b/application/Pop/PopController.php
@@ -75,9 +75,9 @@ class PopController extends mfBaseController {
     $data['gps_lat'] = $r->gps_lat;
     $data['gps_long'] = $r->gps_long;
     $data['location'] = $r->location;
-    $data['vlan_public'] = $r->vlan_public;
-    $data['vlan_nat'] = $r->vlan_nat;
-    $data['vlan_ipv6'] = $r->vlan_ipv6;
+    $data['vlan_public'] = ($r->vlan_public) ? $r->vlan_public : null;
+    $data['vlan_nat'] = ($r->vlan_nat) ? $r->vlan_nat: null;
+    $data['vlan_ipv6'] = ($r->vlan_ipv6) ? $r->vlan_ipv6: null;
     $data['note'] = $r->note;
     
     $data['edit_by'] = 1;
diff --git a/application/Pop/PopModel.php b/application/Pop/PopModel.php
index bc9a8bf7a..5bf80e365 100644
--- a/application/Pop/PopModel.php
+++ b/application/Pop/PopModel.php
@@ -26,7 +26,11 @@ class PopModel {
     
     foreach($data as $field => $value) {
       if(property_exists(get_called_class(), $field)) {
-        $model ->$field = $value;
+        if(substr($field, 0, 5) == "vlan_" && !$value) {
+          $model->$field = null;
+          continue;
+        }
+        $model->$field = $value;
       }
     }