From 0154e149f6d364d1ea2781d402d7df5a88b0f28b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 24 Jan 2022 13:28:54 -0700 Subject: [PATCH] Make it possible to use domain_name variable in the provision setting. (#6260) * Make it possible to use domain_name variable in the provision setting. * Set https://{$domain_name}/app/provision/ as the default value for yealink_provision_url. --- app/provision/resources/classes/provision.php | 6 +++++- app/yealink/app_config.php | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index c452fdb8e0..db765d2991 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -303,7 +303,11 @@ include "root.php"; elseif (isset($val['boolean'])) { $value = $val['boolean']; } elseif (isset($val['numeric'])) { $value = $val['numeric']; } elseif (is_array($val) && !is_uuid($val['uuid'])) { $value = $val; } - if (isset($value)) { $provision[$key] = $value; } + if (isset($value)) { + $value = str_replace('${domain_name}', $domain_name, $value); + $value = str_replace('{$domain_name}', $domain_name, $value); + $provision[$key] = $value; + } unset($value); } } diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index 8a837b8321..c74bc4775d 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -35,8 +35,8 @@ $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_provision_url"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = 'https://{$domain_name}/app/provision/'; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Provisioning URL for Yealink"; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fc2fa8cd-b14e-48e3-99bd-7c01c9d6208d";