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

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

Browse Source
This commit is contained in:
markjcrane
2015-11-12 16:40:48 -07:00
parent c13ed1323f c6ef9d0fbf
commit d729d77f4d
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/intercept.lua
+3 -3
View File
@@ -254,9 +254,9 @@
-- next check should prevent pickup call from extension -- next check should prevent pickup call from extension
-- e.g. if extension 100 dial some cell phone and some one else dial *8 -- e.g. if extension 100 dial some cell phone and some one else dial *8
-- he can pickup this call. -- he can pickup this call.
-- if not extension then if not extension then
-- sql = sql .. "AND direction = 'outbound' "; sql = sql .. "AND direction = 'outbound' ";
-- end end
sql = sql .. "AND (1<>1 "; sql = sql .. "AND (1<>1 ";
for key,extension in pairs(extensions) do for key,extension in pairs(extensions) do
sql = sql .. "OR presence_id = '"..extension.."@"..domain_name.."' "; sql = sql .. "OR presence_id = '"..extension.."@"..domain_name.."' ";
resources/install/scripts/ivr_menu.lua
+11 -3
View File
@@ -407,8 +407,12 @@
if (row.ivr_menu_option_action == "menu-exec-app") then if (row.ivr_menu_option_action == "menu-exec-app") then
--get the action and data --get the action and data
pos = string.find(row.ivr_menu_option_param, " ", 0, true); pos = string.find(row.ivr_menu_option_param, " ", 0, true);
action = string.sub(row.ivr_menu_option_param, 0, pos-1); if pos then
data = string.sub(row.ivr_menu_option_param, pos+1); 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 --check if the option uses a regex
regex = string.find(row.ivr_menu_option_digits, "(", 0, true); regex = string.find(row.ivr_menu_option_digits, "(", 0, true);
@@ -431,7 +435,11 @@
end end
if (action == "lua") then if (action == "lua") then
pos = string.find(data, " ", 0, true); 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
end --if regex match end --if regex match
themes/enhanced/template.php
+2 -2
View File
@@ -251,7 +251,7 @@ form {
margin: 0; margin: 0;
} }
input.btn, input.button { input.btn, input.button, button {
font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif; font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
padding: 2px 6px 3px 6px; padding: 2px 6px 3px 6px;
color: #fff; color: #fff;
@@ -273,7 +273,7 @@ input.btn, input.button {
-moz-opacity: 0.9; -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; box-shadow: 0 0 5px #cddaf0;
-webkit-box-shadow: 0 0 5px #cddaf0; -webkit-box-shadow: 0 0 5px #cddaf0;
-moz-box-shadow: 0 0 5px #cddaf0; -moz-box-shadow: 0 0 5px #cddaf0;