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

Merge pull request #1093 from moteus/dnd_number_alias 

Fix. Use number alias to forward call to VM when DND is on.
This commit is contained in:
FusionPBX 2015-08-13 11:25:08 -06:00
parent 0237697634 5f67be647d
commit c4374178a4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/calls/resources/classes/do_not_disturb.php
View File

@ -66,7 +66,7 @@ include "root.php";
global $db; global $db;
//determine whether to update the dial string //determine whether to update the dial string
$sql = "select * from v_extensions "; $sql = "select extension_uuid, extension, number_alias from v_extensions ";
$sql .= "where domain_uuid = '".$this->domain_uuid."' "; $sql .= "where domain_uuid = '".$this->domain_uuid."' ";
if (strlen($this->extension_uuid) > 0) { if (strlen($this->extension_uuid) > 0) {
$sql .= "and extension_uuid = '".$this->extension_uuid."' "; $sql .= "and extension_uuid = '".$this->extension_uuid."' ";
@ -83,7 +83,12 @@ include "root.php";
$this->extension_uuid = $row["extension_uuid"]; $this->extension_uuid = $row["extension_uuid"];
} }
if (strlen($this->extension) == 0) { if (strlen($this->extension) == 0) {
$this->extension = $row["extension"]; if(strlen($row["number_alias"]) == 0) {
$this->extension = $row["extension"];
}
else {
$this->extension = $row["number_alias"];
}
} }
} }
} }
@ -114,4 +119,4 @@ include "root.php";
} //function } //function
} //class } //class
?> ?>

9
resources/install/scripts/do_not_disturb.lua
View File

@ -78,20 +78,21 @@
sql = sql .. "where domain_uuid = '"..domain_uuid.."' "; sql = sql .. "where domain_uuid = '"..domain_uuid.."' ";
sql = sql .. "and extension_uuid = '"..extension_uuid.."' "; sql = sql .. "and extension_uuid = '"..extension_uuid.."' ";
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[call_forward] "..sql.."\n"); freeswitch.consoleLog("notice", "[do_not_disturb] "..sql.."\n");
end end
status = dbh:query(sql, function(row) status = dbh:query(sql, function(row)
extension = row.extension; extension = row.extension;
number_alias = row.number_alias; number_alias = row.number_alias;
accountcode = row.accountcode; accountcode = row.accountcode;
follow_me_uuid = row.follow_me_uuid; follow_me_uuid = row.follow_me_uuid;
--freeswitch.consoleLog("NOTICE", "[call forward] extension "..row.extension.."\n"); --freeswitch.consoleLog("NOTICE", "[do_not_disturb] extension "..row.extension.."\n");
--freeswitch.consoleLog("NOTICE", "[call forward] accountcode "..row.accountcode.."\n"); --freeswitch.consoleLog("NOTICE", "[do_not_disturb] accountcode "..row.accountcode.."\n");
end); end);
--set the dial string --set the dial string
if (enabled == "true") then if (enabled == "true") then
dial_string = "loopback/*99"..extension; local ep = (number_alias and #number_alias > 0) and number_alias or extension;
dial_string = "loopback/*99"..ep;
end end
--set do not disturb --set do not disturb