Fix outbound_route_to_bridge so that it uses the correct domain_uuid in every situation. Everyone using multi-tenant is should update svn to apply this fix.

This commit is contained in:
Mark Crane
2012-09-04 16:34:34 +00:00
parent f10e565168
commit 815dd7ec87
6 changed files with 11 additions and 11 deletions

View File

@@ -148,7 +148,7 @@ function cmd_async($cmd) {
$phone1 = str_replace(".", "", $phone1);
//get the correct gateway
$bridge_array = outbound_route_to_bridge ($phone1);
$bridge_array = outbound_route_to_bridge ($_SESSION['domain_uuid'], $phone1);
//prepare the string
$channel_variables = "ignore_early_media=true,origination_number=$phone1,origination_caller_id_name='$broadcast_caller_id_name',origination_caller_id_number=$broadcast_caller_id_number";

View File

@@ -93,7 +93,7 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
$source = "{".$sip_auto_answer."origination_caller_id_name='$src_cid_name',origination_caller_id_number=$src_cid_number,instant_ringback=true,ringback=$ringback_value,presence_id=$src@".$_SESSION['domains'][$domain_uuid]['domain_name'].",call_direction=outbound}sofia/internal/$src%".$_SESSION['domains'][$domain_uuid]['domain_name'];
}
else {
$bridge_array = outbound_route_to_bridge ($src);
$bridge_array = outbound_route_to_bridge ($_SESSION['domain_uuid'], $src);
$source = "{origination_caller_id_name='$src_cid_name',origination_caller_id_number=$src_cid_number,instant_ringback=true,ringback=$ringback_value,presence_id=$src@".$_SESSION['domains'][$domain_uuid]['domain_name'].",call_direction=outbound}".$bridge_array[0];
}
@@ -120,7 +120,7 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
unset ($prep_statement);
}
}
$bridge_array = outbound_route_to_bridge ($dest);
$bridge_array = outbound_route_to_bridge ($_SESSION['domain_uuid'], $dest);
$destination = "{origination_caller_id_name='$dest_cid_name',origination_caller_id_number=$dest_cid_number}".$bridge_array[0];
if (permission_exists('click_to_call_call')) {
$switch_cmd = "api originate $source &bridge($destination)";

View File

@@ -254,7 +254,7 @@ else {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) {
//prepare the fax originate command
$route_array = outbound_route_to_bridge($fax_number);
$route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_number);
$fax_file = $dir_fax_temp."/".$fax_name.".tif";
if (count($route_array) == 0) {
//send the internal call to the registered extension

View File

@@ -47,7 +47,7 @@ else {
if (count($_POST)>0) {
$virtual_table_category = check_str($_POST["virtual_table_category"]);
$virtual_table_category_other = check_str($_POST["virtual_table_category_other"]);
if (strlen($virtual_table_category_other) == 0) { $virtual_table_category = $virtual_table_category_other; }
if (strlen($virtual_table_category_other) > 0) { $virtual_table_category = $virtual_table_category_other; }
$virtual_table_label = check_str($_POST["virtual_table_label"]);
$virtual_table_name = check_str($_POST["virtual_table_name"]);
$virtual_table_auth = check_str($_POST["virtual_table_auth"]);