nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 09:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Extension] Don't null dial_string when enable/disable follow me or dnd (#6000)

Browse Source
This commit is contained in:
agree
2021-08-25 12:28:26 -04:00
committed by GitHub
parent be4ea2092b
commit a2e4fd00bd
5 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/calls/call_edit.php
View File

@@ -197,7 +197,6 @@
$array['extensions'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
$array['extensions'][0]['extension_uuid'] = $extension_uuid;
$array['extensions'][0]['do_not_disturb'] = $dnd_enabled;
$array['extensions'][0]['dial_string'] = $dnd_enabled == "true" ? "error/user_busy" : '';
}
//follow me config

3
app/calls/resources/classes/call_forward.php
View File

@@ -39,7 +39,6 @@ include "root.php";
private $number_alias;
public $forward_all_destination;
public $forward_all_enabled;
private $dial_string;
private $toll_allow;
public $accountcode;
public $outbound_caller_id_name;
@@ -68,11 +67,9 @@ include "root.php";
$array['extensions'][0]['extension_uuid'] = $this->extension_uuid;
$array['extensions'][0]['forward_all_destination'] = strlen($this->forward_all_destination) != 0 ? $this->forward_all_destination : null;
if (strlen($this->forward_all_destination) == 0 || $this->forward_all_enabled == "false") {
$array['extensions'][0]['dial_string'] = null;
$array['extensions'][0]['forward_all_enabled'] = 'false';
}
else {
$array['extensions'][0]['dial_string'] = $this->dial_string;
$array['extensions'][0]['forward_all_enabled'] = 'true';
}

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

@@ -33,7 +33,6 @@ include "root.php";
public $extension_uuid;
public $extension;
public $enabled;
private $dial_string;
//update the user_status
public function user_status() {
@@ -92,12 +91,8 @@ include "root.php";
}
unset($sql, $parameters, $row);
//set the dial string
$this->dial_string = $this->enabled == "true" ? "error/user_busy" : '';
//build extension update array
$array['extensions'][0]['extension_uuid'] = $this->extension_uuid;
$array['extensions'][0]['dial_string'] = $this->dial_string;
$array['extensions'][0]['do_not_disturb'] = $this->enabled;
//grant temporary permissions

2
app/calls/resources/classes/follow_me.php
View File

@@ -242,12 +242,10 @@ include "root.php";
//add follow me to the array
$array['follow_me'][0]["follow_me_uuid"] = $this->follow_me_uuid;
$array['follow_me'][0]["domain_uuid"] = $this->domain_uuid;
$array['follow_me'][0]["dial_string"] = '';
//add extensions to the array
$array['extensions'][0]["extension_uuid"] = $extension_uuid;
$array['extensions'][0]["dial_domain"] = $this->domain_name;
$array['extensions'][0]["dial_string"] = '';
$array['extensions'][0]["follow_me_destinations"] = '';
$array['extensions'][0]["follow_me_enabled"] = $this->follow_me_enabled;

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

@@ -380,7 +380,9 @@
presence_id = (NUMBER_AS_PRESENCE_ID and sip_from_number or sip_from_user) .. "@" .. domain_name;
--set the dial_string
if (string.len(row.dial_string) > 0) then
if (do_not_disturb == "true") then
dial_string = "error/USER_BUSY";
elseif (string.len(row.dial_string) > 0) then
dial_string = row.dial_string;
else
local destination = (DIAL_STRING_BASED_ON_USERID and sip_from_number or sip_from_user) .. "@" .. domain_name;