diff --git a/agc_2-X/trunk/LANG_www/agc_es/functions.php b/agc_2-X/trunk/LANG_www/agc_es/functions.php index 12fd19a6..735cc845 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/functions.php +++ b/agc_2-X/trunk/LANG_www/agc_es/functions.php @@ -4,12 +4,13 @@ # # functions for agent scripts # -# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2011 Matt Florell LICENSE: AGPLv2 # # # CHANGES: # 100629-1201 - First Build # 101124-0625 - Added lookup_gmt and dialable_gmt functions +# 110630-0026 - Added HIDDEN and READONLY field types # @@ -152,7 +153,7 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user) {$CFoutput .= "right";} $CFoutput .= ">"; } - if ($A_field_type[$o]!='SCRIPT') + if ( ($A_field_type[$o]!='SCRIPT') and ($A_field_type[$o]!='HIDDEN') ) {$CFoutput .= "$A_field_name[$o]";} if ( ($A_name_position[$o]=='TOP') or ($A_field_type[$o]=='SCRIPT') ) {$CFoutput .= "   $helpHTML
";} @@ -239,6 +240,18 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user) if ($A_field_default[$o]=='NULL') {$A_field_default[$o]='';} $field_HTML .= "$A_field_default[$o]\n"; } + if ($A_field_type[$o]=='READONLY') + { + if (strlen($A_field_value[$o]) < 1) {$A_field_value[$o] = $A_field_default[$o];} + if ($A_field_default[$o]=='NULL') {$A_field_default[$o]='';} + $field_HTML .= " $A_field_value[$o]\n"; + } + if ($A_field_type[$o]=='HIDDEN') + { + if (strlen($A_field_value[$o]) < 1) {$A_field_value[$o] = $A_field_default[$o];} + if ($A_field_default[$o]=='NULL') {$A_field_default[$o]='';} + $field_HTML .= "\n"; + } if ($A_field_type[$o]=='SCRIPT') { if ($A_field_default[$o]=='NULL') {$A_field_default[$o]='';} @@ -317,7 +330,7 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user) $field_HTML .= ""; } - if ( ($A_name_position[$o]=='LEFT') and ($A_field_type[$o]!='SCRIPT') ) + if ( ($A_name_position[$o]=='LEFT') and ($A_field_type[$o]!='SCRIPT') and ($A_field_type[$o]!='HIDDEN') ) { $CFoutput .= " $field_HTML $helpHTML"; } diff --git a/agc_2-X/trunk/LANG_www/agc_es/manager_send.php b/agc_2-X/trunk/LANG_www/agc_es/manager_send.php index 70cc3849..fbbcf4ad 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/manager_send.php +++ b/agc_2-X/trunk/LANG_www/agc_es/manager_send.php @@ -45,6 +45,7 @@ # - $preset_name = ('TESTING PRESET',...) # - $call_variables = ('Variable: vendor_lead_code=1234|campaign=TESTCAMP|...') # - $log_campaign +# - $qm_extension # # CHANGELOG: # 50401-1002 - First build of script, Hangup function only @@ -107,10 +108,10 @@ # 101107-2331 - Added CALLERONHOLD/CALLEROFFHOLD queue_log entries # 101125-1018 - Added call_variables Originate variables # 110224-1710 - Added compatibility with QM phone environment logging -# +# 110626-2320 - Added qm_extension -$version = '2.4-55'; -$build = '110224-1710'; +$version = '2.4-56'; +$build = '110626-2320'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=116; $one_mysql_log=0; @@ -206,6 +207,8 @@ if (isset($_GET["call_variables"])) {$call_variables=$_GET["call_variables"]; elseif (isset($_POST["call_variables"])) {$call_variables=$_POST["call_variables"];} if (isset($_GET["log_campaign"])) {$log_campaign=$_GET["log_campaign"];} elseif (isset($_POST["log_campaign"])) {$log_campaign=$_POST["log_campaign"];} +if (isset($_GET["qm_extension"])) {$qm_extension=$_GET["qm_extension"];} + elseif (isset($_POST["qm_extension"])) {$qm_extension=$_POST["qm_extension"];} header ("Content-type: text/html; charset=utf-8"); @@ -426,7 +429,7 @@ if ($ACTION=="OriginateVDRelogin") if ($ACTION=="Originate") { - if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or ( (strlen($queryCID)<10) && ($alertCID < 1) ) ) + if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or ( (strlen($queryCID)<10) and ($alertCID < 1) ) ) { echo "ERROR Exten $exten No es válido or queryCID $queryCID No es válido, Originate comando no insertado\n"; } @@ -634,7 +637,7 @@ if ($ACTION=="Hangup") { ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02014',$user,$server_ip,$session_name,$one_mysql_log);} if ($format=='debug') {echo "\n";} @@ -649,6 +652,7 @@ if ($ACTION=="Hangup") $queuemetrics_login = $row[3]; $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; + $queuemetrics_pe_phone_append = $row[6]; $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### @@ -732,7 +736,10 @@ if ($ACTION=="Hangup") if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } if ($format=='debug') {echo "\n";} @@ -1433,7 +1440,7 @@ if ($ACTION=="RedirectXtraCXNeW") if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $server_ip";} } } - if ( ($channel_liveX==1) && ($channel_liveY==1) ) + if ( ($channel_liveX==1) and ($channel_liveY==1) ) { $stmt="SELECT count(*) FROM vicidial_live_agents where lead_id='$lead_id' and user!='$user';"; if ($format=='debug') {echo "\n";} @@ -1617,7 +1624,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02053',$user,$server_ip,$session_name,$one_mysql_log);} $row=mysql_fetch_row($rslt); - if ( ($row[0]==0) && (!ereg("SECOND",$filename)) ) + if ( ($row[0]==0) and (!ereg("SECOND",$filename)) ) { $stmt="SELECT count(*) FROM live_sip_channels where server_ip = '$call_server_ip' and channel='$channel';"; if ($format=='debug') {echo "\n";} @@ -1636,7 +1643,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02055',$user,$server_ip,$session_name,$one_mysql_log);} $row=mysql_fetch_row($rslt); - if ( ($row[0]==0) && (!ereg("SECOND",$filename)) ) + if ( ($row[0]==0) and (!ereg("SECOND",$filename)) ) { $stmt="SELECT count(*) FROM live_sip_channels where server_ip = '$server_ip' and channel='$extrachannel';"; if ($format=='debug') {echo "\n";} @@ -1650,7 +1657,7 @@ if ($ACTION=="RedirectXtraNeW") if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $server_ip";} } } - if ( ($channel_liveX==1) && ($channel_liveY==1) ) + if ( ($channel_liveX==1) and ($channel_liveY==1) ) { if ( ($server_ip=="$call_server_ip") or (strlen($call_server_ip)<7) ) { diff --git a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php index ba24a6fb..bf5d5ddd 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php @@ -283,12 +283,15 @@ # 110317-0222 - Logging bug fixes # 110413-1245 - Added ALT dialing from scheduled callback list # 110430-1925 - Added post_phone_time_diff_alert campaign feature +# 110625-0814 - Added screen_labels and label hide functions +# 110626-0127 - Added queuemetrics_pe_phone_append +# 110718-1158 - Added logging of skipped leads # -$version = '2.4-188'; -$build = '110430-1925'; +$version = '2.4-191'; +$build = '110718-1158'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=415; +$mysql_log_count=419; $one_mysql_log=0; require("dbconnect.php"); @@ -485,6 +488,8 @@ if (isset($_GET["search"])) {$search=$_GET["search"];} elseif (isset($_POST["search"])) {$search=$_POST["search"];} if (isset($_GET["sub_status"])) {$sub_status=$_GET["sub_status"];} elseif (isset($_POST["sub_status"])) {$sub_status=$_POST["sub_status"];} +if (isset($_GET["qm_extension"])) {$qm_extension=$_GET["qm_extension"];} + elseif (isset($_POST["qm_extension"])) {$qm_extension=$_POST["qm_extension"];} header ("Content-type: text/html; charset=utf-8"); @@ -625,6 +630,8 @@ else $pass = ereg_replace("'|\"|\\\\|;","",$pass); } +$session_name = ereg_replace("'|\"|\\\\|;","",$session_name); +$server_ip = ereg_replace("'|\"|\\\\|;","",$server_ip); # default optional vars if not set if (!isset($format)) {$format="text";} @@ -939,7 +946,7 @@ if ($ACTION == 'regCLOSER') ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_addmember_enabled,queuemetrics_dispo_pause FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_addmember_enabled,queuemetrics_dispo_pause,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00349',$user,$server_ip,$session_name,$one_mysql_log);} if ($format=='debug') {echo "\n";} @@ -956,6 +963,7 @@ if ($ACTION == 'regCLOSER') $queuemetrics_log_id = $row[5]; $queuemetrics_addmember_enabled = $row[6]; $queuemetrics_dispo_pause = $row[7]; + $queuemetrics_pe_phone_append = $row[8]; $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### @@ -1006,7 +1014,10 @@ if ($ACTION == 'regCLOSER') if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='$in_groups[$k]',agent='Agent/$user',verb='ADDMEMBER2',data1='$qm_phone',serverid='$queuemetrics_log_id' $data4SQL;"; @@ -1983,7 +1994,7 @@ if ($ACTION == 'manDiaLnextCaLL') if (eregi("UP TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now desc, $last_order";} if (eregi("DOWN TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now, $last_order";} - $stmt="UPDATE vicidial_list SET status='QUEUE',user='$user' where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $DLTsql $fSQL $adooSQL $order_stmt LIMIT 1;"; + $stmt="UPDATE vicidial_list SET user='QUEUE$user' where called_since_last_reset='N' and user NOT LIKE \"QUEUE%\" and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $DLTsql $fSQL $adooSQL $order_stmt LIMIT 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00242',$user,$server_ip,$session_name,$one_mysql_log);} @@ -1995,7 +2006,7 @@ if ($ACTION == 'manDiaLnextCaLL') if ($affected_rows > 0) { - $stmt="SELECT lead_id,list_id,gmt_offset_now,state,entry_list_id FROM vicidial_list where status='QUEUE' and user='$user' order by modify_date desc LIMIT 1;"; + $stmt="SELECT lead_id,list_id,gmt_offset_now,state,entry_list_id FROM vicidial_list where user='QUEUE$user' order by modify_date desc LIMIT 1;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00243',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -2178,7 +2189,7 @@ if ($ACTION == 'manDiaLnextCaLL') # generate callerID for unique identifier in xfer_log file $PADlead_id = sprintf("%010s", $lead_id); while (strlen($PADlead_id) > 10) {$PADlead_id = substr("$PADlead_id", 1);} - # Create unique calleridname to track the call: MmmddhhmmssLLLLLLLLL + # Create unique calleridname to track the call: MmddhhmmssLLLLLLLLLL $MqueryCID = "M$CIDdate$PADlead_id"; # DATETIME|campaign|lead_id|phone_number|user|type @@ -2350,7 +2361,7 @@ if ($ACTION == 'manDiaLnextCaLL') $use_eac = $row[0]; } - # Create unique calleridname to track the call: MmmddhhmmssLLLLLLLLL + # Create unique calleridname to track the call: MmddhhmmssLLLLLLLLLL $MqueryCID = "M$CIDdate$PADlead_id"; $EAC=''; if ($use_eac > 0) @@ -2453,7 +2464,7 @@ if ($ACTION == 'manDiaLnextCaLL') ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00037',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -2467,6 +2478,7 @@ if ($ACTION == 'manDiaLnextCaLL') $queuemetrics_login = $row[3]; $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; + $queuemetrics_pe_phone_append = $row[6]; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -2481,7 +2493,10 @@ if ($ACTION == 'manDiaLnextCaLL') if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); @@ -2768,12 +2783,17 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INCALL + ### set the lead back to previous status and called_count $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00042',$user,$server_ip,$session_name,$one_mysql_log);} + ### log the skip event + $stmt = "INSERT INTO vicidial_agent_skip_log set campaign_id='$campaign', previous_status='$stage', previous_called_count='$called_count',user='$user', lead_id='$lead_id', event_date=NOW();"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00419',$user,$server_ip,$session_name,$one_mysql_log);} echo "LEAD REVERTED\n"; } @@ -2896,7 +2916,7 @@ if ($ACTION == 'manDiaLonly') $PADlead_id = sprintf("%010s", $lead_id); while (strlen($PADlead_id) > 10) {$PADlead_id = substr("$PADlead_id", 1);} - # Create unique calleridname to track the call: MmmddhhmmssLLLLLLLLL + # Create unique calleridname to track the call: MmddhhmmssLLLLLLLLLL $MqueryCID = "M$CIDdate$PADlead_id"; $EAC=''; if ($use_eac > 0) @@ -3052,7 +3072,7 @@ if ($ACTION == 'manDiaLonly') ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00048',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -3066,6 +3086,7 @@ if ($ACTION == 'manDiaLonly') $queuemetrics_login = $row[3]; $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; + $queuemetrics_pe_phone_append = $row[6]; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -3080,7 +3101,10 @@ if ($ACTION == 'manDiaLonly') if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); @@ -3480,7 +3504,7 @@ if ($stage == "end") ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_dispo_pause FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_dispo_pause,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00063',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -3496,6 +3520,7 @@ if ($stage == "end") $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $queuemetrics_dispo_pause = $row[6]; + $queuemetrics_pe_phone_append = $row[7]; if ($enable_queuemetrics_logging > 0) { @@ -3868,7 +3893,10 @@ if ($stage == "end") if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00081',$user,$server_ip,$session_name,$one_mysql_log);} } - $stmt = "UPDATE vicidial_live_agents set status='PAUSED',uniqueid=0,callerid='',channel='',call_server_ip='',last_call_finish='$NOW_TIME',comments='',last_state_change='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; + $licf_SQL = ''; + if ($VLA_inOUT == 'INBOUND') + {$licf_SQL = ",last_inbound_call_finish='$NOW_TIME'";} + $stmt = "UPDATE vicidial_live_agents set status='PAUSED',uniqueid=0,callerid='',channel='',call_server_ip='',last_call_finish='$NOW_TIME',comments='',last_state_change='$NOW_TIME' $licf_SQL where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {$errno = mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00082',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3896,7 +3924,10 @@ if ($stage == "end") if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='PAUSEALL',serverid='$queuemetrics_log_id' $data4SQL;"; @@ -3946,7 +3977,10 @@ if ($stage == "end") if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MDnextCID',queue='$VDcampaign_id',agent='Agent/$user',verb='COMPLETEAGENT',data1='$CLstage',data2='$length_in_sec',data3='$CLqueue_position',serverid='$queuemetrics_log_id' $data4SQL;"; @@ -4170,7 +4204,10 @@ if ($stage == "end") if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MDnextCID',queue='$VDcampaign_id',agent='Agent/$user',verb='COMPLETEAGENT',data1='$CLstage',data2='$length_in_sec',data3='$VDqueue_position',serverid='$queuemetrics_log_id' $data4SQL;"; @@ -5024,7 +5061,7 @@ if ($ACTION == 'VDADcheckINCOMING') } ### update the comments in vicidial_live_agents record - $stmt = "UPDATE vicidial_live_agents set comments='INBOUND' where user='$user' and server_ip='$server_ip';"; + $stmt = "UPDATE vicidial_live_agents set comments='INBOUND',last_inbound_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00120',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5715,7 +5752,7 @@ if ($ACTION == 'userLOGout') { ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,allow_sipsak_messages,queuemetrics_loginout,queuemetrics_addmember_enabled,queuemetrics_dispo_pause FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,allow_sipsak_messages,queuemetrics_loginout,queuemetrics_addmember_enabled,queuemetrics_dispo_pause,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -5733,6 +5770,7 @@ if ($ACTION == 'userLOGout') $queuemetrics_loginout = $row[7]; $queuemetrics_addmember_enabled = $row[8]; $queuemetrics_dispo_pause = $row[9]; + $queuemetrics_pe_phone_append = $row[10]; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5781,7 +5819,10 @@ if ($ACTION == 'userLOGout') if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $time_logged_in = ($StarTtime - $logintime); @@ -6770,7 +6811,7 @@ if ($ACTION == 'updateDISPO') ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_callstatus,queuemetrics_dispo_pause FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_callstatus,queuemetrics_dispo_pause,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00159',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -6786,6 +6827,7 @@ if ($ACTION == 'updateDISPO') $queuemetrics_log_id = $row[5]; $queuemetrics_callstatus = $row[6]; $queuemetrics_dispo_pause = $row[7]; + $queuemetrics_pe_phone_append = $row[8]; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -7455,7 +7497,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) { ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00167',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -7470,6 +7512,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) $queuemetrics_login = $row[3]; $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; + $queuemetrics_pe_phone_append = $row[6]; $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### @@ -7502,7 +7545,10 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ($cqpe_ct > 0) { $row=mysql_fetch_row($rslt); - $data4SQL = ",data4='$row[0]'"; + $pe_append=''; + if ( ($queuemetrics_pe_phone_append > 0) and (strlen($row[0])>0) ) + {$pe_append = "-$qm_extension";} + $data4SQL = ",data4='$row[0]$pe_append'"; } $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='$QMstatus',serverid='$queuemetrics_log_id' $data4SQL;"; @@ -7729,7 +7775,7 @@ if ($ACTION == 'PauseCodeSubmit') { ############################################# ##### START QUEUEMETRICS LOGGING LOOKUP ##### - $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,allow_sipsak_messages FROM system_settings;"; + $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,allow_sipsak_messages,queuemetrics_pe_phone_append FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00176',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -7745,6 +7791,7 @@ if ($ACTION == 'PauseCodeSubmit') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; + $queuemetrics_pe_phone_append = $row[7]; $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### @@ -8709,6 +8756,17 @@ if ($ACTION == 'LEADINFOview') } ### END Display callback information ### + ### find the screen_label for this campaign + $stmt="select screen_labels from vicidial_campaigns where campaign_id='$campaign';"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00416',$user,$server_ip,$session_name,$one_mysql_log);} + $csl_to_print = mysql_num_rows($rslt); + if ($format=='debug') {echo "|$csl_to_print|$stmt|";} + if ($csl_to_print > 0) + { + $row=mysql_fetch_row($rslt); + $screen_labels = $row[0]; + } ### BEGIN Display lead info and custom fields ### ### BEGIN find any custom field labels ### @@ -8733,8 +8791,9 @@ if ($ACTION == 'LEADINFOview') $label_email = 'Email'; $label_comments = 'Comentarios'; - $stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments from system_settings;"; + $stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments,label_hide_field_logs from system_settings;"; $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00417',$user,$server_ip,$session_name,$one_mysql_log);} $row=mysql_fetch_row($rslt); if (strlen($row[0])>0) {$label_title = $row[0];} if (strlen($row[1])>0) {$label_first_name = $row[1];} @@ -8755,8 +8814,44 @@ if ($ACTION == 'LEADINFOview') if (strlen($row[16])>0) {$label_security_phrase = $row[16];} if (strlen($row[17])>0) {$label_email = $row[17];} if (strlen($row[18])>0) {$label_comments = $row[18];} - ### END find any custom field labels ### + $label_hide_field_logs = $row[19]; + if ( ($screen_labels != '--SYSTEM-SETTINGS--') and (strlen($screen_labels)>1) ) + { + $stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments,label_hide_field_logs from vicidial_screen_labels where label_id='$screen_labels' and active='Y' limit 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00418',$user,$server_ip,$session_name,$one_mysql_log);} + $screenlabels_count = mysql_num_rows($rslt); + if ($screenlabels_count > 0) + { + $row=mysql_fetch_row($rslt); + if (strlen($row[0])>0) {$label_title = $row[0];} + if (strlen($row[1])>0) {$label_first_name = $row[1];} + if (strlen($row[2])>0) {$label_middle_initial = $row[2];} + if (strlen($row[3])>0) {$label_last_name = $row[3];} + if (strlen($row[4])>0) {$label_address1 = $row[4];} + if (strlen($row[5])>0) {$label_address2 = $row[5];} + if (strlen($row[6])>0) {$label_address3 = $row[6];} + if (strlen($row[7])>0) {$label_city = $row[7];} + if (strlen($row[8])>0) {$label_state = $row[8];} + if (strlen($row[9])>0) {$label_province = $row[9];} + if (strlen($row[10])>0) {$label_postal_code = $row[10];} + if (strlen($row[11])>0) {$label_vendor_lead_code = $row[11];} + if (strlen($row[12])>0) {$label_gender = $row[12];} + if (strlen($row[13])>0) {$label_phone_number = $row[13];} + if (strlen($row[14])>0) {$label_phone_code = $row[14];} + if (strlen($row[15])>0) {$label_alt_phone = $row[15];} + if (strlen($row[16])>0) {$label_security_phrase = $row[16];} + if (strlen($row[17])>0) {$label_email = $row[17];} + if (strlen($row[18])>0) {$label_comments = $row[18];} + $label_hide_field_logs = $row[19]; + ### END find any custom field labels ### + $hide_gender=0; + if ($label_gender == '---HIDE---') + {$hide_gender=1;} + } + } + ### END find any custom field labels ### $INFOout .= ""; @@ -8835,35 +8930,62 @@ if ($ACTION == 'LEADINFOview') ##### END check for postal_code and phone time zones if alert enabled $INFOout .= ""; - $INFOout .= ""; + if ( ($label_vendor_lead_code!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} $INFOout .= ""; $INFOout .= ""; $INFOout .= ""; - $INFOout .= ""; - $INFOout .= "";} + if ( ($label_phone_number!='---HIDE---') or ($label_hide_field_logs=='N') ) + { + $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; + if ( ($label_title!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_first_name!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_middle_initial!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_last_name!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_address1!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_address2!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_address3!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_city!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_state!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_province!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_postal_code!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} $INFOout .= ""; - $INFOout .= ""; - $INFOout .= "";} + if ( ($label_alt_phone!='---HIDE---') or ($label_hide_field_logs=='N') ) + { + $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; - $INFOout .= ""; + if ( ($label_email!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_security_phrase!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} + if ( ($label_comments!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "";} $INFOout .= ""; $INFOout .= ""; # $INFOout .= ""; diff --git a/agc_2-X/trunk/LANG_www/agc_es/vdc_form_display.php b/agc_2-X/trunk/LANG_www/agc_es/vdc_form_display.php index 95b72b2c..1fa3a965 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vdc_form_display.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vdc_form_display.php @@ -18,7 +18,7 @@ $version = '2.4-4'; $build = '100916-1749'; require("dbconnect.php"); -require("functions.php"); +require_once("functions.php"); if (isset($_GET["lead_id"])) {$lead_id=$_GET["lead_id"];} @@ -306,7 +306,7 @@ if ($stage=='SUBMIT') $A_field_value[$o] = $form_field_value; - if ( ($A_field_type[$o]=='DISPLAY') or ($A_field_type[$o]=='SCRIPT') ) + if ( ($A_field_type[$o]=='DISPLAY') or ($A_field_type[$o]=='SCRIPT') or ($A_field_type[$o]=='HIDDEN') or ($A_field_type[$o]=='READONLY') ) { $A_field_value[$o]='----IGNORE----'; } @@ -440,7 +440,7 @@ else echo "\n"; - require("functions.php"); + require_once("functions.php"); $CFoutput = custom_list_fields_values($lead_id,$list_id,$uniqueid,$user); diff --git a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php index 7e3c2ff0..b3ff0d63 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php @@ -354,12 +354,17 @@ # 110528-1033 - Added waiting_on_dispo manual dial check # 110531-2158 - Added callback_days_limit campaign feature # 110619-2005 - Added disable_dispo_ options +# 110624-2311 - Added screen labels option and status display fields option +# 110626-2234 - Added queuemetrics_pe_phone_append +# 110707-1412 - Added last_inbound_call_time and finish compatibility +# 110713-0048 - Allow for full hiding of the phone number field label +# 110718-1159 - Added logging of skipped leads # -$version = '2.4-331c'; -$build = '110619-2005'; +$version = '2.4-336c'; +$build = '110718-1159'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=72; +$mysql_log_count=73; $one_mysql_log=0; require("dbconnect.php"); @@ -1348,7 +1353,7 @@ echo "
Estado:   $row[0]
$label_vendor_lead_code:   $row[1]
$label_vendor_lead_code:   $row[1]
List ID:   $row[2]
Timezone:   $row[3]
Llamado Since Último Reset:   $row[4]
$label_phone_code:   $row[5]
$label_phone_number:   $row[6] -         "; - if ($hide_dial_links < 1) - {$INFOout .= "DIAL";} + if ( ($label_phone_code!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "
$label_phone_code:   $row[5]
$label_phone_number:   $row[6] -         "; + if ($hide_dial_links < 1) + {$INFOout .= "DIAL";} + } + if ( ($label_phone_number=='---HIDE---') and ($hide_dial_links < 1) ) + { + $INFOout .= "
Dial Link:   DIAL"; + } $INFOout .= "
$label_title:   $row[7]
$label_first_name:   $row[8]
$label_middle_initial:   $row[9]
$label_last_name:   $row[10]
$label_address1:   $row[11]
$label_address2:   $row[12]
$label_address3:   $row[13]
$label_city:   $row[14]
$label_state:   $row[15]
$label_province:   $row[16]
$label_postal_code:   $row[17]
$label_title:   $row[7]
$label_first_name:   $row[8]
$label_middle_initial:   $row[9]
$label_last_name:   $row[10]
$label_address1:   $row[11]
$label_address2:   $row[12]
$label_address3:   $row[13]
$label_city:   $row[14]
$label_state:   $row[15]
$label_province:   $row[16]
$label_postal_code:   $row[17]
Country:   $row[18]
$label_gender:   $row[19]
$label_alt_phone:   $row[20] -         "; - if ($hide_dial_links < 1) - {$INFOout .= "DIAL";} + if ( ($label_gender!='---HIDE---') or ($label_hide_field_logs=='N') ) + {$INFOout .= "
$label_gender:   $row[19]
$label_alt_phone:   $row[20] -         "; + if ($hide_dial_links < 1) + {$INFOout .= "DIAL";} + } $INFOout .= "
$label_email:   $row[21]
$label_security_phrase:   $row[22]
$label_comments:   $row[23]
$label_email:   $row[21]
$label_security_phrase:   $row[22]
$label_comments:   $row[23]
Llamado Count:   $row[24]
Último Local Call Time:   $row[25]
Rank:   $row[26]
0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01013',$VD_login,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -1450,6 +1455,56 @@ echo " 0) and (strlen($qm_phone_environment)>0) ) + {$qm_phone_environment .= "-$qm_extension";} + + $status_display_CALLID=0; + $status_display_LEADID=0; + $status_display_LISTID=0; + if (preg_match("/CALLID/",$status_display_fields)) + {$status_display_CALLID=1;} + if (preg_match("/LEADID/",$status_display_fields)) + {$status_display_LEADID=1;} + if (preg_match("/LISTID/",$status_display_fields)) + {$status_display_LISTID=1;} + + if ( ($screen_labels != '--SYSTEM-SETTINGS--') and (strlen($screen_labels)>1) ) + { + $stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments from vicidial_screen_labels where label_id='$screen_labels' and active='Y' limit 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01073',$VD_login,$server_ip,$session_name,$one_mysql_log);} + $screenlabels_count = mysql_num_rows($rslt); + if ($screenlabels_count > 0) + { + $row=mysql_fetch_row($rslt); + if (strlen($row[0])>0) {$label_title = $row[0];} + if (strlen($row[1])>0) {$label_first_name = $row[1];} + if (strlen($row[2])>0) {$label_middle_initial = $row[2];} + if (strlen($row[3])>0) {$label_last_name = $row[3];} + if (strlen($row[4])>0) {$label_address1 = $row[4];} + if (strlen($row[5])>0) {$label_address2 = $row[5];} + if (strlen($row[6])>0) {$label_address3 = $row[6];} + if (strlen($row[7])>0) {$label_city = $row[7];} + if (strlen($row[8])>0) {$label_state = $row[8];} + if (strlen($row[9])>0) {$label_province = $row[9];} + if (strlen($row[10])>0) {$label_postal_code = $row[10];} + if (strlen($row[11])>0) {$label_vendor_lead_code = $row[11];} + if (strlen($row[12])>0) {$label_gender = $row[12];} + if (strlen($row[13])>0) {$label_phone_number = $row[13];} + if (strlen($row[14])>0) {$label_phone_code = $row[14];} + if (strlen($row[15])>0) {$label_alt_phone = $row[15];} + if (strlen($row[16])>0) {$label_security_phrase = $row[16];} + if (strlen($row[17])>0) {$label_email = $row[17];} + if (strlen($row[18])>0) {$label_comments = $row[18];} + ### END find any custom field labels ### + $hide_gender=0; + if ($label_gender == '---HIDE---') + {$hide_gender=1;} + } + } if ( ($disable_dispo_screen == 'DISPO_ENABLED') or (strlen($disable_dispo_status) < 1) ) { @@ -2093,9 +2148,11 @@ echo " 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -2279,6 +2336,7 @@ echo "\n"; $closer_chooser_string=''; - $stmt="INSERT INTO vicidial_live_agents (user,server_ip,conf_exten,extension,status,lead_id,campaign_id,uniqueid,callerid,channel,random_id,last_call_time,last_update_time,last_call_finish,closer_campaigns,user_level,campaign_weight,calls_today,last_state_change,outbound_autodial,manager_ingroup_set,on_hook_ring_time,on_hook_agent) values('$VD_login','$server_ip','$session_id','$SIP_user','PAUSED','','$VD_campaign','','','','$random','$NOW_TIME','$tsNOW_TIME','$NOW_TIME','$closer_chooser_string','$user_level','$campaign_weight','$calls_today','$NOW_TIME','Y','N','$phone_ring_timeout','$on_hook_agent');"; + $stmt="INSERT INTO vicidial_live_agents (user,server_ip,conf_exten,extension,status,lead_id,campaign_id,uniqueid,callerid,channel,random_id,last_call_time,last_update_time,last_call_finish,closer_campaigns,user_level,campaign_weight,calls_today,last_state_change,outbound_autodial,manager_ingroup_set,on_hook_ring_time,on_hook_agent,last_inbound_call_time,last_inbound_call_finish) values('$VD_login','$server_ip','$session_id','$SIP_user','PAUSED','','$VD_campaign','','','','$random','$NOW_TIME','$tsNOW_TIME','$NOW_TIME','$closer_chooser_string','$user_level','$campaign_weight','$calls_today','$NOW_TIME','Y','N','$phone_ring_timeout','$on_hook_agent','$NOW_TIME','$NOW_TIME');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01044',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2433,6 +2491,9 @@ echo " 0) and (strlen($qm_phone_environment)>0) ) + {$qm_phone_environment .= "-$qm_extension";} + if ($queuemetrics_loginout!='NONE') { $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtimE',call_id='NONE',queue='NONE',agent='Agent/$VD_login',verb='$QM_LOGIN',data1='$QM_PHONE',serverid='$queuemetrics_log_id',data4='$qm_phone_environment';"; @@ -3371,6 +3432,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var waiting_on_dispo=0; var disable_dispo_screen=''; var disable_dispo_status=''; + var status_display_CALLID=''; + var status_display_LEADID=''; + var status_display_LISTID=''; + var qm_extension=''; var DiaLControl_auto_HTML = "\"\"Comienzo\""; var DiaLControl_auto_HTML_ready = "\"\"Comienzo\""; var DiaLControl_auto_HTML_OFF = "\"\"Comienzo\""; @@ -3463,7 +3528,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { var queryCID = "HLagcW" + epoch_sec + user_abb; var hangupvalue = taskvar; - livehangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=Hangup&format=text&channel=" + hangupvalue + "&queryCID=" + queryCID + "&log_campaign=" + campaign; + livehangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=Hangup&format=text&channel=" + hangupvalue + "&queryCID=" + queryCID + "&log_campaign=" + campaign + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(livehangup_query); @@ -5108,11 +5173,15 @@ function set_length(SLnumber,SLlength_goal,SLdirection) { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + var status_display_content=''; + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Marcar Número de teléfono Alt: TELÉFONO PRINCIPAL or TELÉFONO ALT or DIRECCIÓN3 or ACABAR LEAD"; + var man_status = "Marcar Número de teléfono Alt: TELÉFONO PRINCIPAL or TELÉFONO ALT or DIRECCIÓN3 or ACABAR LEAD" + status_display_content; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -5144,7 +5213,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) "&list_id=" + document.vicidial_form.list_id.value + "&length_in_sec=0&phone_code=" + document.vicidial_form.phone_code.value + "&phone_number=" + lead_dial_number + - "&exten=" + extension + "&channel=" + lastcustchannel + "&start_epoch=" + MDlogEPOCH + "&auto_dial_level=" + auto_dial_level + "&VDstop_rec_after_each_call=" + VDstop_rec_after_each_call + "&conf_silent_prefix=" + conf_silent_prefix + "&protocol=" + protocol + "&extension=" + extension + "&ext_context=" + ext_context + "&conf_exten=" + session_id + "&user_abb=" + user_abb + "&agent_log_id=" + agent_log_id + "&MDnextCID=" + LasTCID + "&inOUT=" + inOUT + "&alt_dial=" + dialed_label + "&DB=0" + "&agentchannel=" + agentchannel + "&conf_dialed=" + conf_dialed + "&leaving_threeway=" + leaving_threeway + "&hangup_all_non_reserved=" + hangup_all_non_reserved + "&blind_transfer=" + blind_transfer + "&dial_method" + dial_method + "&nodeletevdac=" + nodeletevdac + "&alt_num_status=" + alt_num_status; + "&exten=" + extension + "&channel=" + lastcustchannel + "&start_epoch=" + MDlogEPOCH + "&auto_dial_level=" + auto_dial_level + "&VDstop_rec_after_each_call=" + VDstop_rec_after_each_call + "&conf_silent_prefix=" + conf_silent_prefix + "&protocol=" + protocol + "&extension=" + extension + "&ext_context=" + ext_context + "&conf_exten=" + session_id + "&user_abb=" + user_abb + "&agent_log_id=" + agent_log_id + "&MDnextCID=" + LasTCID + "&inOUT=" + inOUT + "&alt_dial=" + dialed_label + "&DB=0" + "&agentchannel=" + agentchannel + "&conf_dialed=" + conf_dialed + "&leaving_threeway=" + leaving_threeway + "&hangup_all_non_reserved=" + hangup_all_non_reserved + "&blind_transfer=" + blind_transfer + "&dial_method" + dial_method + "&nodeletevdac=" + nodeletevdac + "&alt_num_status=" + alt_num_status + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); // document.getElementById("busycallsdebug").innerHTML = "vdc_db_query.php?" + manDiaLlog_query; @@ -5749,8 +5818,13 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (alt_dial_status_display=='0') { + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + CIDcheck;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " UID: " + CIDcheck + "   Espeerar al Ring... " + MD_ring_secondS + " segundos"; + document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " " + status_display_content + "   Espeerar al Ring... " + MD_ring_secondS + " segundos"; // alert("channel not found yet:\n" + campaign); } } @@ -5787,7 +5861,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var called3rdparty = document.vicidial_form.xfernumber.value; if (hide_xfer_number_to_dial=='ENABLED') {called3rdparty=' ';} - document.getElementById("MainStatuSSpan").innerHTML = " Terceros llamados: " + called3rdparty + " UID: " + CIDcheck; + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + CIDcheck;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + + document.getElementById("MainStatuSSpan").innerHTML = " Terceros llamados: " + called3rdparty + " " + status_display_content; document.getElementById("Leave3WayCall").innerHTML ="\"ABANDONAR"; @@ -5837,8 +5916,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) MD_channel_look=0; var dispnum = lead_dial_number; var status_display_number = phone_number_format(dispnum); + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + CIDcheck;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} - document.getElementById("MainStatuSSpan").innerHTML = " Llamado: " + status_display_number + " UID: " + CIDcheck + "  "; + document.getElementById("MainStatuSSpan").innerHTML = " Llamado: " + status_display_number + " " + status_display_content + "  "; document.getElementById("ParkControl").innerHTML ="\"Aparcar"; if ( (ivr_park_call=='ENABLED') || (ivr_park_call=='ENABLED_PARKING_ONLY') ) @@ -6240,7 +6323,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) else {var call_prefix = manual_dial_prefix;} - manDiaLnext_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLnextCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&preview=" + man_preview + "&agent_log_id=" + agent_log_id + "&callback_id=" + mdnCBid + "&lead_id=" + mdnBDleadid + "&phone_code=" + mdnDiaLCodE + "&phone_number=" + mdnPhonENumbeR + "&list_id=" + mdnLisT_id + "&stage=" + mdnStagE + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&omit_phone_code=" + omit_phone_code + "&manual_dial_filter=" + manual_dial_filter + "&vendor_lead_code=" + mdVendorid + "&usegroupalias=" + mdgroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&vtiger_callback_id=" + vtiger_callback_id + "&dial_method=" + dial_method + "&manual_dial_call_time_check=" + manual_dial_call_time_check; + manDiaLnext_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLnextCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&preview=" + man_preview + "&agent_log_id=" + agent_log_id + "&callback_id=" + mdnCBid + "&lead_id=" + mdnBDleadid + "&phone_code=" + mdnDiaLCodE + "&phone_number=" + mdnPhonENumbeR + "&list_id=" + mdnLisT_id + "&stage=" + mdnStagE + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&omit_phone_code=" + omit_phone_code + "&manual_dial_filter=" + manual_dial_filter + "&vendor_lead_code=" + mdVendorid + "&usegroupalias=" + mdgroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&vtiger_callback_id=" + vtiger_callback_id + "&dial_method=" + dial_method + "&manual_dial_call_time_check=" + manual_dial_call_time_check + "&qm_extension=" + qm_extension; // alert(manual_dial_filter + "\n" +manDiaLnext_query); xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); @@ -6376,8 +6459,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) lead_dial_number = dialed_number; var dispnum = dialed_number; var status_display_number = phone_number_format(dispnum); + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + MDnextCID;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} - document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " UID: " + MDnextCID + "   " + man_status; + document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " " + status_display_content + "   " + man_status; if ( (dialed_label.length < 2) || (dialed_label=='NONE') ) {dialed_label='MAIN';} if (hide_gender > 0) @@ -6568,7 +6655,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - manDiaLskip_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLskip&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&stage=" + previous_dispo + "&called_count=" + previous_called_count; + manDiaLskip_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLskip&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&stage=" + previous_dispo + "&called_count=" + previous_called_count + "&campaign=" + campaign; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLskip_query); @@ -6755,7 +6842,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) else {var call_prefix = manual_dial_prefix;} - manDiaLonly_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLonly&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&phone_number=" + manDiaLonly_num + "&phone_code=" + document.vicidial_form.phone_code.value + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&omit_phone_code=" + omit_phone_code + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&dial_method=" + dial_method + "&agent_log_id=" + agent_log_id + "&security=" + document.vicidial_form.security_phrase.value; + manDiaLonly_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLonly&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&phone_number=" + manDiaLonly_num + "&phone_code=" + document.vicidial_form.phone_code.value + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&omit_phone_code=" + omit_phone_code + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&dial_method=" + dial_method + "&agent_log_id=" + agent_log_id + "&security=" + document.vicidial_form.security_phrase.value + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLonly_query); @@ -6787,7 +6874,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (alt_dial_status_display=='0') { - document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " UID: " + MDnextCID + "   Espeerar al Ring..."; + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + MDnextCID;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + + document.getElementById("MainStatuSSpan").innerHTML = " Llamando: " + status_display_number + " " + status_display_content + "   Espeerar al Ring..."; document.getElementById("HangupControl").innerHTML = "\"Colgar"; } @@ -6924,7 +7016,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - autoDiaLready_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=" + taskaction + "&user=" + user + "&pass=" + pass + "&stage=" + VDRP_stage + "&agent_log_id=" + agent_log_id + "&agent_log=" + taskagentlog + "&wrapup=" + taskwrapup + "&campaign=" + campaign + "&dial_method" + dial_method + "&comments=" + taskstatuschange + add_pause_code; + autoDiaLready_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=" + taskaction + "&user=" + user + "&pass=" + pass + "&stage=" + VDRP_stage + "&agent_log_id=" + agent_log_id + "&agent_log=" + taskagentlog + "&wrapup=" + taskwrapup + "&campaign=" + campaign + "&dial_method" + dial_method + "&comments=" + taskstatuschange + add_pause_code + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(autoDiaLready_query); @@ -7342,7 +7434,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var callnum = dialed_number; var dial_display_number = phone_number_format(callnum); - document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + dial_display_number + " " + custom_call_id + " UID: " + CIDcheck + "   " + VDIC_fronter; + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + LasTCID;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + + document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + dial_display_number + " " + custom_call_id + " " + status_display_content + "   " + VDIC_fronter; if (CBentry_time.length > 2) { @@ -7388,7 +7485,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var callnum = dialed_number; var dial_display_number = phone_number_format(callnum); - document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + dial_display_number + " " + custom_call_id + " Group- " + VDIC_data_VDIG[1] + "   " + VDIC_fronter; + var status_display_content=''; + if (status_display_CALLID > 0) {status_display_content = status_display_content + " UID: " + CIDcheck;} + if (status_display_LEADID > 0) {status_display_content = status_display_content + " Lead: " + document.vicidial_form.lead_id.value;} + if (status_display_LISTID > 0) {status_display_content = status_display_content + " List: " + document.vicidial_form.list_id.value;} + + document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + dial_display_number + " " + custom_call_id + " Group- " + VDIC_data_VDIG[1] + "   " + VDIC_fronter + " " + status_display_content; } document.getElementById("ParkControl").innerHTML ="\"Aparcar"; @@ -7823,7 +7925,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var queryCID = "HLvdcW" + epoch_sec + user_abb; var hangupvalue = customer_channel; // alert(auto_dial_level + "|" + CalLCID + "|" + customer_server_ip + "|" + hangupvalue + "|" + VD_live_call_secondS); - custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=Hangup&format=text&user=" + user + "&pass=" + pass + "&channel=" + hangupvalue + "&call_server_ip=" + customer_server_ip + "&queryCID=" + queryCID + "&auto_dial_level=" + auto_dial_level + "&CalLCID=" + CalLCID + "&secondS=" + VD_live_call_secondS + "&exten=" + session_id + "&campaign=" + group + "&stage=CALLHANGUP&nodeletevdac=" + nodeletevdac + "&log_campaign=" + campaign; + custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=Hangup&format=text&user=" + user + "&pass=" + pass + "&channel=" + hangupvalue + "&call_server_ip=" + customer_server_ip + "&queryCID=" + queryCID + "&auto_dial_level=" + auto_dial_level + "&CalLCID=" + CalLCID + "&secondS=" + VD_live_call_secondS + "&exten=" + session_id + "&campaign=" + group + "&stage=CALLHANGUP&nodeletevdac=" + nodeletevdac + "&log_campaign=" + campaign + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -8082,7 +8184,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) { var queryCID = "HXvdcW" + epoch_sec + user_abb; var hangupvalue = xfer_channel; - custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=Hangup&format=text&user=" + user + "&pass=" + pass + "&channel=" + hangupvalue + "&queryCID=" + queryCID + "&log_campaign=" + campaign; + custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=Hangup&format=text&user=" + user + "&pass=" + pass + "&channel=" + hangupvalue + "&queryCID=" + queryCID + "&log_campaign=" + campaign + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -8156,7 +8258,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (xmlhttp) { var queryCID = "HTvdcW" + epoch_sec + user_abb; - custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=HangupConfDial&format=text&user=" + user + "&pass=" + pass + "&exten=" + session_id + "&ext_context=" + ext_context + "&queryCID=" + queryCID + "&log_campaign=" + campaign; + custhangup_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=HangupConfDial&format=text&user=" + user + "&pass=" + pass + "&exten=" + session_id + "&ext_context=" + ext_context + "&queryCID=" + queryCID + "&log_campaign=" + campaign + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -9227,7 +9329,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - CSCupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=regCLOSER&format=text&user=" + user + "&pass=" + pass + "&comments=" + VU_agent_choose_ingroups_DV + "&closer_blended=" + VICIDiaL_closer_blended + "&campaign=" + campaign + "&qm_phone=" + qm_phone + "&dial_method" + dial_method + "&closer_choice=" + CloserSelectChoices + "-"; + CSCupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=regCLOSER&format=text&user=" + user + "&pass=" + pass + "&comments=" + VU_agent_choose_ingroups_DV + "&closer_blended=" + VICIDiaL_closer_blended + "&campaign=" + campaign + "&qm_phone=" + qm_phone + "&qm_extension=" + qm_extension + "&dial_method" + dial_method + "&closer_choice=" + CloserSelectChoices + "-"; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(CSCupdate_query); @@ -9517,7 +9619,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - VDlogout_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=userLOGout&format=text&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&conf_exten=" + session_id + "&extension=" + extension + "&protocol=" + protocol + "&agent_log_id=" + agent_log_id + "&no_delete_sessions=" + no_delete_sessions + "&phone_ip=" + phone_ip + "&enable_sipsak_messages=" + enable_sipsak_messages + "&LogouTKicKAlL=" + LogouTKicKAlL + "&ext_context=" + ext_context; + VDlogout_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=userLOGout&format=text&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&conf_exten=" + session_id + "&extension=" + extension + "&protocol=" + protocol + "&agent_log_id=" + agent_log_id + "&no_delete_sessions=" + no_delete_sessions + "&phone_ip=" + phone_ip + "&enable_sipsak_messages=" + enable_sipsak_messages + "&LogouTKicKAlL=" + LogouTKicKAlL + "&ext_context=" + ext_context + "&qm_extension=" + qm_extension; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(VDlogout_query); @@ -12493,16 +12595,24 @@ $zi=2; echo "
"; - echo "$label_phone_number: "; - - if ( (ereg('Y',$disable_alter_custphone)) or (ereg('HIDE',$disable_alter_custphone)) ) - { - echo "                     "; - echo ""; + if ($label_phone_number == '---HIDE---') + { + echo " "; + echo "   "; } else - { - echo ""; + { + echo "$label_phone_number: "; + + if ( (ereg('Y',$disable_alter_custphone)) or (ereg('HIDE',$disable_alter_custphone)) ) + { + echo "                     "; + echo ""; + } + else + { + echo ""; + } } echo ""; 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 d824fff7..a4561b9b 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -1994,7 +1994,7 @@ if ($ACTION == 'manDiaLnextCaLL') if (eregi("UP TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now desc, $last_order";} if (eregi("DOWN TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now, $last_order";} - $stmt="UPDATE vicidial_list SET status='QUEUE',user='$user' where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $DLTsql $fSQL $adooSQL $order_stmt LIMIT 1;"; + $stmt="UPDATE vicidial_list SET user='QUEUE$user' where called_since_last_reset='N' and user NOT LIKE \"QUEUE%\" and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $DLTsql $fSQL $adooSQL $order_stmt LIMIT 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00242',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2006,7 +2006,7 @@ if ($ACTION == 'manDiaLnextCaLL') if ($affected_rows > 0) { - $stmt="SELECT lead_id,list_id,gmt_offset_now,state,entry_list_id FROM vicidial_list where status='QUEUE' and user='$user' order by modify_date desc LIMIT 1;"; + $stmt="SELECT lead_id,list_id,gmt_offset_now,state,entry_list_id FROM vicidial_list where user='QUEUE$user' order by modify_date desc LIMIT 1;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00243',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";}