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

Merge pull request #1018 from moteus/number_alias_as_vm_id 

Change. Use number_alias as voicemail_id.
This commit is contained in:
FusionPBX 2015-08-11 20:43:20 -06:00
parent c4fc2f3deb c556498dae
commit 81003e35d8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/extensions/extension_copy.php
View File

@ -176,11 +176,11 @@ else {
//get the voicemails
$sql = "select * from v_voicemails ";
$sql .= "where domain_uuid = '$domain_uuid' ";
if (is_numeric($extension)) {
$sql .= "and voicemail_id = '$extension' ";
if (is_numeric($number_alias)) {
$sql .= "and voicemail_id = '$number_alias' ";
}
else {
$sql .= "and voicemail_id = '$number_alias' ";
$sql .= "and voicemail_id = '$extension' ";
}
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();

2
app/extensions/extension_edit.php
View File

@ -849,7 +849,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
//get the voicemails
$sql = "select * from v_voicemails ";
$sql .= "where domain_uuid = '".$domain_uuid."' ";
$sql .= "and voicemail_id = '".((is_numeric($extension)) ? $extension : $number_alias)."' ";
$sql .= "and voicemail_id = '".((is_numeric($number_alias)) ? $number_alias : $extension)."' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);

6
app/extensions/resources/classes/extension.php
View File

@ -91,11 +91,11 @@
public function voicemail() {
//determine the voicemail_id
if (is_numeric($this->extension)) {
$this->voicemail_id = $this->extension;
if (is_numeric($this->number_alias)) {
$this->voicemail_id = $this->number_alias;
}
else {
$this->voicemail_id = $this->number_alias;
$this->voicemail_id = $this->extension;
}
//update the voicemail settings

4
resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
View File

@ -284,8 +284,8 @@
--get the voicemail from the database
if (continue) then
vm_enabled = "true";
if tonumber(user) == nil then
sql = "SELECT * FROM v_voicemails WHERE domain_uuid = '" .. domain_uuid .. "' and voicemail_id = '" .. number_alias .. "' ";
if number_alias and #number_alias > 0 then
sql = "SELECT * FROM v_voicemails WHERE domain_uuid = '" .. domain_uuid .. "' and voicemail_id = '" .. number_alias .. "' ";
else
sql = "SELECT * FROM v_voicemails WHERE domain_uuid = '" .. domain_uuid .. "' and voicemail_id = '" .. user .. "' ";
end