diff --git a/agc_2-X/trunk/agi/agent_monitor.agi b/agc_2-X/trunk/agi/agent_monitor.agi index 8b0b7a4d..660b081a 100644 --- a/agc_2-X/trunk/agi/agent_monitor.agi +++ b/agc_2-X/trunk/agi/agent_monitor.agi @@ -542,6 +542,8 @@ sub user_phone_gather $PDtsSQLdate = "$Pyear$Pmon$Pmday$Phour$Pmin$Psec"; $stmtA = "SELECT user FROM vicidial_live_agents where last_update_time > \"$PDtsSQLdate\" and extension NOT LIKE \"R/%\" $campaigns_limitSQL order by last_update_time desc limit 100;"; + if ($user_phone =~ /PHONE/) + {$stmtA = "SELECT extension FROM vicidial_live_agents where extension NOT LIKE \"R/%\" and last_update_time > \"$PDtsSQLdate\" $campaigns_limitSQL limit 100;";} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; @@ -552,6 +554,7 @@ sub user_phone_gather @aryA = $sthA->fetchrow_array; $sox_cmd .= " /var/lib/asterisk/sounds/silence.wav /var/lib/asterisk/sounds/user.gsm"; $sox_user = $aryA[0]; + $sox_user =~ s/IAX2\/|IAX\/|SIP\///gi; $sox_user =~ s/\D//gi; foreach $user_char (split //, $sox_user) { diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index 4e899b56..2dd73e1e 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -333,10 +333,11 @@ # 130615-1126 - Added recording_id to dispo url # 130617-0805 - Fixed issue with scheduled callbacks and campaign presets # 130705-1512 - Added optional encrypted passwords compatibility +# 130718-0737 - Added recording_filename to dispo url # -$version = '2.8-231'; -$build = '130705-1512'; +$version = '2.8-232'; +$build = '130718-0737'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=533; $one_mysql_log=0; @@ -567,6 +568,8 @@ if (isset($_GET["inbound_email_groups"])) {$inbound_email_groups=$_GET["inboun elseif (isset($_POST["inbound_email_groups"])) {$inbound_email_groups=$_POST["inbound_email_groups"];} if (isset($_GET["recording_id"])) {$recording_id=$_GET["recording_id"];} elseif (isset($_POST["recording_id"])) {$recording_id=$_POST["recording_id"];} +if (isset($_GET["recording_filename"])) {$recording_filename=$_GET["recording_filename"];} + elseif (isset($_POST["recording_filename"])) {$recording_filename=$_POST["recording_filename"];} if (isset($_GET["orig_pass"])) {$orig_pass=$_GET["orig_pass"];} elseif (isset($_POST["orig_pass"])) {$orig_pass=$_POST["orig_pass"];} @@ -9478,6 +9481,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = preg_replace('/--A--user_group--B--/i',urlencode(trim($user_group)),$dispo_call_url); $dispo_call_url = preg_replace('/--A--call_notes--B--/i',"$url_call_notes",$dispo_call_url); $dispo_call_url = preg_replace('/--A--recording_id--B--/i',"$recording_id",$dispo_call_url); + $dispo_call_url = preg_replace('/--A--recording_filename--B--/i',"$recording_filename",$dispo_call_url); if (strlen($FORMcustom_field_names)>2) { diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index e4d2bd1b..6734cddd 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -406,10 +406,11 @@ # 130615-1125 - Added recording_id to dispo url # 130625-0841 - Added more user log data on login # 130705-1439 - Added optional encrypted passwords compatibility +# 130718-0745 - Added recording_filename to dispo_call_url # -$version = '2.8-375c'; -$build = '130705-1439'; +$version = '2.8-376c'; +$build = '130718-0745'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=79; $one_mysql_log=0; @@ -3721,6 +3722,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var inbound_lead_search=0; var VU_agent_choose_ingroups_skip_count=0; var agent_select_territories_skip_count=0; + var last_recording_filename=''; var DiaLControl_auto_HTML = "\"\"Resume\""; var DiaLControl_auto_HTML_ready = "\"\"Resume\""; var DiaLControl_auto_HTML_OFF = "\"\"Resume\""; @@ -5154,6 +5156,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } var RecDispNamE = RClookFILE_array[1]; + last_recording_filename = RClookFILE_array[1]; if (RecDispNamE.length > 25) { RecDispNamE = RecDispNamE.substr(0,22); @@ -5744,6 +5747,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) // recording_id = MDlogRecorDings_array[3]; var RecDispNamE = MDlogRecorDings_array[2]; + last_recording_filename = MDlogRecorDings_array[2]; if (RecDispNamE.length > 25) { RecDispNamE = RecDispNamE.substr(0,22); @@ -10318,6 +10322,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) customer_3way_hangup_counter_trigger=0; waiting_on_dispo=1; var VDDCU_recording_id=document.getElementById("RecorDID").innerHTML; + var VDDCU_recording_filename=last_recording_filename; document.getElementById("callchannel").innerHTML = ''; document.vicidial_form.callserverip.value = ''; document.vicidial_form.xferchannel.value = ''; @@ -10363,7 +10368,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&orig_pass=" + orig_pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&CallBackLeadStatus=" + CallBackLeadStatus + "&comments=" + encodeURIComponent(CallBackCommenTs) + "&custom_field_names=" + custom_field_names + "&call_notes=" + encodeURIComponent(document.vicidial_form.call_notes_dispo.value) + "&qm_dispo_code=" + DispoQMcsCODE + "&email_enabled=" + email_enabled +"&recording_id="+VDDCU_recording_id; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&orig_pass=" + orig_pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&CallBackLeadStatus=" + CallBackLeadStatus + "&comments=" + encodeURIComponent(CallBackCommenTs) + "&custom_field_names=" + custom_field_names + "&call_notes=" + encodeURIComponent(document.vicidial_form.call_notes_dispo.value) + "&qm_dispo_code=" + DispoQMcsCODE + "&email_enabled=" + email_enabled + "&recording_id=" + VDDCU_recording_id + "&recording_filename=" + VDDCU_recording_filename; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php index 2b25adc2..28d53b6e 100644 --- a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php +++ b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php @@ -966,25 +966,25 @@ for ($e=0; $e