\n";
echo "| \n";
echo " ".$text['label-comfirm_macro']."\n";
diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php
index 40a46246fb..3d7aa56904 100644
--- a/app/ivr_menus/resources/classes/ivr_menu.php
+++ b/app/ivr_menus/resources/classes/ivr_menu.php
@@ -52,9 +52,9 @@ if (!class_exists('ivr_menu')) {
public function __construct() {
//assign private variables
- $this->app_name = 'ivr_menus';
- $this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
- $this->list_page = 'ivr_menus.php';
+ $this->app_name = 'ivr_menus';
+ $this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
+ $this->list_page = 'ivr_menus.php';
}
@@ -324,7 +324,7 @@ if (!class_exists('ivr_menu')) {
//clear the cache
$cache = new cache;
- $cache->delete("dialplan:".$_SESSION["context"]);
+ $cache->delete("dialplan:".$_SESSION['domain_name']);
foreach ($ivr_menus as $ivr_menu_uuid => $ivr_menu) {
$cache->delete("configuration:ivr.conf:".$ivr_menu_uuid);
}
@@ -467,7 +467,7 @@ if (!class_exists('ivr_menu')) {
//clear the cache
$cache = new cache;
- $cache->delete("dialplan:".$_SESSION["context"]);
+ $cache->delete("dialplan:".$_SESSION['domain_name']);
//set message
message::add($text['message-copy']);
diff --git a/app/ivr_menus/resources/functions/ivr_menu_xml.php b/app/ivr_menus/resources/functions/ivr_menu_xml.php
index 6178d5c5a9..ee5de986e7 100644
--- a/app/ivr_menus/resources/functions/ivr_menu_xml.php
+++ b/app/ivr_menus/resources/functions/ivr_menu_xml.php
@@ -82,6 +82,7 @@
$ivr_menu_max_timeouts = $row["ivr_menu_max_timeouts"];
$ivr_menu_digit_len = $row["ivr_menu_digit_len"];
$ivr_menu_direct_dial = $row["ivr_menu_direct_dial"];
+ $ivr_menu_context = $row["ivr_menu_context"];
$ivr_menu_enabled = $row["ivr_menu_enabled"];
$ivr_menu_description = $row["ivr_menu_description"];
@@ -159,7 +160,7 @@
unset($sub_sql, $sub_result, $sub_row);
if ($ivr_menu_direct_dial == "true") {
- $tmp .= " \n";
+ $tmp .= " \n";
}
$tmp .= " \n";
$tmp .= "\n";
diff --git a/app/provision/index.php b/app/provision/index.php
index 037df0b9ff..aba0070ba6 100644
--- a/app/provision/index.php
+++ b/app/provision/index.php
@@ -155,88 +155,6 @@
//get the domain name
$domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
- //get the default settings
- $sql = "select * from v_default_settings ";
- $sql .= "where default_setting_enabled = 'true' ";
- $sql .= "order by default_setting_order asc ";
- $database = new database;
- $result = $database->select($sql, null, 'all');
- //unset the previous settings
- if (is_array($result) && @sizeof($result) != 0) {
- foreach ($result as $row) {
- unset($_SESSION[$row['default_setting_category']]);
- }
- //set the settings as a session
- foreach ($result as $row) {
- $name = $row['default_setting_name'];
- $category = $row['default_setting_category'];
- $subcategory = $row['default_setting_subcategory'];
- if (strlen($subcategory) == 0) {
- if ($name == "array") {
- $_SESSION[$category][] = $row['default_setting_value'];
- }
- else {
- $_SESSION[$category][$name] = $row['default_setting_value'];
- }
- }
- else {
- if ($name == "array") {
- $_SESSION[$category][$subcategory][] = $row['default_setting_value'];
- }
- else {
- $_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
- $_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
- }
- }
- }
- }
- unset($sql, $result, $row);
-
- //get the domains settings
- if (is_uuid($domain_uuid)) {
- $sql = "select * from v_domain_settings ";
- $sql .= "where domain_uuid = :domain_uuid ";
- $sql .= "and domain_setting_enabled = 'true' ";
- $sql .= "order by domain_setting_order asc ";
- $parameters['domain_uuid'] = $domain_uuid;
- $database = new database;
- $result = $database->select($sql, $parameters, 'all');
- //unset the arrays that domains are overriding
- if (is_array($result) && @sizeof($result) != 0) {
- foreach ($result as $row) {
- $name = $row['domain_setting_name'];
- $category = $row['domain_setting_category'];
- $subcategory = $row['domain_setting_subcategory'];
- if ($name == "array") {
- unset($_SESSION[$category][$subcategory]);
- }
- }
- //set the settings as a session
- foreach ($result as $row) {
- $name = $row['domain_setting_name'];
- $category = $row['domain_setting_category'];
- $subcategory = $row['domain_setting_subcategory'];
- if (strlen($subcategory) == 0) {
- //$$category[$name] = $row['domain_setting_value'];
- if ($name == "array") {
- $_SESSION[$category][] = $row['domain_setting_value'];
- }
- else {
- $_SESSION[$category][$name] = $row['domain_setting_value'];
- }
- }
- else {
- //$$category[$subcategory][$name] = $row['domain_setting_value'];
- if ($name == "array") {
- $_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
- }
- else {
- $_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
- }
- }
- }
- }
- }
}
else {
//get the domain_name
@@ -252,6 +170,89 @@
unset($sql, $parameters);
}
+//get the default settings
+ $sql = "select * from v_default_settings ";
+ $sql .= "where default_setting_enabled = 'true' ";
+ $sql .= "order by default_setting_order asc ";
+ $database = new database;
+ $result = $database->select($sql, null, 'all');
+ //unset the previous settings
+ if (is_array($result) && @sizeof($result) != 0) {
+ foreach ($result as $row) {
+ unset($_SESSION[$row['default_setting_category']]);
+ }
+ //set the settings as a session
+ foreach ($result as $row) {
+ $name = $row['default_setting_name'];
+ $category = $row['default_setting_category'];
+ $subcategory = $row['default_setting_subcategory'];
+ if (strlen($subcategory) == 0) {
+ if ($name == "array") {
+ $_SESSION[$category][] = $row['default_setting_value'];
+ }
+ else {
+ $_SESSION[$category][$name] = $row['default_setting_value'];
+ }
+ }
+ else {
+ if ($name == "array") {
+ $_SESSION[$category][$subcategory][] = $row['default_setting_value'];
+ }
+ else {
+ $_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
+ $_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
+ }
+ }
+ }
+ }
+ unset($sql, $result, $row);
+
+//get the domains settings
+ if (is_uuid($domain_uuid)) {
+ $sql = "select * from v_domain_settings ";
+ $sql .= "where domain_uuid = :domain_uuid ";
+ $sql .= "and domain_setting_enabled = 'true' ";
+ $sql .= "order by domain_setting_order asc ";
+ $parameters['domain_uuid'] = $domain_uuid;
+ $database = new database;
+ $result = $database->select($sql, $parameters, 'all');
+ //unset the arrays that domains are overriding
+ if (is_array($result) && @sizeof($result) != 0) {
+ foreach ($result as $row) {
+ $name = $row['domain_setting_name'];
+ $category = $row['domain_setting_category'];
+ $subcategory = $row['domain_setting_subcategory'];
+ if ($name == "array") {
+ unset($_SESSION[$category][$subcategory]);
+ }
+ }
+ //set the settings as a session
+ foreach ($result as $row) {
+ $name = $row['domain_setting_name'];
+ $category = $row['domain_setting_category'];
+ $subcategory = $row['domain_setting_subcategory'];
+ if (strlen($subcategory) == 0) {
+ //$$category[$name] = $row['domain_setting_value'];
+ if ($name == "array") {
+ $_SESSION[$category][] = $row['domain_setting_value'];
+ }
+ else {
+ $_SESSION[$category][$name] = $row['domain_setting_value'];
+ }
+ }
+ else {
+ //$$category[$subcategory][$name] = $row['domain_setting_value'];
+ if ($name == "array") {
+ $_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
+ }
+ else {
+ $_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+ }
+ }
+ }
+ }
+ }
+
//build the provision array
foreach($_SESSION['provision'] as $key=>$val) {
if (strlen($val['var']) > 0) { $value = $val['var']; }
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 0d87cf90ce..a5e702093f 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -460,6 +460,9 @@ include "root.php";
$templates['HW GXP1620'] = 'grandstream/gxp16xx';
$templates['HW GXP1625'] = 'grandstream/gxp16xx';
$templates['HW GXP1630'] = 'grandstream/gxp16xx';
+ $templates['HW GXP1760W'] = 'grandstream/gxp17xx';
+ $templates['HW GXP1780'] = 'grandstream/gxp17xx';
+ $templates['HW GXP1782'] = 'grandstream/gxp17xx';
$templates['HW GXP2124'] = 'grandstream/gxp2124';
$templates['HW GXP2130'] = 'grandstream/gxp2130';
$templates['HW GXP2135'] = 'grandstream/gxp2135';
diff --git a/app/scripts/resources/scripts/app/call_block/index.lua b/app/scripts/resources/scripts/app/call_block/index.lua
index 9e10fc4ddd..48aa13a589 100644
--- a/app/scripts/resources/scripts/app/call_block/index.lua
+++ b/app/scripts/resources/scripts/app/call_block/index.lua
@@ -44,8 +44,10 @@
if (session:ready()) then
--session:setAutoHangup(false);
domain_uuid = session:getVariable("domain_uuid");
+ call_direction = session:getVariable("call_direction");
caller_id_name = session:getVariable("caller_id_name");
caller_id_number = session:getVariable("caller_id_number");
+ destination_number = session:getVariable("destination_number");
context = session:getVariable("context");
call_block = session:getVariable("call_block");
extension_uuid = session:getVariable("extension_uuid");
@@ -90,23 +92,48 @@
assert(dbh:connected());
--check to see if the call should be blocked
- sql = "select * from v_call_block ";
- sql = sql .. "where domain_uuid = :domain_uuid ";
- sql = sql .. "and call_block_enabled = 'true' ";
- sql = sql .. "and ( ";
- sql = sql .. " (call_block_name = :call_block_name and call_block_number = :call_block_number) ";
- sql = sql .. " or (call_block_name is null and call_block_number = :call_block_number) ";
- sql = sql .. " or (call_block_name = :call_block_name and call_block_number is null) ";
- sql = sql .. ") ";
+ sql = "select * from v_call_block\n";
+ sql = sql .. "where domain_uuid = :domain_uuid \n";
+ sql = sql .. "and call_block_enabled = 'true' \n";
+ sql = sql .. "and call_block_direction = :call_block_direction \n";
+ sql = sql .. "and ( \n";
+ sql = sql .. " (\n";
+ sql = sql .. " call_block_name = :call_block_name \n";
+ sql = sql .. " and ( \n";
+ sql = sql .. " '+' || call_block_country_code || call_block_number = :call_block_number \n";
+ sql = sql .. " or call_block_country_code || call_block_number = :call_block_number \n";
+ sql = sql .. " or call_block_number = :call_block_number \n";
+ sql = sql .. " ) \n";
+ sql = sql .. " ) \n";
+ sql = sql .. " or (\n";
+ sql = sql .. " call_block_name is null \n";
+ sql = sql .. " and ( \n";
+ sql = sql .. " '+' || call_block_country_code || call_block_number = :call_block_number \n";
+ sql = sql .. " or call_block_country_code || call_block_number = :call_block_number \n";
+ sql = sql .. " or call_block_number = :call_block_number \n";
+ sql = sql .. " ) \n";
+ sql = sql .. " ) \n";
+ sql = sql .. " or (call_block_name = :call_block_name and call_block_number is null) \n";
+ sql = sql .. ") \n";
if (extension_uuid == nil) then
sql = sql .. "and extension_uuid is null ";
else
sql = sql .. "and (extension_uuid is null or extension_uuid = :extension_uuid) ";
end
if (extension_uuid ~= nil) then
- params = {domain_uuid = domain_uuid, call_block_name = caller_id_name, call_block_number = caller_id_number, extension_uuid = extension_uuid};
+ if (call_direction == 'inbound') then
+ params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = caller_id_number, extension_uuid = extension_uuid};
+ end
+ if (call_direction == 'outbound') then
+ params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = destination_number, extension_uuid = extension_uuid};
+ end
else
- params = {domain_uuid = domain_uuid, call_block_name = caller_id_name, call_block_number = caller_id_number};
+ if (call_direction == 'inbound') then
+ params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = caller_id_number};
+ end
+ if (call_direction == 'outbound') then
+ params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = destination_number};
+ end
end
if (debug["sql"]) then
freeswitch.consoleLog("notice", "[dialplan] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
@@ -217,4 +244,4 @@
freeswitch.consoleLog("notice", "[call_block] " .. call_block_cache_key .. " source: cache\n");
end
end
- end
+ end
\ No newline at end of file
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
index f274ddffc5..39936cbdc3 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
@@ -12,6 +12,11 @@
array = explode("/", sofia_contact);
sip_profile = array[2];
+ --debug info
+ --freeswitch.consoleLog("NOTICE", "sofia_contact */"..account.."\n");
+ --freeswitch.consoleLog("NOTICE", "sip_profile="..sip_profile.."\n");
+ --freeswitch.consoleLog("NOTICE", "sofia_contact="..sofia_contact.."\n");
+
--set the variables
new_messages = tonumber(new_messages) or 0
saved_messages = tonumber(saved_messages) or 0
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
index 7943ff2355..92efeb7a27 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
@@ -277,73 +277,71 @@
end
end
end
-
- if (transcribe_provider == "google") then
- local api_key = settings:get('voicemail', 'google_key', 'text') or '';
- local transcription_server = settings:get('voicemail', 'google_url', 'text') or '';
- if (api_key ~= '') then
- transcribe_cmd = [[sox ]]..file_path..[[ ]]..file_path..[[.flac && echo "{ 'config': { 'languageCode': 'en-US', 'enableWordTimeOffsets': false }, 'audio': { 'content': '`base64 -w 0 ]]..file_path..[[.flac`' } }" | curl -X POST -H "Content-Type: application/json" -d @- "]]..transcription_server..[[:recognize?key=]]..api_key..[[" && rm -f ]]..file_path..[[.flac]]
-end
+ if (transcribe_provider == "google") then
+ local api_key = settings:get('voicemail', 'google_key', 'text') or '';
+ local transcription_server = settings:get('voicemail', 'google_url', 'text') or '';
+ if (api_key ~= '') then
+ transcribe_cmd = [[sox ]]..file_path..[[ ]]..file_path..[[.flac trim 0 00:59 && echo "{ 'config': { 'languageCode': 'en-US', 'enableWordTimeOffsets': false , 'enableAutomaticPunctuation': true , 'alternativeLanguageCodes': 'es' }, 'audio': { 'content': '`base64 -w 0 ]]..file_path..[[.flac`' } }" | curl -X POST -H "Content-Type: application/json" -d @- "]]..transcription_server..[[:recognize?key=]]..api_key..[[" && rm -f ]]..file_path..[[.flac]]
+ end
- local handle = io.popen(transcribe_cmd);
- local transcribe_result = handle:read("*a");
- transcribe_result = transcribe_result:gsub('%%HESITATION ', '');
- handle:close();
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] CMD: " .. transcribe_cmd .. "\n");
- freeswitch.consoleLog("notice", "[voicemail] RESULT: " .. transcribe_result .. "\n");
- end
+ local handle = io.popen(transcribe_cmd);
+ local transcribe_result = handle:read("*a");
+ transcribe_result = transcribe_result:gsub('%%HESITATION ', '');
+ handle:close();
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] CMD: " .. transcribe_cmd .. "\n");
+ freeswitch.consoleLog("notice", "[voicemail] RESULT: " .. transcribe_result .. "\n");
+ end
- --Trancribe request can fail
- if (transcribe_result == '') then
- freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
- return ''
- else
- status, transcribe_json = pcall(JSON.decode, transcribe_result);
- if not status then
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] error decoding google json\n");
- end
- return '';
- end
- end
-
- if (transcribe_json["results"] ~= nil) then
- --Transcription
- if (transcribe_json["results"][1]["alternatives"][1]["transcript"] ~= nil) then
- transcription = '';
- for key, row in pairs(transcribe_json["results"]) do
- transcription = transcription .. row["alternatives"][1]["transcript"];
- end
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: " .. transcription .. "\n");
- end
- else
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
- end
- return '';
+ --Trancribe request can fail
+ if (transcribe_result == '') then
+ freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
+ return ''
+ else
+ status, transcribe_json = pcall(JSON.decode, transcribe_result);
+ if not status then
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] error decoding google json\n");
end
- --Confidence
- if (transcribe_json["results"][1]["alternatives"][1]["confidence"]) then
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: " .. transcribe_json["results"][1]["alternatives"][1]["confidence"] .. "\n");
- end
- confidence = transcribe_json["results"][1]["alternatives"][1]["confidence"];
- else
- if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: (null) \n");
- end
+ return '';
+ end
+ end
+ if (transcribe_json["results"] ~= nil) then
+ --Transcription
+ if (transcribe_json["results"][1]["alternatives"][1]["transcript"] ~= nil) then
+ transcription = '';
+ for key, row in pairs(transcribe_json["results"]) do
+ transcription = transcription .. row["alternatives"][1]["transcript"];
+ end
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: " .. transcription .. "\n");
end
- return transcription;
else
if (debug["info"]) then
- freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: json error \n");
+ freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
end
return '';
end
+ --Confidence
+ if (transcribe_json["results"][1]["alternatives"][1]["confidence"]) then
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: " .. transcribe_json["results"][1]["alternatives"][1]["confidence"] .. "\n");
+ end
+ confidence = transcribe_json["results"][1]["alternatives"][1]["confidence"];
+ else
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: (null) \n");
+ end
+ end
+ return transcription;
+ else
+ if (debug["info"]) then
+ freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: json error \n");
+ end
+ return '';
end
+ end
if (transcribe_provider == "custom") then
local transcription_server = settings:get('voicemail', 'transcription_server', 'text') or '';
@@ -396,9 +394,9 @@ end
local message_max_length = settings:get('voicemail', 'message_max_length', 'numeric') or 300;
local message_silence_threshold = settings:get('voicemail', 'message_silence_threshold', 'numeric') or 200;
local message_silence_seconds = settings:get('voicemail', 'message_silence_seconds', 'numeric') or 3;
- transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean') or "false";
+ local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
local transcribe_provider = settings:get('voicemail', 'transcribe_provider', 'text') or '';
- local email_method = settings:get('email', 'method', 'text') or "smtp";
+ transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean') or "false";
--debug information
if (debug["info"]) then
@@ -528,7 +526,7 @@ end
start_epoch = os.time();
--if using the email queue disable inline transcription
- if (email_method == 'queue') then
+ if (email_queue_enabled == 'true') then
transcribe_enabled = 'false';
end
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
index b7941aa6ee..ea144fdb93 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
@@ -32,8 +32,8 @@
function send_email(id, uuid)
local db = dbh or Database.new('system')
local settings = Settings.new(db, domain_name, domain_uuid)
- local email_method = settings:get('email', 'method', 'text');
local transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean');
+ local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
--get voicemail message details
local sql = [[SELECT * FROM v_voicemails
@@ -48,6 +48,7 @@
--voicemail_password = row["voicemail_password"];
--greeting_id = row["greeting_id"];
voicemail_mail_to = row["voicemail_mail_to"];
+ voicemail_transcription_enabled = row["voicemail_transcription_enabled"];
voicemail_file = row["voicemail_file"];
voicemail_local_after_email = row["voicemail_local_after_email"];
voicemail_description = row["voicemail_description"];
@@ -135,7 +136,7 @@
sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
sql = sql .. "AND template_language = :template_language ";
sql = sql .. "AND template_category = 'voicemail' "
- if (transcribe_enabled == 'true') then
+ if (transcribe_enabled == 'true' and voicemail_transcription_enabled == 'true') then
sql = sql .. "AND template_subcategory = 'transcription' "
else
sql = sql .. "AND template_subcategory = 'default' "
@@ -184,6 +185,7 @@
subject = subject:gsub("${voicemail_description}", voicemail_description);
subject = subject:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
subject = subject:gsub("${domain_name}", domain_name);
+ subject = subject:gsub("${new_messages}", new_messages);
subject = trim(subject);
subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
@@ -202,7 +204,9 @@
body = body:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
body = body:gsub("${domain_name}", domain_name);
body = body:gsub("${sip_to_user}", id);
- body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
+ if (origination_callee_id_name ~= nil) then
+ body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
+ end
body = body:gsub("${dialed_user}", id);
if (voicemail_file == "attach") then
body = body:gsub("${message}", text['label-attached']);
@@ -228,7 +232,7 @@
end
--whether to keep the voicemail message and details local after email
- if (string.len(voicemail_mail_to) > 2 and email_method ~= 'queue') then
+ if (string.len(voicemail_mail_to) > 2 and email_queue_enabled == 'false') then
if (voicemail_local_after_email == "false") then
--delete the voicemail message details
local sql = [[DELETE FROM v_voicemail_messages
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua
new file mode 100644
index 0000000000..fdc83fcdc3
--- /dev/null
+++ b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua
@@ -0,0 +1,22 @@
+
+--get the argv values
+ voicemail_id = argv[1];
+ domain_name = argv[2];
+ new_messages = argv[3] or '0';
+ saved_messages = argv[4] or '0';
+
+--include the lua script
+ require "resources.functions.config";
+
+--send MWI NOTIFY message
+ require "app.voicemail.resources.functions.mwi_notify";
+
+--debug info
+ --freeswitch.consoleLog("NOTICE", "voicemail_id="..voicemail_id.."\n");
+ --freeswitch.consoleLog("NOTICE", "domain_name="..domain_name.."\n");
+ --freeswitch.consoleLog("NOTICE", "new_messages="..new_messages.."\n");
+ --freeswitch.consoleLog("NOTICE", "saved_messages="..saved_messages.."\n");
+
+--send the message waiting event
+ mwi_notify(voicemail_id..'@'..domain_name, domain_name, new_messages, saved_messages);
+
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
index 5492491ad5..62bc459e5f 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
@@ -98,6 +98,7 @@
ivr_menu_greet_short = row["ivr_menu_greet_short"];
ivr_menu_invalid_sound = row["ivr_menu_invalid_sound"];
ivr_menu_exit_sound = row["ivr_menu_exit_sound"];
+ ivr_menu_pin_number = row["ivr_menu_pin_number"];
ivr_menu_confirm_macro = row["ivr_menu_confirm_macro"];
ivr_menu_confirm_key = row["ivr_menu_confirm_key"];
ivr_menu_tts_engine = row["ivr_menu_tts_engine"];
@@ -248,6 +249,7 @@
table.insert(xml, [[ greet-short="]]..ivr_menu_greet_short..[[" ]]);
table.insert(xml, [[ invalid-sound="]]..ivr_menu_invalid_sound..[[" ]]);
table.insert(xml, [[ exit-sound="]]..ivr_menu_exit_sound..[[" ]]);
+ table.insert(xml, [[ pin="]]..ivr_menu_pin_number..[[" ]]);
table.insert(xml, [[ confirm-macro="]]..ivr_menu_confirm_macro..[[" ]]);
table.insert(xml, [[ confirm-key="]]..ivr_menu_confirm_key..[[" ]]);
table.insert(xml, [[ tts-engine="]]..ivr_menu_tts_engine..[[" ]]);
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
index 71beae1443..6274ab2e4c 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
@@ -181,6 +181,12 @@
if (string.len(field.ping) > 0) then
table.insert(xml, [[ ]]);
end
+ if (string.len(field.ping_min) > 0) then
+ table.insert(xml, [[ ]]);
+ end
+ if (string.len(field.ping_max) > 0) then
+ table.insert(xml, [[ ]]);
+ end
if (string.len(field.context) > 0) then
table.insert(xml, [[ ]]);
end
diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua
index 72af13bf59..aa5837a4cc 100644
--- a/app/scripts/resources/scripts/resources/functions/send_mail.lua
+++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua
@@ -3,28 +3,11 @@ local Database = require "resources.functions.database";
local cache = require"resources.functions.cache";
local log = require "resources.functions.log".send_mail
-
local db = dbh or Database.new('system');
---local settings = Settings.new(db, nil, nil);
---local email_method = settings:get('email', 'method', 'text');
+local settings = Settings.new(db, domain_name, domain_uuid)
+local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
---get the dialplan mode from the cache
-email_method_key = "settings:email:email_mode";
-email_method, err = cache.get(email_method_key);
-
---if not found in the cache then get it from the database
-if (err == 'NOT FOUND') then
- --get the mode from default settings
- sql = "select default_setting_value from v_default_settings "
- sql = sql .. "where default_setting_category = 'email' ";
- sql = sql .. "and default_setting_subcategory = 'method' ";
- email_method = db:first_value(sql, nil);
- if (email_method) then
- local ok, err = cache.set(email_method_key, email_method, expire["dialplan"]);
- end
-end
-
-if (email_method == 'queue') then
+if (email_queue_enabled == 'true') then
function send_mail(headers, email_address, email_message, email_file)
--include json library
@@ -36,7 +19,14 @@ if (email_method == 'queue') then
local domain_uuid = headers["X-FusionPBX-Domain-UUID"];
local domain_name = headers["X-FusionPBX-Domain-Name"];
local email_type = headers["X-FusionPBX-Email-Type"] or 'info';
- local call_uuid = headers["X-FusionPBX-Email-Call-UUID"];
+ local call_uuid = headers["X-FusionPBX-Call-UUID"];
+ local local_after_email = headers["X-FusionPBX-local_after_email"] or '';
+
+ if (local_after_email == 'false') then
+ email_action_after = 'delete';
+ else
+ email_action_after = '';
+ end
local settings = Settings.new(db, domain_name, domain_uuid);
@@ -65,7 +55,10 @@ if (email_method == 'queue') then
sql = sql .. " email_to, ";
sql = sql .. " email_subject, ";
sql = sql .. " email_body, ";
- sql = sql .. " email_status ";
+ sql = sql .. " email_status, ";
+ sql = sql .. " email_uuid, ";
+ sql = sql .. " email_action_after ";
+
sql = sql .. ") ";
sql = sql .. "values ( ";
sql = sql .. " :email_queue_uuid, ";
@@ -76,7 +69,9 @@ if (email_method == 'queue') then
sql = sql .. " :email_to, ";
sql = sql .. " :email_subject, ";
sql = sql .. " :email_body, ";
- sql = sql .. " :email_status ";
+ sql = sql .. " :email_status, ";
+ sql = sql .. " :email_uuid, ";
+ sql = sql .. " :email_action_after ";
sql = sql .. ") ";
local params = {
email_queue_uuid = email_queue_uuid;
@@ -87,6 +82,8 @@ if (email_method == 'queue') then
email_subject = email_subject;
email_body = email_body;
email_status = email_status;
+ email_uuid = call_uuid;
+ email_action_after = email_action_after;
}
db:query(sql, params);
@@ -100,7 +97,8 @@ if (email_method == 'queue') then
local email_table = split(email_file, '/', true)
email_attachment_name = email_table[#email_table]
- email_attachment_path = email_file.sub(email_file, 0, (string.len(email_file) - string.len(email_attachment_name)) - 1);
+ email_attachment_path = email_file.sub(email_file, 0, (string.len(email_file) - string.len(email_attachment_name)) - 1);
+ --freeswitch.consoleLog("notice", "[send_email] voicemail path: " .. email_attachment_path .. "/" .. email_attachment_name .. "\n");
--base64 encode the file
--local file = require "resources.functions.file"
@@ -136,7 +134,7 @@ if (email_method == 'queue') then
email_attachment_base64 = email_attachment_base64;
}
if (debug["sql"]) then
- freeswitch.consoleLog("notice", "[dialplan] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+ freeswitch.consoleLog("notice", "[send_email] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
end
db:query(sql, params);
end
@@ -162,7 +160,7 @@ else
local domain_uuid = headers["X-FusionPBX-Domain-UUID"]
local domain_name = headers["X-FusionPBX-Domain-Name"]
local email_type = headers["X-FusionPBX-Email-Type"] or 'info'
- local call_uuid = headers["X-FusionPBX-Email-Call-UUID"]
+ local call_uuid = headers["X-FusionPBX-Call-UUID"]
local db = dbh or Database.new('system')
local settings = Settings.new(db, domain_name, domain_uuid)
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 7b2aa374f4..81803862a0 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -501,7 +501,7 @@
//clear the cache
$cache = new cache;
- $cache->delete("dialplan:".$_SESSION["context"]);
+ $cache->delete("dialplan:".$_SESSION["domain_name"]);
//set the message
if ($action == "add") {
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 60a2d41e43..c357ce090a 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -317,7 +317,7 @@
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "voicemail_id";
- $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the voicemail id.";
$z++;
diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index ceb6405596..df85e1e936 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -30,13 +30,15 @@ class plugin_database {
$user_authorized = false;
//check the username and password if they don't match then redirect to the login
- $sql = "select * from v_users ";
+ $sql = "select u.user_uuid, u.contact_uuid, u.username, u.password, u.salt, u.api_key, u.domain_uuid, d.domain_name ";
+ $sql .= "from v_users as u, v_domains as d ";
+ $sql .= "where u.domain_uuid = d.domain_uuid ";
if (strlen($this->key) > 30) {
- $sql .= "where api_key = :api_key ";
+ $sql .= "and u.api_key = :api_key ";
$parameters['api_key'] = $this->key;
}
else {
- $sql .= "where lower(username) = lower(:username) ";
+ $sql .= "and lower(u.username) = lower(:username) ";
$parameters['username'] = $this->username;
}
if ($_SESSION["users"]["unique"]["text"] === "global") {
@@ -44,7 +46,7 @@ class plugin_database {
}
else {
//unique username - per domain
- $sql .= "and domain_uuid = :domain_uuid ";
+ $sql .= "and u.domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $this->domain_uuid;
}
$sql .= "and (user_enabled = 'true' or user_enabled is null) ";
@@ -56,7 +58,7 @@ class plugin_database {
if ($_SESSION["users"]["unique"]["text"] === "global" && $row["domain_uuid"] !== $this->domain_uuid) {
//set the domain_uuid
$this->domain_uuid = $row["domain_uuid"];
- $this->domain_name = $_SESSION['domains'][$this->domain_uuid]['domain_name'];
+ $this->domain_name = $row["domain_name"];
//set the domain session variables
$_SESSION["domain_uuid"] = $this->domain_uuid;
diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index ebdf9f35b5..23d08e041d 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -487,6 +487,21 @@
unset($sql, $parameters);
}
+ //set domain > time_zone to UTC if not set
+ $sql = "update v_default_settings set ";
+ $sql .= "default_setting_value = 'UTC', ";
+ $sql .= "default_setting_enabled = 'true' ";
+ $sql .= "where ( ";
+ $sql .= " default_setting_value is null or ";
+ $sql .= " default_setting_value = '' ";
+ $sql .= ") ";
+ $sql .= "and default_setting_category = 'domain' ";
+ $sql .= "and default_setting_subcategory = 'time_zone' ";
+ $sql .= "and default_setting_name = 'name' ";
+ $database = new database;
+ $database->execute($sql);
+ unset($sql);
+
}
?>
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 98976a9dc8..d273b10eb0 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -211,7 +211,7 @@
//pre-populate the form
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
$default_setting_uuid = $_GET["id"];
- $sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, cast(default_setting_enabled as text), default_setting_description ";
+ $sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, default_setting_order, cast(default_setting_enabled as text), default_setting_description ";
$sql .= "from v_default_settings ";
$sql .= "where default_setting_uuid = :default_setting_uuid ";
$parameters['default_setting_uuid'] = $default_setting_uuid;
diff --git a/core/default_settings/resources/classes/default_settings.php b/core/default_settings/resources/classes/default_settings.php
index 727f4b8107..a3401d9b5f 100644
--- a/core/default_settings/resources/classes/default_settings.php
+++ b/core/default_settings/resources/classes/default_settings.php
@@ -269,7 +269,7 @@ if (!class_exists('default_settings')) {
$array['domain_settings'][$x]['domain_setting_name'] = $default_setting_name;
$array['domain_settings'][$x]['domain_setting_value'] = $default_setting_value;
$array['domain_settings'][$x]['domain_setting_order'] = $default_setting_order;
- $array['domain_settings'][$x]['domain_setting_enabled'] = $default_setting_enabled;
+ $array['domain_settings'][$x]['domain_setting_enabled'] = $default_setting_enabled ?: 0;
$array['domain_settings'][$x]['domain_setting_description'] = $default_setting_description;
//insert
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index a464b5ab05..2cc544adee 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -325,7 +325,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
//pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true" && is_uuid($_GET["id"])) {
$domain_setting_uuid = $_GET["id"];
- $sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, cast(domain_setting_enabled as text), domain_setting_description ";
+ $sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, domain_setting_order, cast(domain_setting_enabled as text), domain_setting_description ";
$sql .= "from v_domain_settings ";
$sql .= "where domain_uuid = :domain_uuid ";
$sql .= "and domain_setting_uuid = :domain_setting_uuid ";
diff --git a/core/domain_settings/resources/classes/domain_settings.php b/core/domain_settings/resources/classes/domain_settings.php
index f4d810cd71..35a510349d 100644
--- a/core/domain_settings/resources/classes/domain_settings.php
+++ b/core/domain_settings/resources/classes/domain_settings.php
@@ -276,7 +276,7 @@ if (!class_exists('domain_settings')) {
$array['domain_settings'][0]['domain_setting_name'] = $domain_setting_name;
$array['domain_settings'][0]['domain_setting_value'] = $domain_setting_value;
$array['domain_settings'][0]['domain_setting_order'] = $domain_setting_order;
- $array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled;
+ $array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled ?: 0;
$array['domain_settings'][0]['domain_setting_description'] = $domain_setting_description;
//insert
diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php
index 5f4e7e3757..c01851ba87 100644
--- a/core/domains/domain_edit.php
+++ b/core/domains/domain_edit.php
@@ -500,8 +500,6 @@
//clear the domains session array to update it
unset($_SESSION["domains"]);
- unset($_SESSION["domain_uuid"]);
- unset($_SESSION["domain_name"]);
unset($_SESSION['domain']);
unset($_SESSION['switch']);
diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php
index a703294a8c..f984c6967c 100644
--- a/core/groups/app_languages.php
+++ b/core/groups/app_languages.php
@@ -1681,6 +1681,48 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
$text['label-12-hour']['sv-se'] = "12-timmars";
$text['label-12-hour']['uk-ua'] = "12-годинний";
+$text['label-assigned']['en-us'] = "Assigned";
+$text['label-assigned']['en-gb'] = "Assigned";
+$text['label-assigned']['ar-eg'] = "Assigned";
+$text['label-assigned']['de-at'] = "Assigned";
+$text['label-assigned']['de-ch'] = "Assigned";
+$text['label-assigned']['de-de'] = "Assigned";
+$text['label-assigned']['es-cl'] = "Assigned";
+$text['label-assigned']['es-mx'] = "Assigned";
+$text['label-assigned']['fr-ca'] = "Assigned";
+$text['label-assigned']['fr-fr'] = "Assigned";
+$text['label-assigned']['he-il'] = "Assigned";
+$text['label-assigned']['it-it'] = "Assigned";
+$text['label-assigned']['nl-nl'] = "Assigned";
+$text['label-assigned']['pl-pl'] = "Assigned";
+$text['label-assigned']['pt-br'] = "Assigned";
+$text['label-assigned']['pt-pt'] = "Assigned";
+$text['label-assigned']['ro-ro'] = "Assigned";
+$text['label-assigned']['ru-ru'] = "Assigned";
+$text['label-assigned']['sv-se'] = "Assigned";
+$text['label-assigned']['uk-ua'] = "Assigned";
+
+$text['label-unassigned']['en-us'] = "Unassigned";
+$text['label-unassigned']['en-gb'] = "Unassigned";
+$text['label-unassigned']['ar-eg'] = "Unassigned";
+$text['label-unassigned']['de-at'] = "Unassigned";
+$text['label-unassigned']['de-ch'] = "Unassigned";
+$text['label-unassigned']['de-de'] = "Unassigned";
+$text['label-unassigned']['es-cl'] = "Unassigned";
+$text['label-unassigned']['es-mx'] = "Unassigned";
+$text['label-unassigned']['fr-ca'] = "Unassigned";
+$text['label-unassigned']['fr-fr'] = "Unassigned";
+$text['label-unassigned']['he-il'] = "Unassigned";
+$text['label-unassigned']['it-it'] = "Unassigned";
+$text['label-unassigned']['nl-nl'] = "Unassigned";
+$text['label-unassigned']['pl-pl'] = "Unassigned";
+$text['label-unassigned']['pt-br'] = "Unassigned";
+$text['label-unassigned']['pt-pt'] = "Unassigned";
+$text['label-unassigned']['ro-ro'] = "Unassigned";
+$text['label-unassigned']['ru-ru'] = "Unassigned";
+$text['label-unassigned']['sv-se'] = "Unassigned";
+$text['label-unassigned']['uk-ua'] = "Unassigned";
+
$text['header-user_setting-edit']['en-us'] = "User Setting";
$text['header-user_setting-edit']['en-gb'] = "User Setting";
$text['header-user_setting-edit']['ar-eg'] = "";
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index b8c92f8729..35a503f975 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -94,6 +94,9 @@
}
}
+//get the view preference
+ $view = $_REQUEST['view'];
+
//get the http post data
if (is_array($_POST['group_permissions'])) {
$action = $_POST['action'];
@@ -233,7 +236,7 @@
$token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) {
message::add($text['message-invalid_token'],'negative');
- header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).'&search='.urlencode($search));
+ header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).($view ? '&view='.urlencode($view) : null).($search ? '&search='.urlencode($search) : null));
exit;
}
@@ -264,10 +267,6 @@
exit;
}
-//get order and order by
- //$order_by = $_GET["order_by"];
- //$order = $_GET["order"];
-
//create token
$object = new token;
$token = $object->create($_SERVER['PHP_SELF']);
@@ -287,7 +286,12 @@
}
echo " |
