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

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
Mark J Crane 2020-05-30 09:07:26 -06:00
parent 015b56408b d1619e25c4
commit e93177c89b
14 changed files with 151 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/resources/scripts/app/voicemail/index.lua
View File

@ -352,7 +352,7 @@
local sql = [[SELECT * FROM v_voicemails
WHERE domain_uuid = :domain_uuid
AND voicemail_id = :voicemail_id]]
local params = {domain_uuid = domain_uuid, voicemail_id = id};
local params = {domain_uuid = domain_uuid, voicemail_id = voicemail_id};
if (debug["sql"]) then
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
end

8
core/default_settings/default_setting_edit.php
View File

@ -628,6 +628,14 @@
echo " <option value='fixed' ".($default_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='image' ".(($default_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($default_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($default_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($default_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";

1
core/default_settings/default_settings.php
View File

@ -324,6 +324,7 @@
( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
( $category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
) {
echo " ".$text['label-'.$row['default_setting_value']];

9
core/domain_settings/domain_setting_edit.php
View File

@ -631,6 +631,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($row['domain_setting_value'] == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($row['domain_setting_value'] == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
@ -685,6 +686,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='fixed' ".($row['domain_setting_value'] == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($row['domain_setting_value'] == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($row['domain_setting_value'] == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</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";

1
core/domain_settings/domain_settings.php
View File

@ -284,6 +284,7 @@
( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
( $category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
) {
echo " ".$text['label-'.escape($row['domain_setting_value'])];

2
core/software/resources/classes/software.php
View File

@ -12,7 +12,7 @@ if (!class_exists('software')) {
* version
*/
public static function version() {
return '4.5.13';
return '4.5.14';
}
/**

9
core/user_settings/user_setting_edit.php
View File

@ -605,6 +605,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='image' ".(($user_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($user_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($user_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
@ -647,6 +648,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='fixed' ".($user_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
echo " </select>\n";
}
else if ($user_setting_category == "theme" && $user_setting_subcategory == "body_header_brand_type" && $user_setting_name == "text" ) {
echo " <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
echo " <option value='image' ".(($user_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
echo " <option value='text' ".(($user_setting_value == "text") ? "selected='selected'" : null).">".$text['label-text']."</option>\n";
echo " <option value='image_text' ".(($user_setting_value == "image_text") ? "selected='selected'" : null).">".$text['label-image_text']."</option>\n";
echo " <option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
echo " </select>\n";
}
else {
echo " <input class='formfld' type='text' id='user_setting_value' name='user_setting_value' maxlength='255' value=\"".escape($user_setting_value)."\">\n";
}

1
core/user_settings/user_settings.php
View File

@ -272,6 +272,7 @@
( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||
( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
( $category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) ||
( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
) {
echo " ".$text['label-'.escape($row['user_setting_value'])];

20
resources/classes/menu.php
View File

@ -1103,9 +1103,9 @@ if (!class_exists('menu')) {
$html .= "<img id='menu_brand_image_expanded' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
$html .= "</a>\n";
}
else {
$html .= " <a class='menu_side_item_main menu_side_expand' ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "style='display: none';" : null)." onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fas fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
}
// else {
// $html .= " <a class='menu_side_item_main menu_side_expand' ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "style='display: none';" : null)." onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fas fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
// }
$html .= " </div>\n";
//main menu items
if (is_array($menu_array) && sizeof($menu_array) != 0) {
@ -1138,13 +1138,19 @@ if (!class_exists('menu')) {
$content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\"";
}
$html .= "<div id='content_container' ".$content_container_onclick.">\n";
$html .= " <div id='content_header'>\n";
$html .= " <div id='body_header'>\n";
//header: left
$html .= "<div class='float-left'>\n";
$html .= button::create(['type'=>'button','id'=>'menu_side_state_hidden_button','title'=>$this->text['theme-label-expand_menu'],'icon'=>'bars','class'=>'default '.($_SESSION['theme']['menu_side_state']['text'] != 'hidden' ? 'hide-sm-up ' : null).'float-left','onclick'=>'menu_side_expand();']);
if ($_SESSION['theme']['menu_brand_type']['text'] == 'text' || $_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
$body_header_brand_text = $_SESSION['theme']['body_header_brand_text']['text'] != '' ? escape($_SESSION['theme']['body_header_brand_text']['text']) : "FusionPBX";
$html .= " <div id='body_header_brand_text'><a href='".PROJECT_PATH."/'>".$body_header_brand_text."</a></div>\n";
$body_header_brand_text = $_SESSION['theme']['body_header_brand_text']['text'] != '' ? escape($_SESSION['theme']['body_header_brand_text']['text']) : "FusionPBX";
if ($_SESSION['theme']['body_header_brand_type']['text'] == 'image' || $_SESSION['theme']['body_header_brand_type']['text'] == 'image_text') {
$body_header_brand_image = $_SESSION['theme']['body_header_brand_image']['text'] != '' ? $_SESSION['theme']['body_header_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
$html .= "<div id='body_header_brand_image'>";
$html .= "<a href='".PROJECT_PATH."/'><img id='body_header_brand_image' src='".escape($body_header_brand_image)."' title=\"".escape($body_header_brand_text)."\"></a>";
$html .= "</div>";
}
if ($_SESSION['theme']['body_header_brand_type']['text'] == 'text' || $_SESSION['theme']['body_header_brand_type']['text'] == 'image_text') {
$html .= "<div id='body_header_brand_text'><a href='".PROJECT_PATH."/'>".$body_header_brand_text."</a></div>";
}
$html .= "</div>\n";
//header: right

9
resources/templates/provision/yealink/t53w/y000000000095.cfg
View File

@ -350,20 +350,25 @@ wui.quick_login =
#######################################################################################
static.phone_setting.reserve_certs_enable =
features.relog_offtime =
static.security.default_ssl_method =
static.security.default_ssl_method = {$yealink_security_default_ssl_method}
static.security.cn_validation =
static.security.dev_cert =
static.security.ca_cert =
static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
security.tls_cipher_list =
security.tls_cipher_list = {$yealink_security_tls_cipher_list}
{if isset($user_name) }
static.security.user_name.user = {$user_name}
static.security.user_password = {$user_name}:{$user_password}
{/if}
{if isset($admin_name) }
static.security.user_name.admin = {$admin_name}
static.security.user_password = {$admin_name}:{$admin_password}
{/if}
{if isset($var_name) }
static.security.user_name.var = {$var_name}
static.security.user_password = {$var_name}:{$var_password}

9
resources/templates/provision/yealink/t54w/y000000000096.cfg
View File

@ -350,20 +350,25 @@ wui.quick_login =
#######################################################################################
static.phone_setting.reserve_certs_enable =
features.relog_offtime =
static.security.default_ssl_method =
static.security.default_ssl_method = {$yealink_security_default_ssl_method}
static.security.cn_validation =
static.security.dev_cert =
static.security.ca_cert =
static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
security.tls_cipher_list =
security.tls_cipher_list = {$yealink_security_tls_cipher_list}
{if isset($user_name) }
static.security.user_name.user = {$user_name}
static.security.user_password = {$user_name}:{$user_password}
{/if}
{if isset($admin_name) }
static.security.user_name.admin = {$admin_name}
static.security.user_password = {$admin_name}:{$admin_password}
{/if}
{if isset($var_name) }
static.security.user_name.var = {$var_name}
static.security.user_password = {$var_name}:{$var_password}

9
resources/templates/provision/yealink/t57w/y000000000097.cfg
View File

@ -350,20 +350,25 @@ wui.quick_login =
#######################################################################################
static.phone_setting.reserve_certs_enable =
features.relog_offtime =
static.security.default_ssl_method =
static.security.default_ssl_method = {$yealink_security_default_ssl_method}
static.security.cn_validation =
static.security.dev_cert =
static.security.ca_cert =
static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
security.tls_cipher_list =
security.tls_cipher_list = {$yealink_security_tls_cipher_list}
{if isset($user_name) }
static.security.user_name.user = {$user_name}
static.security.user_password = {$user_name}:{$user_password}
{/if}
{if isset($admin_name) }
static.security.user_name.admin = {$admin_name}
static.security.user_password = {$admin_name}:{$admin_password}
{/if}
{if isset($var_name) }
static.security.user_name.var = {$var_name}
static.security.user_password = {$var_name}:{$var_password}

32
themes/default/app_config.php
View File

@ -367,6 +367,38 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether to cache the theme in the session.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4e0309da-4adb-4a05-a321-d0ec6546dceb";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_background_color";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "#fff";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of the domain selector pane.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "cd62c333-4f4e-4462-b61c-1baf5fa524cb";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_background_color";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "#fff";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list background color of the domain selector pane.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6a3db80c-5f21-4475-94ae-deac72a28225";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_border_color";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "#a4aebf";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list border color of the domain selector pane.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6170ed6b-cb3e-4e66-831b-5498186b2ca8";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_list_divider_color";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "#c5d1e5";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the list item divider color of the domain selector pane.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5a401784-b930-46e7-8fb0-6fa0b5a8806e";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_selector_shadow_color";

89
themes/default/css.php
View File

@ -529,23 +529,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
text-decoration: none;
}
div#body_header_brand_text {
display: inline-block;
margin: 3px 0 0 10px;
}
div#body_header_brand_text > a {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_header_brand_text_size']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_size']['text'] : '16px'; ?>;
font-weight: 600;
text-decoration: none;
}
div#body_header_brand_text > a:hover {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color_hover']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color_hover']['text'] : 'rgba(0,0,0,1.0)'; ?>;
text-decoration: none;
}
/* menu side control container */
div#menu_side_control_container {
position: -webkit-sticky;
@ -672,6 +655,56 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
}
}
/* BODY/HEADER BAR *****************************************************************/
<?php if ($_SESSION['theme']['menu_style']['text'] == 'side') { ?>
div#body_header {
padding: 10px 10px 15px 10px;
height: 50px;
<?php echo $_SESSION['theme']['body_header_background_color']['text'] != '' ? 'background-color: '.$_SESSION['theme']['body_header_background_color']['text'].';' : null; ?>
}
<?php } else { ?>
div#body_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php } ?>
div#body_header_brand_image {
display: inline-block;
margin-left: 10px;
}
div#body_header_brand_image > a:hover {
text-decoration: none;
}
img#body_header_brand_image {
border: none;
margin-top: -4px;
height: auto;
max-width: 145px;
max-height: 35px;
}
div#body_header_brand_text {
display: inline-block;
margin: 3px 0 0 10px;
}
div#body_header_brand_text > a {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
font-size: <?php echo ($_SESSION['theme']['body_header_brand_text_size']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_size']['text'] : '16px'; ?>;
font-weight: 600;
text-decoration: none;
}
div#body_header_brand_text > a:hover {
color: <?php echo ($_SESSION['theme']['body_header_brand_text_color_hover']['text'] != '') ? $_SESSION['theme']['body_header_brand_text_color_hover']['text'] : 'rgba(0,0,0,1.0)'; ?>;
text-decoration: none;
}
/* BUTTONS ********************************************************************/
/* buttons */
@ -1033,7 +1066,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
font-family: arial, san-serif;
font-size: 10pt;
overflow: hidden;
background-color: #fff;
background: <?php echo ($_SESSION['theme']['domain_selector_background_color']['text'] != '') ? $_SESSION['theme']['domain_selector_background_color']['text'] : '#fff'; ?>;
-webkit-box-shadow: <?php echo ($_SESSION['theme']['domain_selector_shadow_color']['text'] != '') ? '0 0 10px '.$_SESSION['theme']['domain_selector_shadow_color']['text'] : 'none'; ?>;
-moz-box-shadow: <?php echo ($_SESSION['theme']['domain_selector_shadow_color']['text'] != '') ? '0 0 10px '.$_SESSION['theme']['domain_selector_shadow_color']['text'] : 'none'; ?>;
box-shadow: <?php echo ($_SESSION['theme']['domain_selector_shadow_color']['text'] != '') ? '0 0 10px '.$_SESSION['theme']['domain_selector_shadow_color']['text'] : 'none'; ?>;
@ -1053,13 +1086,13 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
width: 300px;
height: 100%;
padding: 1px;
background-color: #fff;
border: 1px solid #a4aebf;
background: <?php echo ($_SESSION['theme']['domain_selector_list_background_color']['text'] != '') ? $_SESSION['theme']['domain_selector_list_background_color']['text'] : '#fff'; ?>;
border: 1px solid <?php echo ($_SESSION['theme']['domain_selector_list_border_color']['text'] != '') ? $_SESSION['theme']['domain_selector_list_border_color']['text'] : '#a4aebf'; ?>;
}
div.domains_list_item, div.domains_list_item_active, div.domains_list_item_inactive {
text-align: left;
border-bottom: 1px solid #c5d1e5;
border-bottom: 1px solid <?php echo ($_SESSION['theme']['domain_selector_list_divider_color']['text'] != '') ? $_SESSION['theme']['domain_selector_list_divider_color']['text'] : '#c5d1e5'; ?>;
padding: 5px 8px 8px 8px;
overflow: hidden;
white-space: nowrap;
@ -1218,20 +1251,6 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
}
}
<?php if ($_SESSION['theme']['menu_style']['text'] == 'side') { ?>
div#content_header {
padding: 10px 10px 15px 10px;
height: 50px;
<?php echo $_SESSION['theme']['body_header_background_color']['text'] != '' ? 'background-color: '.$_SESSION['theme']['body_header_background_color']['text'].';' : null; ?>
}
<?php } else { ?>
div#content_header {
padding: 10px;
margin-top: 5px;
height: 40px;
}
<?php } ?>
/* GENERAL ELEMENTS *****************************************************************/
img {