From 30109b452301b0e53a19196d4939830330d40497 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Tue, 10 Nov 2015 17:56:40 +0300 Subject: [PATCH 1/3] Fix. IVR menu option without arguments. --- resources/install/scripts/ivr_menu.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/resources/install/scripts/ivr_menu.lua b/resources/install/scripts/ivr_menu.lua index 554bcdc2f7..47b35679ed 100644 --- a/resources/install/scripts/ivr_menu.lua +++ b/resources/install/scripts/ivr_menu.lua @@ -407,8 +407,12 @@ if (row.ivr_menu_option_action == "menu-exec-app") then --get the action and data pos = string.find(row.ivr_menu_option_param, " ", 0, true); - action = string.sub(row.ivr_menu_option_param, 0, pos-1); - data = string.sub(row.ivr_menu_option_param, pos+1); + if pos then + action = string.sub(row.ivr_menu_option_param, 0, pos-1); + data = string.sub(row.ivr_menu_option_param, pos+1); + else + action, data = row.ivr_menu_option_param, "" + end --check if the option uses a regex regex = string.find(row.ivr_menu_option_digits, "(", 0, true); @@ -431,7 +435,11 @@ end if (action == "lua") then pos = string.find(data, " ", 0, true); - script = string.sub(data, 0, pos-1); + if pos then + script = string.sub(data, 0, pos-1); + else + script = data + end end end --if regex match From 04fbd896dfd484e95dc48722ab951c7c6ec26a0f Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Thu, 12 Nov 2015 11:10:34 +0000 Subject: [PATCH 2/3] made button elements render the same as input.btn --- themes/enhanced/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index 3b5579bcb9..e5cf267146 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -251,7 +251,7 @@ form { margin: 0; } -input.btn, input.button { +input.btn, input.button, button { font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif; padding: 2px 6px 3px 6px; color: #fff; @@ -273,7 +273,7 @@ input.btn, input.button { -moz-opacity: 0.9; } -input.btn:hover, input.button:hover, img.list_control_icon:hover { +input.btn:hover, input.button:hover, img.list_control_icon:hover, button:hover { box-shadow: 0 0 5px #cddaf0; -webkit-box-shadow: 0 0 5px #cddaf0; -moz-box-shadow: 0 0 5px #cddaf0; From 31a039257709f608a074b2e8cf6265df57bf869b Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Thu, 12 Nov 2015 14:11:05 +0300 Subject: [PATCH 3/3] Fix. Call intercept - a scenario where an outgoing call can be intercepted This is same changes as in #1209. --- resources/install/scripts/intercept.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/install/scripts/intercept.lua b/resources/install/scripts/intercept.lua index ca9af9d38b..326d93b985 100644 --- a/resources/install/scripts/intercept.lua +++ b/resources/install/scripts/intercept.lua @@ -254,9 +254,9 @@ -- next check should prevent pickup call from extension -- e.g. if extension 100 dial some cell phone and some one else dial *8 -- he can pickup this call. - -- if not extension then - -- sql = sql .. "AND direction = 'outbound' "; - -- end + if not extension then + sql = sql .. "AND direction = 'outbound' "; + end sql = sql .. "AND (1<>1 "; for key,extension in pairs(extensions) do sql = sql .. "OR presence_id = '"..extension.."@"..domain_name.."' ";