From 39bd197437e521dc6a5780b916723cb84398f1a1 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 18 Feb 2022 13:53:32 -0700
Subject: [PATCH] Add contact permissions to default settings. Default false
 (#6314)

* Change contact_permissions to contact.permissions

* Update provision.php

* Remove provision contact permissions for a broader setting.

* Add contact permissions to default settings with a default value of false.

* Update app_config.php
---
 app/contacts/app_config.php                   | 7 +++++++
 app/provision/app_config.php                  | 8 --------
 app/provision/resources/classes/provision.php | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index efa0ac87e5..1adbf8f90b 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -951,5 +951,12 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Define the allowed file attachment extensions and their mime types in a JSON array.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8998b7f-c27c-43ac-ad1b-a9c66187bb10";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "contact";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "permissions";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 
 ?>
diff --git a/app/provision/app_config.php b/app/provision/app_config.php
index f37a8173cf..1cb294b530 100644
--- a/app/provision/app_config.php
+++ b/app/provision/app_config.php
@@ -271,14 +271,6 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f094c084-c642-4a12-b9a1-64a0b67ac47f";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "contact_permissions";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
-		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6c4430f6-3713-4c8b-9da3-eaf1705d7dc3";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "contact_users";
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 8cd0914730..2266b16ae5 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -893,7 +893,7 @@ include "root.php";
 
 				//get the list of contact directly assigned to the user
 					if (is_uuid($domain_uuid)) {
-						if ($_SESSION['provision']['contact_permissions']['boolean'] == "true") {
+						if ($_SESSION['contact']['permissions']['boolean'] == "true") {
 							//get the contacts assigned to the groups and add to the contacts array
 								if (is_uuid($device_user_uuid) && $_SESSION['provision']['contact_groups']['boolean'] == "true") {
 									$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, 'groups');