From 121ffe5d3f0949bac9d6e27ac1c473a42dbd2706 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 21 Apr 2023 09:55:04 -0600
Subject: [PATCH] Remove access_control_nodes node_domain

This is handled automatically to make it easier and prevent mistakes
---
 app/access_controls/app_defaults.php | 77 +++++++++++++---------------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php
index 1ebfb648c5..1cd61c3425 100644
--- a/app/access_controls/app_defaults.php
+++ b/app/access_controls/app_defaults.php
@@ -67,63 +67,58 @@
 				if (is_array($conf_array['network-lists']['list'])) {
 					foreach($conf_array['network-lists']['list'] as $list) {
 						//get the attributes
-							$access_control_name = $list['@attributes']['name'];
-							$access_control_default = $list['@attributes']['default'];
+						$access_control_name = $list['@attributes']['name'];
+						$access_control_default = $list['@attributes']['default'];
 
 						//insert the name, description
-							$access_control_uuid = uuid();
-							$array['access_controls'][0]['access_control_uuid'] = $access_control_uuid;
-							$array['access_controls'][0]['access_control_name'] = $access_control_name;
-							$array['access_controls'][0]['access_control_default'] = $access_control_default;
+						$access_control_uuid = uuid();
+						$array['access_controls'][0]['access_control_uuid'] = $access_control_uuid;
+						$array['access_controls'][0]['access_control_name'] = $access_control_name;
+						$array['access_controls'][0]['access_control_default'] = $access_control_default;
 
-							$p = new permissions;
-							$p->add('access_control_add', 'temp');
+						$p = new permissions;
+						$p->add('access_control_add', 'temp');
 
-							$database = new database;
-							$database->app_name = 'access_controls';
-							$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
-							$database->save($array, false);
-							unset($array);
+						$database = new database;
+						$database->app_name = 'access_controls';
+						$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+						$database->save($array, false);
+						unset($array);
 
-							$p->delete('access_control_add', 'temp');
+						$p->delete('access_control_add', 'temp');
 
 					//normalize the array - needed because the array is inconsistent when there is only one row vs multiple
-						if (strlen($list['node']['@attributes']['type']) > 0) {
-							$list['node'][]['@attributes'] = $list['node']['@attributes'];
-							unset($list['node']['@attributes']);
-						}
+					if (strlen($list['node']['@attributes']['type']) > 0) {
+						$list['node'][]['@attributes'] = $list['node']['@attributes'];
+						unset($list['node']['@attributes']);
+					}
 
 					//add the nodes
 						if (is_array($list['node'])) {
 							foreach ($list['node'] as $row) {
 								//get the name and value pair
-									$node_type = $row['@attributes']['type'];
-									$node_cidr = $row['@attributes']['cidr'];
-									$node_domain = $row['@attributes']['domain'];
-									$node_description = $row['@attributes']['description'];
-								//replace $${domain}
-									if (strlen($node_domain) > 0) {
-										$node_domain = str_replace("\$\${domain}", $domain_name, $node_domain);
-									}
+								$node_type = $row['@attributes']['type'];
+								$node_cidr = $row['@attributes']['cidr'];
+								$node_description = $row['@attributes']['description'];
+
 								//add the profile settings into the database
-									$access_control_node_uuid = uuid();
-									$array['access_control_nodes'][0]['access_control_node_uuid'] = $access_control_node_uuid;
-									$array['access_control_nodes'][0]['access_control_uuid'] = $access_control_uuid;
-									$array['access_control_nodes'][0]['node_type'] = $node_type;
-									$array['access_control_nodes'][0]['node_cidr'] = $node_cidr;
-									$array['access_control_nodes'][0]['node_domain'] = $node_domain;
-									$array['access_control_nodes'][0]['node_description'] = $node_description;
+								$access_control_node_uuid = uuid();
+								$array['access_control_nodes'][0]['access_control_node_uuid'] = $access_control_node_uuid;
+								$array['access_control_nodes'][0]['access_control_uuid'] = $access_control_uuid;
+								$array['access_control_nodes'][0]['node_type'] = $node_type;
+								$array['access_control_nodes'][0]['node_cidr'] = $node_cidr;
+								$array['access_control_nodes'][0]['node_description'] = $node_description;
 
-									$p = new permissions;
-									$p->add('access_control_node_add', 'temp');
+								$p = new permissions;
+								$p->add('access_control_node_add', 'temp');
 
-									$database = new database;
-									$database->app_name = 'access_controls';
-									$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
-									$database->save($array, false);
-									unset($array);
+								$database = new database;
+								$database->app_name = 'access_controls';
+								$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+								$database->save($array, false);
+								unset($array);
 
-									$p->delete('access_control_node_add', 'temp');
+								$p->delete('access_control_node_add', 'temp');
 							}
 						}
 					}