diff --git a/app/calls/app_languages.php b/app/calls/app_languages.php index 68a2d81fe6..fbf21c850f 100644 --- a/app/calls/app_languages.php +++ b/app/calls/app_languages.php @@ -29,7 +29,10 @@ $text['label-on-busy']['es-cl'] = "Concurrida"; $text['label-on-busy']['pt-pt'] = "Movimentado"; $text['label-on-busy']['fr-fr'] = "Sur OccupĂ©"; - $text['label-on-busy']['it-it'] = "Rinvio su occupato"; + $text['label-on-busy']['it-it'] = "Su occupato"; + + $text['description-on-busy']['en-us'] = "If enabled, it overrides the value of voicemail enabling in extension"; + $text['description-on-busy']['it-it'] = "Se abilitato, esegue l'override del valore di abilitazione voicemail nell'estensione"; $text['label-enabled']['en-us'] = "Enabled"; $text['label-enabled']['es-cl'] = "Activo"; diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php index cd46eeb1c5..4e3fb15c77 100644 --- a/app/calls/call_edit.php +++ b/app/calls/call_edit.php @@ -554,6 +554,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($on_click); echo "   "; echo " \n"; + echo "
".$text['description-on-busy'].".\n"; echo "\n"; echo "\n"; diff --git a/app/dialplan/resources/switch/conf/dialplan/520_extension_queue.xml b/app/dialplan/resources/switch/conf/dialplan/290_extension_queue.xml similarity index 86% rename from app/dialplan/resources/switch/conf/dialplan/520_extension_queue.xml rename to app/dialplan/resources/switch/conf/dialplan/290_extension_queue.xml index 99abd87603..42ba6d10df 100644 --- a/app/dialplan/resources/switch/conf/dialplan/520_extension_queue.xml +++ b/app/dialplan/resources/switch/conf/dialplan/290_extension_queue.xml @@ -1,5 +1,5 @@ - + diff --git a/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml b/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml index 72f5aa7067..8da075f6a2 100644 --- a/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml +++ b/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml @@ -25,6 +25,8 @@ + + diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index a0e7393784..3800194a70 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -37,6 +37,8 @@ $vars = << --- Riccardo Granchi + --include config.lua scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1)); dofile(scripts_dir.."/resources/functions/config.lua"); - dofile(scripts_dir.."/resources/functions/explode.lua"); dofile(config()); --get the argv values script_name = argv[0]; app_name = argv[1]; ---set the default variables - forward_on_busy = false; - send_to_voicemail = true; - --example use command --luarun app.lua app_name 'a' 'b 123' 'c' @@ -53,26 +45,6 @@ end end ---if the session exists then check originate disposition and causes - if (session ~= nil) then - originate_disposition = session:getVariable("originate_disposition"); - originate_causes = session:getVariable("originate_causes"); - if (originate_causes ~= nil) then - array = explode("|",originate_causes); - if (string.find(array[1], "USER_BUSY")) then - originate_disposition = "USER_BUSY"; - session:setVariable("originate_disposition", originate_disposition); - end - end - if (originate_disposition ~= nil) then - if (originate_disposition == 'USER_BUSY') then - freeswitch.consoleLog("notice", "[app] forward on busy: ".. scripts_dir .. "/app/forward_on_busy/index.lua" .. arguments .."\n"); - forward_on_busy = loadfile(scripts_dir .. "/app/forward_on_busy/index.lua")(argv); - freeswitch.consoleLog("notice", "[app] forward on busy: ".. tostring(forward_on_busy) .. "\n"); - end - end - end - --route the request to the application - --freeswitch.consoleLog("notice", "[app] lua route: ".. scripts_dir .. "/app/" .. app_name .. "/index.lua" .. arguments .."\n"); + --freeswitch.consoleLog("notice", "["..app_name.."]".. scripts_dir .. "/app/" .. app_name .. "/index.lua\n"); loadfile(scripts_dir .. "/app/" .. app_name .. "/index.lua")(argv); diff --git a/resources/install/scripts/app/failure_handler/index.lua b/resources/install/scripts/app/failure_handler/index.lua new file mode 100644 index 0000000000..42d2a68f7f --- /dev/null +++ b/resources/install/scripts/app/failure_handler/index.lua @@ -0,0 +1,163 @@ +-- +-- FusionPBX +-- Version: MPL 1.1 +-- +-- The contents of this file are subject to the Mozilla Public License Version +-- 1.1 (the "License"); you may not use this file except in compliance with +-- the License. You may obtain a copy of the License at +-- http://www.mozilla.org/MPL/ +-- +-- Software distributed under the License is distributed on an "AS IS" basis, +-- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +-- for the specific language governing rights and limitations under the +-- License. +-- +-- The Original Code is FusionPBX +-- +-- The Initial Developer of the Original Code is +-- Mark J Crane +-- Copyright (C) 2010-2014 +-- the Initial Developer. All Rights Reserved. +-- +-- Contributor(s): +-- Salvatore Caruso +-- Riccardo Granchi + +--debug + debug["info"] = false; + debug["sql"] = false; + +--include config.lua + dofile(scripts_dir .. "/resources/functions/config.lua"); + dofile(scripts_dir .. "/resources/functions/explode.lua"); + +--handle originate_disposition + if (session ~= nil and + session:ready()) then + + originate_disposition = session:getVariable("originate_disposition"); + originate_causes = session:getVariable("originate_causes"); + hangup_on_subscriber_absent = session:getVariable("hangup_on_subscriber_absent"); + hangup_on_call_reject = session:getVariable("hangup_on_call_reject"); + + if (debug["info"] == true) then + freeswitch.consoleLog("INFO", "[failure_handler] originate_causes: " .. tostring(originate_causes) .. "\n"); + freeswitch.consoleLog("INFO", "[failure_handler] originate_disposition: " .. tostring(originate_disposition) .. "\n"); + freeswitch.consoleLog("INFO", "[failure_handler] hangup_on_subscriber_absent: " .. tostring(hangup_on_subscriber_absent) .. "\n"); + freeswitch.consoleLog("INFO", "[failure_handler] hangup_on_call_reject: " .. tostring(hangup_on_call_reject) .. "\n"); + end + + if (originate_causes ~= nil) then + array = explode("|",originate_causes); + if (string.find(array[1], "USER_BUSY")) then + originate_disposition = "USER_BUSY"; + session:setVariable("originate_disposition", originate_disposition); + end + end + + if (originate_disposition ~= nil) then + if (originate_disposition == 'USER_BUSY') then + + --handle USER_BUSY + + dialed_extension = session:getVariable("dialed_extension"); + context = session:getVariable("context"); + domain_name = session:getVariable("domain_name"); + uuid = session:getVariable("uuid"); + last_busy_dialed_extension = session:getVariable("last_busy_dialed_extension"); + + if (debug["info"] ) then + freeswitch.consoleLog("INFO", "[failure_handler] last_busy_dialed_extension: " .. tostring(last_busy_dialed_extension) .. "\n"); + end + + --connect to the database + dofile(scripts_dir .. "/resources/functions/database_handle.lua"); + dbh = database_handle('system'); + + --get the domain_uuid + domain_uuid = session:getVariable("domain_uuid"); + if (domain_uuid == nil) then + --get the domain_uuid using the domain name required for multi-tenant + if (domain_name ~= nil) then + sql = "SELECT domain_uuid FROM v_domains "; + sql = sql .. "WHERE domain_name = '" .. domain_name .. "' "; + + if (debug["sql"]) then + freeswitch.consoleLog("INFO", "[failure_handler] SQL: " .. sql .. "\n"); + end + + dbh:query(sql, function(rows) + domain_uuid = rows["domain_uuid"]; + end); + end + end + domain_uuid = string.lower(domain_uuid); + + if (dialed_extension ~= nil and + dialed_extension ~= last_busy_dialed_extension) then + + --get the information from the database + sql = [[SELECT * FROM v_extensions + WHERE domain_uuid = ']] .. domain_uuid .. [[' + AND extension = ']] .. dialed_extension .. [[' + AND forward_busy_enabled = 'true' ]]; + + if (debug["sql"]) then + freeswitch.consoleLog("INFO", "[failure_handler] SQL: " .. sql .. "\n"); + end + + dbh:query(sql, function(row) + forward_busy_destination = string.lower(row["forward_busy_destination"]); + + if (forward_busy_destination ~= nil and + string.len(forward_busy_destination) > 0 ) then + + --handle USER_BUSY - forwarding to number + + freeswitch.consoleLog("NOTICE", "[failure_handler] forwarding on busy to: " .. forward_busy_destination .. "\n"); + session:setVariable("last_busy_dialed_extension", dialed_extension); + session:transfer(forward_busy_destination, "XML", context); + else + + --handle USER_BUSY - hangup + + freeswitch.consoleLog("NOTICE", "[failure_handler] forward on busy with empty destination: hangup(USER_BUSY)\n"); + session:hangup("USER_BUSY"); + end + end); + end + + --close the database connection + dbh:release(); + + elseif (originate_disposition == "ALLOTTED_TIMEOUT") then + + --handle ALLOTTED_TIMEOUT ( NO ANSWER ) + + if (debug["info"] ) then + freeswitch.consoleLog("NOTICE", "[failure_handler] - ALLOTTED_TIMEOUT - Doing nothing\n"); + end + elseif (originate_disposition == "USER_NOT_REGISTERED") then + + --handle USER_NOT_REGISTERED + + if (debug["info"] ) then + freeswitch.consoleLog("NOTICE", "[failure_handler] - USER_NOT_REGISTERED - Doing nothing\n"); + end + elseif (originate_disposition == "SUBSCRIBER_ABSENT" and + hangup_on_subscriber_absent == "true") then + + --handle SUBSCRIBER_ABSENT + + freeswitch.consoleLog("NOTICE", "[failure_handler] - SUBSCRIBER_ABSENT - hangup(UNALLOCATED_NUMBER)\n"); + session:hangup("UNALLOCATED_NUMBER"); + elseif (originate_disposition == "CALL_REJECTED" and + hangup_on_call_reject =="true") then + + --handle CALL_REJECT + + freeswitch.consoleLog("NOTICE", "[failure_handler] - CALL_REJECT - hangup()\n"); + session:hangup(); + end + end + end diff --git a/resources/install/scripts/app/forward_on_busy/index.lua b/resources/install/scripts/app/forward_on_busy/index.lua deleted file mode 100644 index 40eae77d12..0000000000 --- a/resources/install/scripts/app/forward_on_busy/index.lua +++ /dev/null @@ -1,111 +0,0 @@ --- --- FusionPBX --- Version: MPL 1.1 --- --- The contents of this file are subject to the Mozilla Public License Version --- 1.1 (the "License"); you may not use this file except in compliance with --- the License. You may obtain a copy of the License at --- http://www.mozilla.org/MPL/ --- --- Software distributed under the License is distributed on an "AS IS" basis, --- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --- for the specific language governing rights and limitations under the --- License. --- --- The Original Code is FusionPBX --- --- The Initial Developer of the Original Code is --- Mark J Crane --- Copyright (C) 2010-2014 --- the Initial Developer. All Rights Reserved. --- --- Contributor(s): --- Salvatore Caruso --- Riccardo Granchi - ---set default values - forward = false; - ---debug - debug["info"] = false; - debug["sql"] = false; - ---connect to the database - dofile(scripts_dir.."/resources/functions/database_handle.lua"); - dbh = database_handle('system'); - - if (session ~= nil) then - originate_disposition = session:getVariable("originate_disposition"); - - if ( originate_disposition=='USER_BUSY' ) then - - dialed_extension = session:getVariable("dialed_extension"); - context = session:getVariable("context"); - domain_name = session:getVariable("domain_name"); - uuid = session:getVariable("uuid"); - send_to_voicemail = session:getVariable("send_to_voicemail"); - if (send_to_voicemail == nil) then - send_to_voicemail = "true"; - end - - --get the domain_uuid - domain_uuid = session:getVariable("domain_uuid"); - if (domain_uuid == nil) then - --get the domain_uuid using the domain name required for multi-tenant - if (domain_name ~= nil) then - sql = "SELECT domain_uuid FROM v_domains "; - sql = sql .. "WHERE domain_name = '" .. domain_name .. "' "; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[forward_on_busy] SQL: " .. sql .. "\n"); - end - status = dbh:query(sql, function(rows) - domain_uuid = rows["domain_uuid"]; - end); - end - end - domain_uuid = string.lower(domain_uuid); - - if ( debug["info"] ) then - freeswitch.consoleLog("info", "[forward_on_busy] originate_disposition: " .. originate_disposition .. "\n"); - freeswitch.consoleLog("info", "[forward_on_busy] dialed_extension : " .. dialed_extension .. "\n"); - end - - if (dialed_extension ~= nil) then - if (session:ready()) then - --get the information from the database - sql = [[SELECT * FROM v_extensions - WHERE domain_uuid = ']] .. domain_uuid ..[[' - AND extension = ']] .. dialed_extension ..[[' - AND forward_busy_enabled = 'true' ]]; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[forward_on_busy] SQL: " .. sql .. "\n"); - end - status = dbh:query(sql, function(row) - forward_busy_destination = string.lower(row["forward_busy_destination"]); - end); - - --set default values - if (forward_busy_destination ~= nil and string.len(forward_busy_destination) > 0 ) then - if ( debug["info"] ) then - freeswitch.consoleLog("notice", "[forward_on_busy] forward_busy_destination: " .. forward_busy_destination .. "\n"); - end - session:transfer(forward_busy_destination, "XML", context); - forward = true; - else - if ( debug["info"] ) then - freeswitch.consoleLog("notice", "[forward_on_busy] forward on busy disabled or destination unset - HANGUP WITH USER BUSY \n"); - end - if (send_to_voicemail == "false") then - session:hangup("USER_BUSY"); - end - forward = false; - end - end - end - end - end - - --close the database connection - dbh:release(); - - return forward;