From bc5b0d0ebc5d33e7894632e91456aeb38afd2bc6 Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 27 Nov 2019 11:03:54 -0700 Subject: [PATCH] Default/Domain Settings: Fix a few issues. --- core/default_settings/app_languages.php | 34 +++++++++++++++++++ .../default_settings/default_setting_edit.php | 6 ++++ core/default_settings/default_settings.php | 15 ++++---- core/domain_settings/domain_setting_edit.php | 26 ++++++++++++-- core/domain_settings/domain_settings.php | 15 ++++---- 5 files changed, 80 insertions(+), 16 deletions(-) diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php index bea5db444a..809266ba42 100644 --- a/core/default_settings/app_languages.php +++ b/core/default_settings/app_languages.php @@ -761,6 +761,40 @@ $text['label-image_text']['ru-ru'] = ""; $text['label-image_text']['sv-se'] = ""; $text['label-image_text']['uk-ua'] = ""; +$text['label-file']['en-us'] = "File"; +$text['label-file']['ar-eg'] = ""; +$text['label-file']['de-at'] = "Dateien"; //copied from de-de +$text['label-file']['de-ch'] = "Dateien"; //copied from de-de +$text['label-file']['de-de'] = "Dateien"; +$text['label-file']['es-cl'] = "Archivo"; +$text['label-file']['es-mx'] = "Archivo"; //copied from es-cl +$text['label-file']['fr-ca'] = "Fichier"; //copied from fr-fr +$text['label-file']['fr-fr'] = "Fichier"; +$text['label-file']['he-il'] = ""; +$text['label-file']['it-it'] = "File"; +$text['label-file']['nl-nl'] = "Bestanden"; +$text['label-file']['pl-pl'] = ""; +$text['label-file']['pt-br'] = "Ficheiro"; //copied from pt-pt +$text['label-file']['pt-pt'] = "Ficheiro"; +$text['label-file']['ro-ro'] = ""; + +$text['label-base64']['en-us'] = "Base64"; +$text['label-base64']['ar-eg'] = "Base64"; +$text['label-base64']['de-at'] = "Base64"; +$text['label-base64']['de-ch'] = "Base64"; +$text['label-base64']['de-de'] = "Base64"; +$text['label-base64']['es-cl'] = "Base64"; +$text['label-base64']['es-mx'] = "Base64"; +$text['label-base64']['fr-ca'] = "Base64"; +$text['label-base64']['fr-fr'] = "Base64"; +$text['label-base64']['he-il'] = "Base64"; +$text['label-base64']['it-it'] = "Base64"; +$text['label-base64']['nl-nl'] = "Base64"; +$text['label-base64']['pl-pl'] = "Base64"; +$text['label-base64']['pt-br'] = "Base64"; +$text['label-base64']['pt-pt'] = "Base64"; +$text['label-base64']['ro-ro'] = "Base64"; + $text['header-default_settings']['en-us'] = "Default Settings"; $text['header-default_settings']['ar-eg'] = ""; $text['header-default_settings']['de-at'] = "Standard Einstellungen"; //copied from de-de diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 6e2c69a794..11cffb6c79 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -591,6 +591,12 @@ echo " \n"; echo " \n"; } + elseif ($category == "recordings" && $subcategory == "storage_type" && $name == "text" ) { + echo " \n"; + } elseif (is_json($default_setting_value)) { echo " \n"; } diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index d666c3757e..e1d1d60a86 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -417,14 +417,15 @@ else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') { echo " ".$text['option-button_icons_'.$row['default_setting_value']]."\n"; } + else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { + echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['default_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['default_setting_value'], -0.18)).'; padding: -1px;')); + echo "".escape($row['default_setting_value'])."\n"; + } + else if ($category == 'recordings' && $subcategory == 'storage_type' && $name == 'text') { + echo " ".$text['label-'.$row['default_setting_value']]."\n"; + } else { - if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { - echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['default_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['default_setting_value'], -0.18)).'; padding: -1px;')); - echo "".escape($row['default_setting_value'])."\n"; - } - else { - echo " ".escape($row['default_setting_value'])."\n"; - } + echo " ".escape($row['default_setting_value'])."\n"; } echo " \n"; echo " \n"; diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 12ef52a719..ae33178eff 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -588,13 +588,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " "; } elseif ($category == "provision" && $subcategory == "aastra_time_format" && $name == "text" ) { - echo " \n"; echo " \n"; echo " \n"; echo " \n"; } elseif ($category == "provision" && $subcategory == "aastra_date_format" && $name == "text" ) { - echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -665,6 +665,28 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; } + elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "voicemail" && $subcategory == "keep_local" && $name == "boolean" ) { + echo " \n"; + } + elseif ($category == "recordings" && $subcategory == "storage_type" && $name == "text" ) { + echo " \n"; + } + elseif (is_json($row['domain_setting_value'])) { + echo " \n"; + } else { echo " \n"; } diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index f365cb0637..ecd3e95d9d 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -517,14 +517,15 @@ else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') { echo " ".$text['option-button_icons_'.$row['domain_setting_value']]."\n"; } + else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { + echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['domain_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['domain_setting_value'], -0.18)).'; padding: -1px;')); + echo "".escape($row['domain_setting_value'])."\n"; + } + else if ($category == 'recordings' && $subcategory == 'storage_type' && $name == 'text') { + echo " ".$text['label-'.$row['domain_setting_value']]."\n"; + } else { - if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { - echo " ".(img_spacer('15px', '15px', 'background: '.escape($row['domain_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['domain_setting_value'], -0.18)).'; padding: -1px;')); - echo "".escape($row['domain_setting_value'])."\n"; - } - else { - echo " ".escape($row['domain_setting_value'])."\n"; - } + echo " ".escape($row['domain_setting_value'])."\n"; } echo " \n"; echo " \n";