dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default/Domain Settings: Fix a few issues.

This commit is contained in:
Nate 2019-11-27 11:03:54 -07:00
parent 596ea126db
commit bc5b0d0ebc
5 changed files with 80 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/default_settings/app_languages.php
View File

@ -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

6
core/default_settings/default_setting_edit.php
View File

@ -591,6 +591,12 @@
echo " <option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
echo " </select>\n";
}
elseif ($category == "recordings" && $subcategory == "storage_type" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='file'>".$text['label-file']."</option>\n";
echo " <option value='base64' ".(($default_setting_value == "base64") ? "selected='selected'" : null).">".$text['label-base64']."</option>\n";
echo " </select>\n";
}
elseif (is_json($default_setting_value)) {
echo " <textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".$default_setting_value."</textarea>\n";
}

15
core/default_settings/default_settings.php
View File

@ -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 "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['default_setting_value'])."</span>\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 "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['default_setting_value'])."</span>\n";
}
else {
echo " ".escape($row['default_setting_value'])."\n";
}
echo " ".escape($row['default_setting_value'])."\n";
}
echo " </td>\n";
echo " <td valign='top' class='".$row_style[$c]." tr_link_void' style='text-align: center;'>\n";

26
core/domain_settings/domain_setting_edit.php
View File

@ -588,13 +588,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " </select>";
}
elseif ($category == "provision" && $subcategory == "aastra_time_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='1' ".(($domain_setting_value == "1") ? "selected='selected'" : null).">".$text['label-24-hour']."</option>\n";
echo " <option value='0' ".(($domain_setting_value == "0") ? "selected='selected'" : null).">".$text['label-12-hour']."</option>\n";
echo " </select>\n";
}
elseif ($category == "provision" && $subcategory == "aastra_date_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='0' ".(($domain_setting_value == "0") ? "selected='selected'" : null).">WWW MMM DD</option>\n";
echo " <option value='1' ".(($domain_setting_value == "1") ? "selected='selected'" : null).">DD-MMM-YY</option>\n";
echo " <option value='2' ".(($domain_setting_value == "2") ? "selected='selected'" : null).">YYYY-MM-DD</option>\n";
@ -665,6 +665,28 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='never' ".($row['domain_setting_value'] == "never" ? "selected='selected'" : null).">".$text['option-button_icons_never']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='listen' ".(($row['domain_setting_value'] == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
echo " <option value='link' ".(($row['domain_setting_value'] == "link") ? "selected='selected'" : null).">".$text['option-voicemail_file_link']."</option>\n";
echo " <option value='attach' ".(($row['domain_setting_value'] == "attach") ? "selected='selected'" : null).">".$text['option-voicemail_file_attach']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "keep_local" && $name == "boolean" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='true' ".(($row['domain_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
echo " <option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
echo " </select>\n";
}
elseif ($category == "recordings" && $subcategory == "storage_type" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='file'>".$text['label-file']."</option>\n";
echo " <option value='base64' ".(($row['domain_setting_value'] == "base64") ? "selected='selected'" : null).">".$text['label-base64']."</option>\n";
echo " </select>\n";
}
elseif (is_json($row['domain_setting_value'])) {
echo " <textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='domain_setting_value' name='domain_setting_value' wrap='off'>".$row['domain_setting_value']."</textarea>\n";
}
else {
echo " <input class='formfld' type='text' id='domain_setting_value' name='domain_setting_value' value=\"".escape($row['domain_setting_value'])."\">\n";
}

15
core/domain_settings/domain_settings.php
View File

@ -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 "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['domain_setting_value'])."</span>\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 "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['domain_setting_value'])."</span>\n";
}
else {
echo " ".escape($row['domain_setting_value'])."\n";
}
echo " ".escape($row['domain_setting_value'])."\n";
}
echo " </td>\n";
echo " <td valign='top' class='".$row_style[$c]." tr_link_void' style='text-align: center;'>\n";