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
This commit is contained in:
parent
2be3ad4470
commit
39bd197437
|
|
@ -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'] = "";
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
Loading…
Reference in New Issue