diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index d4f6695291..1e09562e28 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -965,7 +965,7 @@ $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled, "; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled."; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e1d03aea-1563-4c57-86de-4d4d274b8352"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; diff --git a/app/yealink/app_defaults.php b/app/yealink/app_defaults.php index 5ecfbd223b..f28fc39f2d 100644 --- a/app/yealink/app_defaults.php +++ b/app/yealink/app_defaults.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2020 + Portions created by the Initial Developer are Copyright (C) 2022 the Initial Developer. All Rights Reserved. Contributor(s): @@ -26,10 +26,33 @@ //process this only one time if ($domains_processed == 1) { - + + //if yealink_trust_certificates is true or false then update to 1 or 0 + $sql = "select default_setting_uuid, default_setting_value from v_default_settings "; + $sql .= "where default_setting_subcategory = 'yealink_trust_certificates' "; + $sql .= "and (default_setting_value = 'true' or default_setting_value = 'false');"; + $database = new database; + $row = $database->select($sql, null, 'row'); + if (is_array($row)) { + if ($row['default_setting_value'] == 'false') { + $row['default_setting_value'] = '0'; + } + else { + $row['default_setting_value'] = '1'; + } + $sql = "update v_default_settings "; + $sql .= "set default_setting_value = ".$row['default_setting_value'].", "; + $sql .= "default_setting_description = 'Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled.' "; + $sql .= "where default_setting_uuid = '".$row['default_setting_uuid']."'; "; + $database = new database; + $database->execute($sql, null); + unset($sql); + } + //correct yealink_codec_opus_priority values if ($db_type == 'pgsql') { - $sql = "select pg_typeof(default_setting_enabled) from v_default_settings limit 1;"; + $sql = "select pg_typeof(default_setting_enabled) "; + $sql .= "from v_default_settings limit 1;"; $database = new database; $enabled_type = $database->select($sql, null, 'column'); if ($enabled_type == 'text') { @@ -42,4 +65,4 @@ } } - +