diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php index a16066ed2c..9150f0cb37 100644 --- a/app/click_to_call/click_to_call.php +++ b/app/click_to_call/click_to_call.php @@ -49,168 +49,131 @@ else { require_once "resources/header.php"; if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])) { - //get the http variables and set them as variables + //retrieve submitted variables $src = check_str($_REQUEST['src']); - $dest = check_str($_REQUEST['dest']); - $ringback = check_str($_REQUEST['ringback']); - $src = str_replace(array('.', '(', ')', '-', ' '), '', $src); - if (strpbrk($dest, '@') != FALSE) { - $dest = str_replace(array('(', ')', ' '), '', $dest); //don't strip periods or dashes in sip-uri calls - } - else { - $dest = str_replace(array('.', '(', ')', '-', ' '), '', $dest); //strip the periods for phone numbers. - } $src_cid_name = check_str($_REQUEST['src_cid_name']); $src_cid_number = check_str($_REQUEST['src_cid_number']); + + $dest = check_str($_REQUEST['dest']); $dest_cid_name = check_str($_REQUEST['dest_cid_name']); $dest_cid_number = check_str($_REQUEST['dest_cid_number']); + $auto_answer = check_str($_REQUEST['auto_answer']); //true,false $rec = check_str($_REQUEST['rec']); //true,false - if ($auto_answer == "true") { - $sip_auto_answer = "sip_auto_answer=true,"; - } - else { - $sip_auto_answer = ''; - } - if (strlen($cid_number) == 0) { $cid_number = $src;} + $ringback = check_str($_REQUEST['ringback']); $context = $_SESSION['context']; - //workaround for TBDialout on Thunderbird - //seems it can only handle the first %NUM% - if ($dest == "%NUM%"){ - //echo "Thunderbird fix, dest now = $src_cid_number
"; - $dest = $src_cid_number; - } + //clean up variable values + $src = str_replace(array('.','(',')','-',' '), '', $src); + $dest = (strpbrk($dest, '@') != FALSE) ? str_replace(array('(',')',' '), '', $dest) : str_replace(array('.','(',')','-',' '), '', $dest); //don't strip periods or dashes in sip-uri calls, only phone numbers + + //adjust variable values + $sip_auto_answer = ($auto_answer == "true") ? ",sip_auto_answer=true" : null; + + //mozilla thunderbird TBDialout workaround (seems it can only handle the first %NUM%) + $dest = ($dest == "%NUM%") ? $src_cid_number : $dest; //translate ringback switch ($ringback) { + case "music": $ringback_value = "\'local_stream://moh\'"; break; + case "uk-ring": $ringback_value = "\'%(400,200,400,450);%(400,2200,400,450)\'"; break; + case "fr-ring": $ringback_value = "\'%(1500,3500,440.0,0.0)\'"; break; + case "pt-ring": $ringback_value = "\'%(1000,5000,400.0,0.0)\'"; break; + case "rs-ring": $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; break; + case "it-ring": $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; break; case "us-ring": - $ringback_value = "\'%(2000,4000,440.0,480.0)\'"; - break; - case "uk-ring": - $ringback_value = "\'%(400,200,400,450);%(400,2200,400,450)\'"; - break; - case "fr-ring": - $ringback_value = "\'%(1500,3500,440.0,0.0)\'"; - break; - case "pt-ring": - $ringback_value = "\'%(1000,5000,400.0,0.0)\'"; - break; - case "rs-ring": - $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; - break; - case "it-ring": - $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; - break; - case "music": - $ringback_value = "\'local_stream://moh\'"; - break; default: $ringback = 'us-ring'; $ringback_value = "\'%(2000,4000,440.0,480.0)\'"; } - //source should see the destination caller id + //determine call direction + $dir = (strlen($dest) < 7) ? 'local' : 'outbound'; + + //define a leg - set source to display the defined caller id name and number + $source_common = "{". + "click_to_call=true". + ",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=".$dir; if (strlen($src) < 7) { - $source = "{click_to_call=true,".$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,domain_uuid=".$domain_uuid.",domain_name=".$_SESSION['domains'][$domain_uuid]['domain_name']."}user/$src@".$_SESSION['domains'][$domain_uuid]['domain_name']; + //source is a local extension + $source = $source_common.$sip_auto_answer. + ",domain_uuid=".$domain_uuid. + ",domain_name=".$_SESSION['domains'][$domain_uuid]['domain_name']."}user/".$src."@".$_SESSION['domains'][$domain_uuid]['domain_name']; } else { - $bridge_array = outbound_route_to_bridge ($_SESSION['domain_uuid'], $src); - $source = "{click_to_call=true,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]; + //source is an external number + $bridge_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $src); + $source = $source_common."}".$bridge_array[0]; } + unset($source_common); - //destination needs to see the source caller id + //define b leg - set destination to display the defined caller id name and number + $destination_common = " &bridge({origination_caller_id_name='".$dest_cid_name."',origination_caller_id_number=".$dest_cid_number; if (strlen($dest) < 7) { - if (strpbrk($dest, '@') != FALSE) { - //echo "Found an @ 2

"; - $switch_cmd = "api originate $source &bridge({origination_caller_id_name='$dest_cid_name',origination_caller_id_number=$dest_cid_number,call_direction=outbound}sofia/external/$dest)"; - echo "$switch_cmd"; + //destination is a local extension + if (strpbrk($dest, '@') != FALSE) { //sip-uri + $switch_cmd = $destination_common.",call_direction=outbound}sofia/external/".$dest.")"; } - else { - $switch_cmd = "api originate $source &transfer('".$dest." XML ".$context."')"; + else { //not sip-uri + $switch_cmd = " &transfer('".$dest." XML ".$context."')"; } } else { - if (strlen($src) < 7) { - if (strlen($dest_cid_number) == 0) { - //get the caller id from the extension caller id comes from the extension (the source number) - $sql = "select * from v_extensions "; - $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "and extension = '$src' "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - foreach ($result as &$row) { - $dest_cid_name = $row["outbound_caller_id_name"]; - $dest_cid_number = $row["outbound_caller_id_number"]; - break; //limit to 1 row - } - unset ($prep_statement); + //local extension (source) > external number (destination) + if (strlen($src) < 7 && strlen($dest_cid_number) == 0) { + //retrieve outbound caller id from the (source) extension + $sql = "select outbound_caller_id_name, outbound_caller_id_number from v_extensions where domain_uuid = '".$_SESSION['domain_uuid']."' and extension = '".$src."' "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + foreach ($result as &$row) { + $dest_cid_name = $row["outbound_caller_id_name"]; + $dest_cid_number = $row["outbound_caller_id_number"]; + break; //limit to 1 row } + unset ($prep_statement); } - $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')) { - if (strpbrk($dest, '@') != FALSE) { - //call a sip uri - //echo "Found an @ 4, do nothing for now

"; - $switch_cmd = "api originate $source &bridge({origination_caller_id_name='$dest_cid_name',origination_caller_id_number=$dest_cid_number,call_direction=outbound}sofia/external/$dest)"; - //echo "
SWITCH-CMD: $switch_cmd
"; + if (strpbrk($dest, '@') != FALSE) { //sip-uri + $switch_cmd = $destination_common.",call_direction=outbound}sofia/external/".$dest.")"; } - else { - //regular call - $switch_cmd = "api originate $source &bridge($destination)"; + else { //not sip-uri + $bridge_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $dest); + //$switch_cmd = $destination_common."}".$bridge_array[0].")"; // wouldn't set cdr destination correctly, so below used instead + $switch_cmd = " &transfer('".$dest." XML ".$context."')"; } } } - - //display the last command - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
Message
$switch_cmd $src has called $dest
\n"; - echo "
\n"; + unset($destination_common); //create the even socket connection and send the event socket command $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if (!$fp) { - //show the error message - $msg = "
Connection to Event Socket failed.
"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "
Message
$msg
\n"; - echo "
\n"; + //error message + echo "
Connection to Event Socket failed.
"; } else { + //display the last command + $switch_cmd = "api originate ".$source.$switch_cmd; + echo "
".$switch_cmd."

".$src." has called ".$dest."
\n"; //show the command result - $result = trim(event_socket_request($fp, $switch_cmd)); - if (substr($result, 0,3) == "+OK") { - $uuid = substr($result, 4); - if ($rec == "true") { - //use the server's time zone to ensure it matches the time zone used by freeswitch - date_default_timezone_set($_SESSION['time_zone']['system']); - //create the api record command and send it over event socket - $switch_cmd = "api uuid_record ".$uuid." start ".$_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/".date("Y")."/".date("M")."/".date("d")."/".$uuid.".wav"; - $result2 = trim(event_socket_request($fp, $switch_cmd)); - } + $result = trim(event_socket_request($fp, $switch_cmd)); + if (substr($result, 0,3) == "+OK") { + $uuid = substr($result, 4); + if ($rec == "true") { + //use the server's time zone to ensure it matches the time zone used by freeswitch + date_default_timezone_set($_SESSION['time_zone']['system']); + //create the api record command and send it over event socket + $switch_cmd = "api uuid_record ".$uuid." start ".$_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/".date("Y")."/".date("M")."/".date("d")."/".$uuid.".wav"; + $result2 = trim(event_socket_request($fp, $switch_cmd)); } - echo "
\n"; - echo "
\n"; - echo $result; - echo "
\n"; - echo "
\n"; - echo "
\n"; + } + echo "

".$result."

\n"; } } diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index bd8180332e..d5a8d86a68 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -361,6 +361,15 @@ ) and bridge_uuid is null and destination_number in ('".implode("','",$assigned_extensions)."') + and ("; + $x = 0; + foreach ($assigned_extensions as $assigned_extension_uuid => $assigned_extension) { + $sql .= "extension_uuid = '".$assigned_extension_uuid."' "; + $sql .= "or destination_number = '".$assigned_extension."' "; + if (++$x < sizeof($assigned_extensions)) { $sql .= "or "; } + } + $sql .= " + ) order by start_epoch desc limit ".$missed_limit." @@ -396,9 +405,22 @@ $tmp_month = date("M", strtotime($row['start_stamp'])); $tmp_day = date("d", strtotime($row['start_stamp'])); $tmp_start_epoch = (defined('TIME_24HR') && TIME_24HR == 1) ? date("j/n H:i", $row['start_epoch']) : date("j/n h:ia", $row['start_epoch']); - - $tr_link = "onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php?src_cid_name=".urlencode($row['caller_id_name'])."&src_cid_number=".urlencode($row['caller_id_number'])."&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name'])."&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number'])."&src=".urlencode($_SESSION['user']['extension'][0]['user'])."&dest=".urlencode($row['caller_id_number'])."&rec=false&ringback=us-ring&auto_answer=true');\""; - $hud[$n]['html'] .= "\n"; + //set click-to-call variables + if (permission_exists('click_to_call_call')) { + $tr_link = "onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php". + "?src_cid_name=".urlencode($row['caller_id_name']). + "&src_cid_number=".urlencode($row['caller_id_number']). + "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name']). + "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number']). + "&src=".urlencode($_SESSION['user']['extension'][0]['user']). + "&dest=".urlencode($row['caller_id_number']). + "&rec=false". + "&ringback=us-ring". + "&auto_answer=true". + "');\" ". + "style='cursor: pointer;'"; + } + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "\n"; if ($theme_cdr_images_exist) { $call_result = ($row['answer_stamp'] != '') ? 'voicemail' : 'cancelled'; @@ -447,10 +469,11 @@ domain_uuid = '".$_SESSION['domain_uuid']."' and ("; $x = 0; - foreach ($assigned_extensions as $assigned_extension) { - $sql .= "caller_id_number like '".$assigned_extension."' "; - $sql .= "or destination_number like '".$assigned_extension."' "; - $sql .= "or destination_number like '*99".$assigned_extension."' "; + foreach ($assigned_extensions as $assigned_extension_uuid => $assigned_extension) { + $sql .= "extension_uuid = '".$assigned_extension_uuid."' "; + $sql .= "or caller_id_number = '".$assigned_extension."' "; + $sql .= "or destination_number = '".$assigned_extension."' "; + $sql .= "or destination_number = '*99".$assigned_extension."' "; if (++$x < sizeof($assigned_extensions)) { $sql .= "or "; } } $sql .= " @@ -499,17 +522,32 @@ $tmp_start_epoch = (defined('TIME_24HR') && TIME_24HR == 1) ? date("j/n H:i", $row['start_epoch']) : date("j/n h:ia", $row['start_epoch']); //determine name - $cdr_name = ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && in_array($row['destination_number'], $assigned_extensions))) ? $row['caller_id_name'] : " "; - //determine number to display/click-to-call + $cdr_name = ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && in_array($row['destination_number'], $assigned_extensions))) ? $row['caller_id_name'] : $row['destination_number']; + //determine number to display if ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && in_array($row['destination_number'], $assigned_extensions))) { $cdr_number = (is_numeric($row['caller_id_number'])) ? format_phone($row['caller_id_number']) : $row['caller_id_number']; + $dest = $row['caller_id_number']; } else if ($row['direction'] == 'outbound' || ($row['direction'] == 'local' && in_array($row['caller_id_number'], $assigned_extensions))) { $cdr_number = (is_numeric($row['destination_number'])) ? format_phone($row['destination_number']) : $row['destination_number']; + $dest = $row['destination_number']; } - - $tr_link = "onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php?src_cid_name=".urlencode($cdr_name)."&src_cid_number=".urlencode($cdr_number)."&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name'])."&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number'])."&src=".urlencode($_SESSION['user']['extension'][0]['user'])."&dest=".urlencode($cdr_number)."&rec=false&ringback=us-ring&auto_answer=true');\""; - $hud[$n]['html'] .= "\n"; + //set click-to-call variables + if (permission_exists('click_to_call_call')) { + $tr_link = "onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php". + "?src_cid_name=".urlencode($cdr_name). + "&src_cid_number=".urlencode($cdr_number). + "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name']). + "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number']). + "&src=".urlencode($_SESSION['user']['extension'][0]['user']). + "&dest=".urlencode($dest). + "&rec=false". + "&ringback=us-ring". + "&auto_answer=true". + "');\" ". + "style='cursor: pointer;'"; + } + $hud[$n]['html'] .= "\n"; //determine call result and appropriate icon $hud[$n]['html'] .= "\n"; if ($theme_cdr_images_exist) { @@ -896,7 +934,7 @@ if ((in_array('missed', $selected_blocks) || in_array('recent', $selected_blocks)) && permission_exists('xml_cdr_view')) { echo "\n"; }