From 6839770854d098a6e1cd2039a040ea0d624dd512 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 9 Jan 2010 20:13:59 +0000 Subject: [PATCH] fixes for bugs 248, 274 all related to manual dialing and DEAD call logging and disconnect/busy logging for manual dial calls git-svn-id: svn://192.168.202.10@1301 3d104415-ff17-0410-8863-d5cf3c621b8a --- LANG_www/agc_br/active_list_refresh.php | 2 +- LANG_www/agc_br/astguiclient.php | 20 +- LANG_www/agc_br/call_log_display.php | 2 +- LANG_www/agc_br/conf_exten_check.php | 57 +++++- LANG_www/agc_br/inbound_popup.php | 10 +- LANG_www/agc_br/live_exten_check.php | 32 +-- LANG_www/agc_br/manager_send.php | 54 ++--- LANG_www/agc_br/park_calls_display.php | 2 +- LANG_www/agc_br/timeclock.php | 22 +-- LANG_www/agc_br/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_br/vicidial.php | 253 +++++++++++++----------- LANG_www/agc_br/voicemail_check.php | 2 +- LANG_www/agc_de/active_list_refresh.php | 2 +- LANG_www/agc_de/astguiclient.php | 16 +- LANG_www/agc_de/call_log_display.php | 2 +- LANG_www/agc_de/conf_exten_check.php | 53 ++++- LANG_www/agc_de/inbound_popup.php | 12 +- LANG_www/agc_de/live_exten_check.php | 32 +-- LANG_www/agc_de/manager_send.php | 52 ++--- LANG_www/agc_de/park_calls_display.php | 2 +- LANG_www/agc_de/timeclock.php | 2 +- LANG_www/agc_de/vdc_db_query.php | 180 +++++++++++------ LANG_www/agc_de/vicidial.php | 233 ++++++++++++---------- LANG_www/agc_de/voicemail_check.php | 2 +- LANG_www/agc_el/active_list_refresh.php | 2 +- LANG_www/agc_el/astguiclient.php | 18 +- LANG_www/agc_el/call_log_display.php | 2 +- LANG_www/agc_el/conf_exten_check.php | 57 +++++- LANG_www/agc_el/inbound_popup.php | 10 +- LANG_www/agc_el/live_exten_check.php | 32 +-- LANG_www/agc_el/manager_send.php | 54 ++--- LANG_www/agc_el/park_calls_display.php | 2 +- LANG_www/agc_el/timeclock.php | 24 +-- LANG_www/agc_el/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_el/vicidial.php | 247 +++++++++++++---------- LANG_www/agc_el/voicemail_check.php | 2 +- LANG_www/agc_es/active_list_refresh.php | 2 +- LANG_www/agc_es/astguiclient.php | 18 +- LANG_www/agc_es/call_log_display.php | 2 +- LANG_www/agc_es/conf_exten_check.php | 57 +++++- LANG_www/agc_es/inbound_popup.php | 12 +- LANG_www/agc_es/live_exten_check.php | 32 +-- LANG_www/agc_es/manager_send.php | 54 ++--- LANG_www/agc_es/park_calls_display.php | 2 +- LANG_www/agc_es/timeclock.php | 24 +-- LANG_www/agc_es/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_es/vicidial.php | 249 ++++++++++++----------- LANG_www/agc_es/voicemail_check.php | 2 +- LANG_www/agc_fr/active_list_refresh.php | 2 +- LANG_www/agc_fr/astguiclient.php | 18 +- LANG_www/agc_fr/call_log_display.php | 2 +- LANG_www/agc_fr/conf_exten_check.php | 57 +++++- LANG_www/agc_fr/inbound_popup.php | 12 +- LANG_www/agc_fr/live_exten_check.php | 32 +-- LANG_www/agc_fr/manager_send.php | 54 ++--- LANG_www/agc_fr/park_calls_display.php | 2 +- LANG_www/agc_fr/timeclock.php | 24 +-- LANG_www/agc_fr/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_fr/vicidial.php | 249 ++++++++++++----------- LANG_www/agc_fr/voicemail_check.php | 2 +- LANG_www/agc_it/active_list_refresh.php | 2 +- LANG_www/agc_it/astguiclient.php | 18 +- LANG_www/agc_it/call_log_display.php | 2 +- LANG_www/agc_it/conf_exten_check.php | 55 +++++- LANG_www/agc_it/inbound_popup.php | 10 +- LANG_www/agc_it/live_exten_check.php | 32 +-- LANG_www/agc_it/manager_send.php | 54 ++--- LANG_www/agc_it/park_calls_display.php | 2 +- LANG_www/agc_it/timeclock.php | 14 +- LANG_www/agc_it/vdc_db_query.php | 200 ++++++++++++------- LANG_www/agc_it/vicidial.php | 185 +++++++++-------- LANG_www/agc_it/voicemail_check.php | 2 +- LANG_www/agc_nl/active_list_refresh.php | 2 +- LANG_www/agc_nl/astguiclient.php | 16 +- LANG_www/agc_nl/call_log_display.php | 2 +- LANG_www/agc_nl/conf_exten_check.php | 55 +++++- LANG_www/agc_nl/inbound_popup.php | 10 +- LANG_www/agc_nl/live_exten_check.php | 32 +-- LANG_www/agc_nl/manager_send.php | 52 ++--- LANG_www/agc_nl/park_calls_display.php | 2 +- LANG_www/agc_nl/timeclock.php | 16 +- LANG_www/agc_nl/vdc_db_query.php | 186 +++++++++++------ LANG_www/agc_nl/vicidial.php | 185 +++++++++-------- LANG_www/agc_nl/voicemail_check.php | 2 +- LANG_www/agc_pl/active_list_refresh.php | 2 +- LANG_www/agc_pl/astguiclient.php | 18 +- LANG_www/agc_pl/call_log_display.php | 2 +- LANG_www/agc_pl/conf_exten_check.php | 55 +++++- LANG_www/agc_pl/inbound_popup.php | 12 +- LANG_www/agc_pl/live_exten_check.php | 32 +-- LANG_www/agc_pl/manager_send.php | 52 ++--- LANG_www/agc_pl/park_calls_display.php | 2 +- LANG_www/agc_pl/timeclock.php | 18 +- LANG_www/agc_pl/vdc_db_query.php | 188 ++++++++++++------ LANG_www/agc_pl/vicidial.php | 189 ++++++++++-------- LANG_www/agc_pl/voicemail_check.php | 2 +- LANG_www/agc_pt/active_list_refresh.php | 2 +- LANG_www/agc_pt/astguiclient.php | 12 +- LANG_www/agc_pt/call_log_display.php | 2 +- LANG_www/agc_pt/conf_exten_check.php | 55 +++++- LANG_www/agc_pt/inbound_popup.php | 10 +- LANG_www/agc_pt/live_exten_check.php | 32 +-- LANG_www/agc_pt/manager_send.php | 54 ++--- LANG_www/agc_pt/park_calls_display.php | 2 +- LANG_www/agc_pt/timeclock.php | 14 +- LANG_www/agc_pt/vdc_db_query.php | 200 ++++++++++++------- LANG_www/agc_pt/vicidial.php | 235 ++++++++++++---------- LANG_www/agc_pt/voicemail_check.php | 2 +- LANG_www/agc_ru/active_list_refresh.php | 2 +- LANG_www/agc_ru/astguiclient.php | 22 +-- LANG_www/agc_ru/call_log_display.php | 2 +- LANG_www/agc_ru/conf_exten_check.php | 57 +++++- LANG_www/agc_ru/inbound_popup.php | 12 +- LANG_www/agc_ru/live_exten_check.php | 32 +-- LANG_www/agc_ru/manager_send.php | 54 ++--- LANG_www/agc_ru/park_calls_display.php | 2 +- LANG_www/agc_ru/timeclock.php | 24 +-- LANG_www/agc_ru/vdc_db_query.php | 224 +++++++++++++-------- LANG_www/agc_ru/vicidial.php | 219 +++++++++++--------- LANG_www/agc_ru/voicemail_check.php | 2 +- LANG_www/agc_sk/active_list_refresh.php | 2 +- LANG_www/agc_sk/astguiclient.php | 18 +- LANG_www/agc_sk/call_log_display.php | 2 +- LANG_www/agc_sk/conf_exten_check.php | 57 +++++- LANG_www/agc_sk/inbound_popup.php | 12 +- LANG_www/agc_sk/live_exten_check.php | 32 +-- LANG_www/agc_sk/manager_send.php | 54 ++--- LANG_www/agc_sk/park_calls_display.php | 2 +- LANG_www/agc_sk/timeclock.php | 22 +-- LANG_www/agc_sk/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_sk/vicidial.php | 249 ++++++++++++----------- LANG_www/agc_sk/voicemail_check.php | 2 +- LANG_www/agc_tw/active_list_refresh.php | 2 +- LANG_www/agc_tw/astguiclient.php | 18 +- LANG_www/agc_tw/call_log_display.php | 2 +- LANG_www/agc_tw/conf_exten_check.php | 57 +++++- LANG_www/agc_tw/dbconnect.php | 6 +- LANG_www/agc_tw/inbound_popup.php | 8 +- LANG_www/agc_tw/live_exten_check.php | 32 +-- LANG_www/agc_tw/manager_send.php | 54 ++--- LANG_www/agc_tw/park_calls_display.php | 2 +- LANG_www/agc_tw/timeclock.php | 22 +-- LANG_www/agc_tw/vdc_db_query.php | 206 ++++++++++++------- LANG_www/agc_tw/vicidial.php | 241 ++++++++++++---------- LANG_www/agc_tw/voicemail_check.php | 2 +- bin/ADMIN_archive_log_tables.pl | 57 ++++++ extras/MySQL_AST_CREATE_tables.sql | 6 +- extras/upgrade_2.2.0.sql | 7 + translations/br_language.txt | 17 +- translations/de_language.txt | 17 +- translations/el_language.txt | 17 +- translations/es_language.txt | 17 +- translations/fr_language.txt | 17 +- translations/it_language.txt | 17 +- translations/nl_language.txt | 17 +- translations/pl_language.txt | 17 +- translations/pt_language.txt | 17 +- translations/ru_language.txt | 17 +- translations/sk_language.txt | 17 +- translations/tw_language.txt | 17 +- www/agc/conf_exten_check.php | 43 +++- www/agc/vdc_db_query.php | 161 ++++++++++----- www/agc/vicidial.php | 123 +++++++----- 163 files changed, 4913 insertions(+), 3204 deletions(-) diff --git a/LANG_www/agc_br/active_list_refresh.php b/LANG_www/agc_br/active_list_refresh.php index e33f0e76..10bbbd28 100644 --- a/LANG_www/agc_br/active_list_refresh.php +++ b/LANG_www/agc_br/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_br/astguiclient.php b/LANG_www/agc_br/astguiclient.php index c02f2512..f977e637 100644 --- a/LANG_www/agc_br/astguiclient.php +++ b/LANG_www/agc_br/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR DESLIGAR/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR DESLIGAR/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "CHAMADAS ATIVAS NESTE TELEFONE:
"; + var live_calls_HTML = "CHAMADAS ATIVAS NESTE TELEFONE:
#CANAL DO CLIENTECANAL REMOTOREGISTRODESLIGARTRANFERENCIAESPERA
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CANAL DO CLIENTECANAL REMOTORECORDDESLIGARTRANFERENCIAESPERA
" + var out_log_HTML = "
# DATA/HORA DA CHAMADANUMEROCOMPRIMENTO (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# DATA/HORA DA CHAMADANUMEROLENGTH (M:SS)
" + var in_log_HTML = "
# DATA/HORA DA CHAMADANUMERO ENTRANTECALLERIDCOMPRIMENTO
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# DATA/HORA DA CHAMADANUMERO ENTRANTECALLERIDLENGTH
TRUNK DESLIGAR

+
TRUNK HANGUP

Active Trunks Menu
Desligar o Canal   |   Capturar o Canal   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
TRANSFERIR CHAMADAS ATIVAS
Canal a ser transferido: Canal
TRANSFERIR CHAMADAS ATIVAS
Canal a ser transferido: Channel
Extensões:
Extensões do Menu

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Discar a extensão local
Telefone ligando de: Canal
Discar a extensão local
Telefone ligando de: Channel
Extensões:
Extensões do Menu

@@ -2828,7 +2828,7 @@ echo "\n"; - +
FAVORITOS

 
PARA ENVIAR MODIFICACOES FAVORITAS E NECESSARIO FAZER O SAIR
PARA ENVIAR MODIFICACOES FAVORITAS E NECESSARIO FAZER O LOGOUT
VOLTAR A TELA PRINCIPAL - as alterações serão ignoradas
@@ -2839,7 +2839,7 @@ echo "\n";
-BATENTE | INICIAR     Atualizar a taxa: 1000 ms Mais rápido | Mais devagar

+STOP | START     Atualizar a taxa: 1000 ms Mais rápido | Mais devagar

Inicializando..
Extensões Ativas
diff --git a/LANG_www/agc_br/call_log_display.php b/LANG_www/agc_br/call_log_display.php index 17786b48..c37185b9 100644 --- a/LANG_www/agc_br/call_log_display.php +++ b/LANG_www/agc_br/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/conf_exten_check.php b/LANG_www/agc_br/conf_exten_check.php index 3ccfd0a1..71b6fd1c 100644 --- a/LANG_www/agc_br/conf_exten_check.php +++ b/LANG_www/agc_br/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent isligadois hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|INICIAR",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_SAIR';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Status: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$CanalA[$counter] ~"; - # echo "$CanalA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/inbound_popup.php b/LANG_www/agc_br/inbound_popup.php index aec91725..1032dd45 100644 --- a/LANG_www/agc_br/inbound_popup.php +++ b/LANG_www/agc_br/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/live_exten_check.php b/LANG_www/agc_br/live_exten_check.php index a34ca68c..53ea8c9a 100644 --- a/LANG_www/agc_br/live_exten_check.php +++ b/LANG_www/agc_br/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/manager_send.php b/LANG_www/agc_br/manager_send.php index 45526668..c4c2d7a8 100644 --- a/LANG_www/agc_br/manager_send.php +++ b/LANG_www/agc_br/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "extenName $extenName Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "extenName $extenName Deve ser definido\n"; echo "exten $exten Deve ser definido\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Canal $channel não é válido or queryCID $queryCID não é válido, Hangup comando não inserido\n"; + echo "Channel $channel não é válido or queryCID $queryCID não é válido, Hangup comando não inserido\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Canal $channel não está ativoligado$call_server_ip, Hangup comando não inserido $rowx[0]\n$stmt\n"; + echo "Channel $channel não está ativoligado$call_server_ip, Hangup comando não inserido $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Canal $channel in use by another agentligado$call_server_ip, Hangup comando não inserido $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agentligado$call_server_ip, Hangup comando não inserido $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "extenName $extenName Deve ser definido\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "extenName $extenName Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "extenName $extenName Deve ser definido\n"; echo "exten $exten Deve ser definido\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; - echo "ExtraCanal $extrachannel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; + echo "ExtraChannel $extrachannel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel não está ativoligado$call_server_ip, Redirect comando não inserido\n"; + echo "Channel $channel não está ativoligado$call_server_ip, Redirect comando não inserido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está ativoligado$call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; + echo "Channel $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está ativoligado$server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; - echo "ExtraCanal $extrachannel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; + echo "ExtraChannel $extrachannel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel não está ativoligado$call_server_ip, Redirect comando não inserido\n"; + echo "Channel $channel não está ativoligado$call_server_ip, Redirect comando não inserido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está ativoligado$call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; + echo "Channel $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está ativoligado$server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando enviado para Canal $channel and \nExtraCanal $extrachannel\n to $extenligado$server_ip\n"; + echo "RedirectXtra comando enviado para Canal $channel and \nExtraChannel $extrachannel\n to $extenligado$server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $extenligado$server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando enviado para Canal $channelligado$call_server_ip and \nExtraCanal $extrachannel\n to $extenligado$server_ip\n"; + echo "RedirectXtra comando enviado para Canal $channelligado$call_server_ip and \nExtraChannel $extrachannel\n to $extenligado$server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Uma dessas variáveis não é válido:\n"; - echo "Canal $channel Deve ser maior que 2 caracteres\n"; + echo "Channel $channel Deve ser maior que 2 caracteres\n"; echo "queryCID $queryCID Deve ser maior que 14 caracateres\n"; echo "exten $exten Deve ser definido\n"; echo "ext_context $ext_context Deve ser definido\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; + echo "Channel $channel não está ativoligado$server_ip, Redirect comando não inserido\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel não é válido or queryCID $queryCID não é válido or filename: $filename não é válido, $ACTION comando não inserido\n"; + echo "Channel $channel não é válido or queryCID $queryCID não é válido or filename: $filename não é válido, $ACTION comando não inserido\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel não está ativoligado$server_ip, $ACTION comando não inserido\n"; + echo "Channel $channel não está ativoligado$server_ip, $ACTION comando não inserido\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel não é válido or exten $exten não é válido or filename: $filename não é válido, $ACTION comando não inserido\n"; + echo "Channel $channel não é válido or exten $exten não é válido or filename: $filename não é válido, $ACTION comando não inserido\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_br/park_calls_display.php b/LANG_www/agc_br/park_calls_display.php index 8d116875..e5bcc93a 100644 --- a/LANG_www/agc_br/park_calls_display.php +++ b/LANG_www/agc_br/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/timeclock.php b/LANG_www/agc_br/timeclock.php index ecf82225..c62ae950 100644 --- a/LANG_www/agc_br/timeclock.php +++ b/LANG_www/agc_br/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='INICIAR', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='INICIAR'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'INICIAR') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30segundos of your last login/logout + ### You cannot log in or out within 30 segundos of your last login/logout $VDdisplayMESSAGE = "Você não pode efetuar login ou para fora dentro de 30 segundos do seu último login ou logout"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOSAIR') or ($status=='INICIAR') or ($status=='SAIR') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Você saiu em$NOW_TIME
Quantidade de tempo que foram registradas em:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='SAIR', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='SAIR', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='SAIR', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOSAIR') or ($status=='INICIAR') or ($status=='SAIR') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERRO: timeclock entrada do log já realizados:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOSAIR') or ($status=='INICIAR') or ($status=='SAIR') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Vez desde que foi registrado em:$totTIME_HMS"; $log_action = 'login'; @@ -377,7 +377,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Quantidade de tempo que tem sido registrado em:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'SAIR'; + $button_name = 'LOGOUT'; $LOGtimeMESSAGE = "Você autenticado-nos em: $last_action_date
Quantidade de tempo que tem sido registrado em:$totTIME_HMS

SAIR Clique abaixo para log-out"; } diff --git a/LANG_www/agc_br/vdc_db_query.php b/LANG_www/agc_br/vdc_db_query.php index a27d1852..7644ef6d 100644 --- a/LANG_www/agc_br/vdc_db_query.php +++ b/LANG_www/agc_br/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('SAIR',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("INICIAR|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("INICIAR|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID não é válido\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID não é válido\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 segundos, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_BATENTE|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|REGISTRO_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a SAIR record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','SAIR','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### INICIAR Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### INICIAR QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_br/vicidial.php b/LANG_www/agc_br/vicidial.php index 3ce6799c..02c077a6 100644 --- a/LANG_www/agc_br/vicidial.php +++ b/LANG_www/agc_br/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show callsligadohold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsegundos for campaign call and agent stats + $campagentstatctmax = '3'; # Number of segundos for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign nameligadologin pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookupsligadocampaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Desligar Cliente $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefoneSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT DISCAR by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('SAIR',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "É necessário efetuar login AO PRIMEIRO TIMECLOCK
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("INICIAR|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("INICIAR|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Canal: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Canal=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "CUSTOMIZADO - \n"; + echo "CUSTOM - \n"; echo "
Número Discado: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefoneSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefoneSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1763,7 +1765,7 @@ else { $VICIDiaL_park_on_extension = "$park_ext"; $VICIDiaL_park_on_filename = "$park_file_name"; - echo "\n"; + echo "\n"; } echo "\n"; @@ -1771,7 +1773,7 @@ else if (strlen($web_form_address)>0) { $VICIDiaL_web_form_address = "$web_form_address"; - echo "\n"; + echo "\n"; } else { @@ -1785,7 +1787,7 @@ else if (strlen($web_form_address_two)>0) { $VICIDiaL_web_form_address_two = "$web_form_address_two"; - echo "\n"; + echo "\n"; } else { @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### INICIAR SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsegundos counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call segundos counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'CUSTOMIZADOER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_SAIR') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Discar telefone alternativo: TELEFONE PRINCIPAL or TELEFONE ALTERNATIVO or ENDERECO3 or FINALIZAR CONTATO"; + var man_status = "Discar telefone alternativo: TELEFONE PRINCIPAL or TELEFONE ALTERNATIVO or ENDERECO3 or FINALIZAR CONTATO"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Ligando: " + status_display_number + " UID: " + CIDcheck + "   Aguardando Atender... " + MD_ring_secondS + "segundos"; + document.getElementById("MainStatuSSpan").innerHTML = " Ligando: " + status_display_number + " UID: " + CIDcheck + "   Aguardando Atender... " + MD_ring_secondS + " segundos"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINICIAR_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') || (quick_transfer_button == 'PREINICIAR_3') || (quick_transfer_button == 'PREINICIAR_4') || (quick_transfer_button == 'PREINICIAR_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; - if (quick_transfer_button == 'PREINICIAR_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINICIAR_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINICIAR_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINICIAR_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINICIAR_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefoneE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'SAIR') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Canal has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINICIAR_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') || (quick_transfer_button == 'PREINICIAR_3') || (quick_transfer_button == 'PREINICIAR_4') || (quick_transfer_button == 'PREINICIAR_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; - if (quick_transfer_button == 'PREINICIAR_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINICIAR_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINICIAR_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINICIAR_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINICIAR_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLDESLIGAR&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "CUSTOMIZADOER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"SAIR"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE SAIR LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"SAIR"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Atualizar the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Atualizar the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "NOTIFICAÇÃO TIMER: " + timer_action_seconds + "segundos

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "NOTIFICAÇÃO TIMER: " + timer_action_seconds + " segundos

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; } @@ -10457,7 +10486,7 @@ echo "\n";
-segundos: + segundos:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - REINICIAR | + REINICIAR | ENVIAR



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- REINICIAR | + REINICIAR | ENVIAR



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Canal - Canal + Canal + Canal ESTE AGENDAMENTO SO APARECE PARA MIM
";} diff --git a/LANG_www/agc_br/voicemail_check.php b/LANG_www/agc_br/voicemail_check.php index e6fdf4e0..5fd095f7 100644 --- a/LANG_www/agc_br/voicemail_check.php +++ b/LANG_www/agc_br/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/active_list_refresh.php b/LANG_www/agc_de/active_list_refresh.php index 8fa6b53a..c3323059 100644 --- a/LANG_www/agc_de/active_list_refresh.php +++ b/LANG_www/agc_de/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_de/astguiclient.php b/LANG_www/agc_de/astguiclient.php index 39031642..f14d0e33 100644 --- a/LANG_www/agc_de/astguiclient.php +++ b/LANG_www/agc_de/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR AUFLEGEN/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR AUFLEGEN/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "VERBUNDEN MIT DIESEM TELEFON:
"; + var live_calls_HTML = "VERBUNDEN MIT DIESEM TELEFON:
#KUNDEN LEITUNGENTFERNTE LEITUNGAUFNAHMEAUFLEGENPARK
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#KUNDEN LEITUNGENTFERNTE LEITUNGRECORDAUFLEGENPARK
" + var out_log_HTML = "
# ANRUF DATUM\/ZEITNUMMERLÄNGE (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# ANRUF DATUM\/ZEITNUMMERLENGTH (M:SS)
" + var in_log_HTML = "
# ANRUF DATUM\/ZEITIN-NUMMERANRUFERIDLÄNGE
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# ANRUF DATUM\/ZEITIN-NUMMERANRUFERIDLENGTH
TRUNK AUFLEGEN

+
TRUNK HANGUP

Active Trunks Menu
Amtsleitung auflegen   |   Amtsleitung übernehmen   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
ANRUF WEITERLEITEN
Leitung, die verbunden werden soll: Kanal
ANRUF WEITERLEITEN
Leitung, die verbunden werden soll: Channel
Erweiterungen:
Extension Menü

@@ -2772,7 +2772,7 @@ echo "\n"; - +
LOKALE Nebenstellen wahl
Telefon ruft an von: Kanal
LOKALE Nebenstellen wahl
Telefon ruft an von: Channel
Erweiterungen:
Extension Menü

diff --git a/LANG_www/agc_de/call_log_display.php b/LANG_www/agc_de/call_log_display.php index 2d3161f2..534c23fe 100644 --- a/LANG_www/agc_de/call_log_display.php +++ b/LANG_www/agc_de/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/conf_exten_check.php b/LANG_www/agc_de/conf_exten_check.php index c4c32671..af358b2f 100644 --- a/LANG_www/agc_de/conf_exten_check.php +++ b/LANG_www/agc_de/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is an is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$KanalA[$counter] ~"; - # echo "$KanalA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/inbound_popup.php b/LANG_www/agc_de/inbound_popup.php index a2d9f0e1..3aed520d 100644 --- a/LANG_www/agc_de/inbound_popup.php +++ b/LANG_www/agc_de/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/live_exten_check.php b/LANG_www/agc_de/live_exten_check.php index 90665fe4..3a094519 100644 --- a/LANG_www/agc_de/live_exten_check.php +++ b/LANG_www/agc_de/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanalA: $ChanneLA[$counter] ~"; - echo "KanalB: $ChanneLB[$counter] ~"; - echo "KanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanalA: $ChanneLA[$counter] ~"; - echo "KanalB: $ChanneLB[$counter] ~"; - echo "KanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanalA: $ChanneLA[$counter] ~"; - echo "KanalB: $ChanneLB[$counter] ~"; - echo "KanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanalA: $ChanneLA[$counter] ~"; - echo "KanalB: $ChanneLB[$counter] ~"; - echo "KanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "KanalA: $ChanneLA[$counter] ~"; - echo "KanalB: $ChanneLB[$counter] ~"; - echo "KanalBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/manager_send.php b/LANG_www/agc_de/manager_send.php index 079c2130..edca2532 100644 --- a/LANG_www/agc_de/manager_send.php +++ b/LANG_www/agc_de/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "extenName $extenName muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "extenName $extenName muß eingestellt werden\n"; echo "exten $exten muß eingestellt werden\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Kanal $channel ist unzulässig or queryCID $queryCID ist unzulässig, Hangup Befehl nicht abgesetzt\n"; + echo "Channel $channel ist unzulässig or queryCID $queryCID ist unzulässig, Hangup Befehl nicht abgesetzt\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Kanal $channel ist nicht Live an $call_server_ip, Hangup Befehl nicht abgesetzt $rowx[0]\n$stmt\n"; + echo "Channel $channel ist nicht Live an $call_server_ip, Hangup Befehl nicht abgesetzt $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Kanal $channel in use by another agent an $call_server_ip, Hangup Befehl nicht abgesetzt $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent an $call_server_ip, Hangup Befehl nicht abgesetzt $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "extenName $extenName muß eingestellt werden\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "extenName $extenName muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "extenName $extenName muß eingestellt werden\n"; echo "exten $exten muß eingestellt werden\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; - echo "ExtraKanal $extrachannel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; + echo "ExtraChannel $extrachannel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanal $channel ist nicht Live an $call_server_ip, Redirect Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $call_server_ip, Redirect Befehl nicht abgesetzt\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel ist nicht Live an $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanal $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel ist nicht Live an $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; - echo "ExtraKanal $extrachannel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; + echo "ExtraChannel $extrachannel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanal $channel ist nicht Live an $call_server_ip, Redirect Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $call_server_ip, Redirect Befehl nicht abgesetzt\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel ist nicht Live an $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanal $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel ist nicht Live an $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra Befehl gesendet für Kanal $channel and \nExtraKanal $extrachannel\n to $exten an $server_ip\n"; + echo "RedirectXtra Befehl gesendet für Kanal $channel and \nExtraChannel $extrachannel\n to $exten an $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten an $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra Befehl gesendet für Kanal $channel an $call_server_ip and \nExtraKanal $extrachannel\n to $exten an $server_ip\n"; + echo "RedirectXtra Befehl gesendet für Kanal $channel an $call_server_ip and \nExtraChannel $extrachannel\n to $exten an $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Eine dieser Variablen ist unzulässig:\n"; - echo "Kanal $channel muss länger als 2 Buchstaben sein\n"; + echo "Channel $channel muss länger als 2 Buchstaben sein\n"; echo "queryCID $queryCID muss länger als 14 Buchstaben sein\n"; echo "exten $exten muß eingestellt werden\n"; echo "ext_context $ext_context muß eingestellt werden\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Kanal $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $server_ip, Redirect Befehl nicht abgesetzt\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanal $channel ist unzulässig or queryCID $queryCID ist unzulässig or filename: $filename ist unzulässig, $ACTION Befehl nicht abgesetzt\n"; + echo "Channel $channel ist unzulässig or queryCID $queryCID ist unzulässig or filename: $filename ist unzulässig, $ACTION Befehl nicht abgesetzt\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Kanal $channel ist nicht Live an $server_ip, $ACTION Befehl nicht abgesetzt\n"; + echo "Channel $channel ist nicht Live an $server_ip, $ACTION Befehl nicht abgesetzt\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanal $channel ist unzulässig or exten $exten ist unzulässig or filename: $filename ist unzulässig, $ACTION Befehl nicht abgesetzt\n"; + echo "Channel $channel ist unzulässig or exten $exten ist unzulässig or filename: $filename ist unzulässig, $ACTION Befehl nicht abgesetzt\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_de/park_calls_display.php b/LANG_www/agc_de/park_calls_display.php index 0604f966..12bdf195 100644 --- a/LANG_www/agc_de/park_calls_display.php +++ b/LANG_www/agc_de/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/timeclock.php b/LANG_www/agc_de/timeclock.php index 31da253f..b8d9e58d 100644 --- a/LANG_www/agc_de/timeclock.php +++ b/LANG_www/agc_de/timeclock.php @@ -224,7 +224,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) } if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30Sekunden of your last login/logout + ### You cannot log in or out within 30 Sekunden of your last login/logout $VDdisplayMESSAGE = "Bitte warten Sie wenigstens 30 Sekunden zwischen dem an- und abmelden und umgekehrt"; echo"\n"; diff --git a/LANG_www/agc_de/vdc_db_query.php b/LANG_www/agc_de/vdc_db_query.php index 6675183b..3e367117 100644 --- a/LANG_www/agc_de/vdc_db_query.php +++ b/LANG_www/agc_de/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID ist unzulässig\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID ist unzulässig\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 Sekunden, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|AUFNAHME_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_de/vicidial.php b/LANG_www/agc_de/vicidial.php index f62736bf..a9b0b888 100644 --- a/LANG_www/agc_de/vicidial.php +++ b/LANG_www/agc_de/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls an hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofSekunden for campaign call and agent stats + $campagentstatctmax = '3'; # Number of Sekunden for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name an login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups an campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Kunden auflegen $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefonSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT WÄHLEN by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -1238,23 +1240,23 @@ echo "
Kanal: $row[1]
AnruferID: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Kanal=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "ANGEPASST - \n"; + echo "CUSTOM - \n"; echo "
Gewählte Nummer: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $AnruferID_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefonSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefonSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callSekunden counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call Sekunden counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'ANGEPASSTER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Wähle alternative Telefonnummer: TELEFONNUMMER or ALTERNATIVE TELEFONNUMMER or ADRESSE3 or ADRESSE BEENDEN"; + var man_status = "Wähle alternative Telefonnummer: TELEFONNUMMER or ALTERNATIVE TELEFONNUMMER or ADRESSE3 or ADRESSE BEENDEN"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Telefonierend: " + status_display_number + " UID: " + CIDcheck + "   Warte auf Freizeichen... " + MD_ring_secondS + "Sekunden"; + document.getElementById("MainStatuSSpan").innerHTML = " Telefonierend: " + status_display_number + " UID: " + CIDcheck + "   Warte auf Freizeichen... " + MD_ring_secondS + " Sekunden"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PZURÜCKSETZEN_1') || (quick_transfer_button == 'PZURÜCKSETZEN_2') || (quick_transfer_button == 'PZURÜCKSETZEN_3') || (quick_transfer_button == 'PZURÜCKSETZEN_4') || (quick_transfer_button == 'PZURÜCKSETZEN_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; - if (quick_transfer_button == 'PZURÜCKSETZEN_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefonE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Kanal has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PZURÜCKSETZEN_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PZURÜCKSETZEN_1') || (quick_transfer_button == 'PZURÜCKSETZEN_2') || (quick_transfer_button == 'PZURÜCKSETZEN_3') || (quick_transfer_button == 'PZURÜCKSETZEN_4') || (quick_transfer_button == 'PZURÜCKSETZEN_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; - if (quick_transfer_button == 'PZURÜCKSETZEN_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PZURÜCKSETZEN_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLAUFLEGEN&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "ANGEPASSTER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Aktualisieren the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Aktualisieren the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "Timer-Benachrichtigung: " + timer_action_seconds + "Sekunden

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "Timer-Benachrichtigung: " + timer_action_seconds + " Sekunden

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Quick"; } - if ( (quick_transfer_button == 'PZURÜCKSETZEN_1') || (quick_transfer_button == 'PZURÜCKSETZEN_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; } @@ -10457,7 +10486,7 @@ echo "\n";
-Sekunden: + Sekunden:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - ZURÜCKSETZEN | + ZURÜCKSETZEN | ÜBERNEHMEN



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- ZURÜCKSETZEN | + ZURÜCKSETZEN | ÜBERNEHMEN



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Kanal - Kanal + Kanal + Kanal NUR MEINE WIEDERVORLAGE
";} diff --git a/LANG_www/agc_de/voicemail_check.php b/LANG_www/agc_de/voicemail_check.php index e0c12857..a0f296dc 100644 --- a/LANG_www/agc_de/voicemail_check.php +++ b/LANG_www/agc_de/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/active_list_refresh.php b/LANG_www/agc_el/active_list_refresh.php index 5fc286c3..6e776225 100644 --- a/LANG_www/agc_el/active_list_refresh.php +++ b/LANG_www/agc_el/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_el/astguiclient.php b/LANG_www/agc_el/astguiclient.php index 9de655b0..35f88e31 100644 --- a/LANG_www/agc_el/astguiclient.php +++ b/LANG_www/agc_el/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR ΚΛΕΙΣΙΜΟ/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR ΚΛΕΙΣΙΜΟ/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "ΕΝΕΡΓΕΣ ΚΛΗΣΕΙΣ ΣΕ ΑΥΤΟ ΤΟ ΤΗΛΕΦΩΝΟ:
"; + var live_calls_HTML = "ΕΝΕΡΓΕΣ ΚΛΗΣΕΙΣ ΣΕ ΑΥΤΟ ΤΟ ΤΗΛΕΦΩΝΟ:
#ΚΑΝΑΛΙ ΠΕΛΑΤΩΝΑΠΟΜΑΚΡΟ ΚΑΝΑΛΙΕΓΓΡΑΦΗΚΛΕΙΣΙΜΟXFERΣΤΑΘΜΕΥΣΗ
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#ΚΑΝΑΛΙ ΠΕΛΑΤΩΝΑΠΟΜΑΚΡΟ ΚΑΝΑΛΙRECORDΚΛΕΙΣΙΜΟXFERΣΤΑΘΜΕΥΣΗ
" + var out_log_HTML = "
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΑΡΙΘΜΟΣΜΗΚΟΣ (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΑΡΙΘΜΟΣLENGTH (M:SS)
" + var in_log_HTML = "
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΣΕ-ΑΡΙΘΜΟCALLERIDΜΗΚΟΣ
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΣΕ-ΑΡΙΘΜΟCALLERIDLENGTH
TRUNK ΚΛΕΙΣΙΜΟ

+
TRUNK HANGUP

Active Trunks Menu
Κλείσιμο Κορμού   |   Κλέψιμο Κορμού   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
ΜΕΤΑΦΟΡΑ ΕΝΕΡΓΗΣ ΚΛΗΣΗΣ
Κανάλι προς μεταφορά: Κανάλι
ΜΕΤΑΦΟΡΑ ΕΝΕΡΓΗΣ ΚΛΗΣΗΣ
Κανάλι προς μεταφορά: Channel
Τηλ.συνδέσεις:
Επιλογές τηλ. συνδέσεων

@@ -2772,7 +2772,7 @@ echo "\n"; - +
ΤΟΠΙΚΕΣ τηλ. συνδέσεις Κλήσεως
Τηλέφωνο που καλεί από: Κανάλι
ΤΟΠΙΚΕΣ τηλ. συνδέσεις Κλήσεως
Τηλέφωνο που καλεί από: Channel
Τηλ.συνδέσεις:
Επιλογές τηλ. συνδέσεων

@@ -2839,7 +2839,7 @@ echo "\n";
-ΣΤΑΣΗ | ΕΝΑΡΞΗ     Ρυθμός ανανέωσης: 1000 ms Γρηγορότερα | Πιό αργά

+STOP | START     Ρυθμός ανανέωσης: 1000 ms Γρηγορότερα | Πιό αργά

Αρχή..
Ενεργές τηλ. συνδέσεις
diff --git a/LANG_www/agc_el/call_log_display.php b/LANG_www/agc_el/call_log_display.php index cd8eae17..82094f00 100644 --- a/LANG_www/agc_el/call_log_display.php +++ b/LANG_www/agc_el/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/conf_exten_check.php b/LANG_www/agc_el/conf_exten_check.php index 2340ce6f..7342b5e4 100644 --- a/LANG_www/agc_el/conf_exten_check.php +++ b/LANG_www/agc_el/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is στο is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|ΕΝΑΡΞΗ",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_ΑΠΟΣΥΝΔΕΣΗ';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Κατάσταση: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $ΚανάλιA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $ΚανάλιA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$ΚανάλιA[$counter] ~"; - # echo "$ΚανάλιA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/inbound_popup.php b/LANG_www/agc_el/inbound_popup.php index a724b0bd..9ca72157 100644 --- a/LANG_www/agc_el/inbound_popup.php +++ b/LANG_www/agc_el/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/live_exten_check.php b/LANG_www/agc_el/live_exten_check.php index 9d9ce193..efaa90cf 100644 --- a/LANG_www/agc_el/live_exten_check.php +++ b/LANG_www/agc_el/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "ΚανάλιA: $ChanneLA[$counter] ~"; - echo "ΚανάλιB: $ChanneLB[$counter] ~"; - echo "ΚανάλιBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "ΚανάλιA: $ChanneLA[$counter] ~"; - echo "ΚανάλιB: $ChanneLB[$counter] ~"; - echo "ΚανάλιBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "ΚανάλιA: $ChanneLA[$counter] ~"; - echo "ΚανάλιB: $ChanneLB[$counter] ~"; - echo "ΚανάλιBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "ΚανάλιA: $ChanneLA[$counter] ~"; - echo "ΚανάλιB: $ChanneLB[$counter] ~"; - echo "ΚανάλιBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "ΚανάλιA: $ChanneLA[$counter] ~"; - echo "ΚανάλιB: $ChanneLB[$counter] ~"; - echo "ΚανάλιBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/manager_send.php b/LANG_www/agc_el/manager_send.php index 07af0f37..3f4ba453 100644 --- a/LANG_www/agc_el/manager_send.php +++ b/LANG_www/agc_el/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "extenName $extenName πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "extenName $extenName πρέπει να τεθεί\n"; echo "exten $exten πρέπει να τεθεί\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Κανάλι $channel δεν ισχύει or queryCID $queryCID δεν ισχύει, Hangup εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν ισχύει or queryCID $queryCID δεν ισχύει, Hangup εντολή που δεν έγινε εισαγωγή\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $call_server_ip, Hangup εντολή που δεν έγινε εισαγωγή $rowx[0]\n$stmt\n"; + echo "Channel $channel δεν είναι ενεργό στο $call_server_ip, Hangup εντολή που δεν έγινε εισαγωγή $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Κανάλι $channel in use by another agent στο $call_server_ip, Hangup εντολή που δεν έγινε εισαγωγή $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent στο $call_server_ip, Hangup εντολή που δεν έγινε εισαγωγή $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "extenName $extenName πρέπει να τεθεί\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "extenName $extenName πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "extenName $extenName πρέπει να τεθεί\n"; echo "exten $exten πρέπει να τεθεί\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; - echo "ExtraΚανάλι $extrachannel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "ExtraChannel $extrachannel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $call_server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $call_server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel δεν είναι ενεργό στο $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel δεν είναι ενεργό στο $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; - echo "ExtraΚανάλι $extrachannel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "ExtraChannel $extrachannel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $call_server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $call_server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel δεν είναι ενεργό στο $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel δεν είναι ενεργό στο $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra εντολή που στέλνεται για Κανάλι $channel and \nExtraΚανάλι $extrachannel\n to $exten στο $server_ip\n"; + echo "RedirectXtra εντολή που στέλνεται για Κανάλι $channel and \nExtraChannel $extrachannel\n to $exten στο $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten στο $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra εντολή που στέλνεται για Κανάλι $channel στο $call_server_ip and \nExtraΚανάλι $extrachannel\n to $exten στο $server_ip\n"; + echo "RedirectXtra εντολή που στέλνεται για Κανάλι $channel στο $call_server_ip and \nExtraChannel $extrachannel\n to $exten στο $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Μία από αυτές τις μεταβλητές δεν ισχύει:\n"; - echo "Κανάλι $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; + echo "Channel $channel πρέπει να είναι μεγαλύτερος από 2 χαρακτήρες\n"; echo "queryCID $queryCID πρέπει να είναι μεγαλύτερος από 14 χαρακτήρες\n"; echo "exten $exten πρέπει να τεθεί\n"; echo "ext_context $ext_context πρέπει να τεθεί\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $server_ip, Redirect εντολή που δεν έγινε εισαγωγή\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Κανάλι $channel δεν ισχύει or queryCID $queryCID δεν ισχύει or filename: $filename δεν ισχύει, $ACTION εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν ισχύει or queryCID $queryCID δεν ισχύει or filename: $filename δεν ισχύει, $ACTION εντολή που δεν έγινε εισαγωγή\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Κανάλι $channel δεν είναι ενεργό στο $server_ip, $ACTION εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν είναι ενεργό στο $server_ip, $ACTION εντολή που δεν έγινε εισαγωγή\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Κανάλι $channel δεν ισχύει or exten $exten δεν ισχύει or filename: $filename δεν ισχύει, $ACTION εντολή που δεν έγινε εισαγωγή\n"; + echo "Channel $channel δεν ισχύει or exten $exten δεν ισχύει or filename: $filename δεν ισχύει, $ACTION εντολή που δεν έγινε εισαγωγή\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_el/park_calls_display.php b/LANG_www/agc_el/park_calls_display.php index 0960e767..7de9fabb 100644 --- a/LANG_www/agc_el/park_calls_display.php +++ b/LANG_www/agc_el/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/timeclock.php b/LANG_www/agc_el/timeclock.php index 0d1cc06b..d52d677a 100644 --- a/LANG_www/agc_el/timeclock.php +++ b/LANG_www/agc_el/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='ΕΝΑΡΞΗ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='ΕΝΑΡΞΗ'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'ΕΝΑΡΞΗ') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30δευτερόλεπτα of your last login/logout + ### You cannot log in or out within 30 δευτερόλεπτα of your last login/logout $VDdisplayMESSAGE = "Δεν μπορείτε να συνδεθείτε ή να αναφέρονται μέσα σε 30 δευτερόλεπτα από την τελευταία σας login ή logout"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOΑΠΟΣΥΝΔΕΣΗ') or ($status=='ΕΝΑΡΞΗ') or ($status=='ΑΠΟΣΥΝΔΕΣΗ') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Έχετε αποσυνδεθεί από την$NOW_TIME
Ποσό φορά που ήταν συνδεδεμένος στο:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='ΑΠΟΣΥΝΔΕΣΗ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='ΑΠΟΣΥΝΔΕΣΗ', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='ΑΠΟΣΥΝΔΕΣΗ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOΑΠΟΣΥΝΔΕΣΗ') or ($status=='ΕΝΑΡΞΗ') or ($status=='ΑΠΟΣΥΝΔΕΣΗ') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERROR: timeclock καταχώρηση αρχείου καταγραφής που έχουν ήδη πραγματοποιηθεί:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOΑΠΟΣΥΝΔΕΣΗ') or ($status=='ΕΝΑΡΞΗ') or ($status=='ΑΠΟΣΥΝΔΕΣΗ') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Ο χρόνος από την τελευταία φορά που είναι συνδεδεμένος στο:$totTIME_HMS"; $log_action = 'login'; @@ -377,8 +377,8 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Χρονικό διάστημα σας έχει συνδεθεί σε:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'ΑΠΟΣΥΝΔΕΣΗ'; - $LOGtimeMESSAGE = "Μπορείτε συνδεδεμένος στην διεύθυνση: $last_action_date
Χρονικό διάστημα σας έχει συνδεθεί σε:$totTIME_HMS

Κάντε κλικ παρακάτω για να ΑΠΟΣΥΝΔΕΣΗ log-out"; + $button_name = 'LOGOUT'; + $LOGtimeMESSAGE = "Μπορείτε συνδεδεμένος στην διεύθυνση: $last_action_date
Χρονικό διάστημα σας έχει συνδεθεί σε:$totTIME_HMS

Κάντε κλικ παρακάτω για να LOGOUT log-out"; } echo"\n"; diff --git a/LANG_www/agc_el/vdc_db_query.php b/LANG_www/agc_el/vdc_db_query.php index 2b839831..d87d07e6 100644 --- a/LANG_www/agc_el/vdc_db_query.php +++ b/LANG_www/agc_el/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('ΑΠΟΣΥΝΔΕΣΗ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("ΕΝΑΡΞΗ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("ΕΝΑΡΞΗ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID δεν ισχύει\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID δεν ισχύει\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 δευτερόλεπτα, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_ΣΤΑΣΗ|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|ΕΓΓΡΑΦΗ_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a ΑΠΟΣΥΝΔΕΣΗ record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','ΑΠΟΣΥΝΔΕΣΗ','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### ΕΝΑΡΞΗ Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### ΕΝΑΡΞΗ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_el/vicidial.php b/LANG_www/agc_el/vicidial.php index dfa72ef1..263f843a 100644 --- a/LANG_www/agc_el/vicidial.php +++ b/LANG_www/agc_el/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls στο hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofδευτερόλεπτα for campaign call and agent stats + $campagentstatctmax = '3'; # Number of δευτερόλεπτα for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name στο login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups στο campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Κλείσιμο Πελάτη $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$ΤηλSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT ΚΛΗΣΗ by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('ΑΠΟΣΥΝΔΕΣΗ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "Πρέπει να συνδεθείτε ΣΤΗΝ ΠΡΩΤΗ ΤΟΥ TIMECLOCK
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("ΕΝΑΡΞΗ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("ΕΝΑΡΞΗ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Κανάλι: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Κανάλι=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "ΣΥΝΗΘΕΙΑ - \n"; + echo "CUSTOM - \n"; echo "
Αριθμός που καλέσατε: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($ΤηλSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($ΤηλSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### ΕΝΑΡΞΗ SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callδευτερόλεπτα counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call δευτερόλεπτα counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'ΣΥΝΗΘΕΙΑER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_ΑΠΟΣΥΝΔΕΣΗ') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Κλήση εναλκού αριθμού: ΚΥΡΙΟ ΤΗΛΕΦΩΝΟ or ΕΝΑΛΛΑΚΤΙΚΟ ΤΗΛΕΦΩΝΟ or 3ΔΙΕΥΘΥΝΣΗ or ΤΕΛΕΙΩΣΤΕ"; + var man_status = "Κλήση εναλκού αριθμού: ΚΥΡΙΟ ΤΗΛΕΦΩΝΟ or ΕΝΑΛΛΑΚΤΙΚΟ ΤΗΛΕΦΩΝΟ or 3ΔΙΕΥΘΥΝΣΗ or ΤΕΛΕΙΩΣΤΕ"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Σε Κλήση: " + status_display_number + " UID: " + CIDcheck + "   Αναμονή για κουδούνισμα... " + MD_ring_secondS + "δευτερόλεπτα"; + document.getElementById("MainStatuSSpan").innerHTML = " Σε Κλήση: " + status_display_number + " UID: " + CIDcheck + "   Αναμονή για κουδούνισμα... " + MD_ring_secondS + " δευτερόλεπτα"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_1') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_2') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_3') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_4') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Γρήγορη"; - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTΤηλE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'ΑΠΟΣΥΝΔΕΣΗ') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Κανάλι has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PΕΠΑΝΑΦΟΡΑ_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_1') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_2') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_3') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_4') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Γρήγορη"; - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLΚΛΕΙΣΙΜΟ&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTΤηλE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTΤηλE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "ΣΥΝΗΘΕΙΑER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ΑΠΟΣΥΝΔΕΣΗ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE ΑΠΟΣΥΝΔΕΣΗ LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ΑΠΟΣΥΝΔΕΣΗ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Ανανέωση the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Ανανέωση the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER ΚΟΙΝΟΠΟΙΗΣΗ: " + timer_action_seconds + "δευτερόλεπτα

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER ΚΟΙΝΟΠΟΙΗΣΗ: " + timer_action_seconds + " δευτερόλεπτα

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Γρήγορη"; } - if ( (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_1') || (quick_transfer_button == 'PΕΠΑΝΑΦΟΡΑ_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Γρήγορη"; } @@ -10457,7 +10486,7 @@ echo "\n";
-δευτερόλεπτα: + δευτερόλεπτα:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - ΕΠΑΝΑΦΟΡΑ | + ΕΠΑΝΑΦΟΡΑ | ΥΠΟΒΑΛΕΤΕ



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- ΕΠΑΝΑΦΟΡΑ | + ΕΠΑΝΑΦΟΡΑ | ΥΠΟΒΑΛΕΤΕ



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Κανάλι - Κανάλι + Κανάλι + Κανάλι ΜΟΝΟ ΤΗΝ ΕΠΑΝΑΚΛΗΣΗ ΜΟΥ
";} diff --git a/LANG_www/agc_el/voicemail_check.php b/LANG_www/agc_el/voicemail_check.php index 27af6fe3..085ba6e5 100644 --- a/LANG_www/agc_el/voicemail_check.php +++ b/LANG_www/agc_el/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/active_list_refresh.php b/LANG_www/agc_es/active_list_refresh.php index 2ffce645..b33bc9cc 100644 --- a/LANG_www/agc_es/active_list_refresh.php +++ b/LANG_www/agc_es/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_es/astguiclient.php b/LANG_www/agc_es/astguiclient.php index 63b79c83..29fb4907 100644 --- a/LANG_www/agc_es/astguiclient.php +++ b/LANG_www/agc_es/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR COLGAR/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR COLGAR/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "LLAMADAS ACTIVAS EN ESTE TELÉFONO:
"; + var live_calls_HTML = "LLAMADAS ACTIVAS EN ESTE TELÉFONO:
#CANAL CLIENTECANAL REMOTOGRABACIÓNCOLGARTRANSFERENCIAPARKING
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CANAL CLIENTECANAL REMOTORECORDCOLGARTRANSFERENCIAPARKING
" + var out_log_HTML = "
# FECHA/HORA DE LA LLAMADANÚMEROLONGITUD (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# FECHA/HORA DE LA LLAMADANÚMEROLENGTH (M:SS)
" + var in_log_HTML = "
# FECHA/HORA DE LA LLAMADANÚMERO-ENTRANTELLAMADORIDLONGITUD
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# FECHA/HORA DE LA LLAMADANÚMERO-ENTRANTELLAMADORIDLENGTH
TRUNK COLGAR

+
TRUNK HANGUP

Active Trunks Menu
Colgar Trunk   |   Capturar Trunk   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
TRANSFERIR LLAMADA ACTIVA
Canal que va a ser transferido: Canal
TRANSFERIR LLAMADA ACTIVA
Canal que va a ser transferido: Channel
Extensiones:
Menú Extensiones

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Marcar a Extensiones LOCALES
Teléfono llamando desde: Canal
Marcar a Extensiones LOCALES
Teléfono llamando desde: Channel
Extensiones:
Menú Extensiones

@@ -2839,7 +2839,7 @@ echo "\n";
-PARADA | COMIENZO     Actualizar la tarifa: 1000 ms Más rápido | Más lento

+STOP | START     Actualizar la tarifa: 1000 ms Más rápido | Más lento

Inizializando..
Extensiones Activas
diff --git a/LANG_www/agc_es/call_log_display.php b/LANG_www/agc_es/call_log_display.php index 9c2947cd..ba676ee0 100644 --- a/LANG_www/agc_es/call_log_display.php +++ b/LANG_www/agc_es/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/conf_exten_check.php b/LANG_www/agc_es/conf_exten_check.php index 6811e306..a4abee40 100644 --- a/LANG_www/agc_es/conf_exten_check.php +++ b/LANG_www/agc_es/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is en is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|COMIENZO",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_SALIR';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Estado: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$CanalA[$counter] ~"; - # echo "$CanalA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/inbound_popup.php b/LANG_www/agc_es/inbound_popup.php index 7555421a..87883518 100644 --- a/LANG_www/agc_es/inbound_popup.php +++ b/LANG_www/agc_es/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/live_exten_check.php b/LANG_www/agc_es/live_exten_check.php index 28404681..2c8d756e 100644 --- a/LANG_www/agc_es/live_exten_check.php +++ b/LANG_www/agc_es/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/manager_send.php b/LANG_www/agc_es/manager_send.php index 46379145..861b3bf2 100644 --- a/LANG_www/agc_es/manager_send.php +++ b/LANG_www/agc_es/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "extenName $extenName debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "extenName $extenName debe ser fijado\n"; echo "exten $exten debe ser fijado\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Canal $channel No es válido or queryCID $queryCID No es válido, Hangup comando no insertado\n"; + echo "Channel $channel No es válido or queryCID $queryCID No es válido, Hangup comando no insertado\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Canal $channel no está activo en $call_server_ip, Hangup comando no insertado $rowx[0]\n$stmt\n"; + echo "Channel $channel no está activo en $call_server_ip, Hangup comando no insertado $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Canal $channel in use by another agent en $call_server_ip, Hangup comando no insertado $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent en $call_server_ip, Hangup comando no insertado $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "extenName $extenName debe ser fijado\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "extenName $extenName debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "extenName $extenName debe ser fijado\n"; echo "exten $exten debe ser fijado\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; - echo "ExtraCanal $extrachannel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; + echo "ExtraChannel $extrachannel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel no está activo en $call_server_ip, Redirect comando no insertado\n"; + echo "Channel $channel no está activo en $call_server_ip, Redirect comando no insertado\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel no está activo en $server_ip, Redirect comando no insertado\n"; + echo "Channel $channel no está activo en $server_ip, Redirect comando no insertado\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; - echo "ExtraCanal $extrachannel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; + echo "ExtraChannel $extrachannel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel no está activo en $call_server_ip, Redirect comando no insertado\n"; + echo "Channel $channel no está activo en $call_server_ip, Redirect comando no insertado\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel no está activo en $server_ip, Redirect comando no insertado\n"; + echo "Channel $channel no está activo en $server_ip, Redirect comando no insertado\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel no está activo en $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando enviado a Canal $channel and \nExtraCanal $extrachannel\n to $exten en $server_ip\n"; + echo "RedirectXtra comando enviado a Canal $channel and \nExtraChannel $extrachannel\n to $exten en $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten en $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando enviado a Canal $channel en $call_server_ip and \nExtraCanal $extrachannel\n to $exten en $server_ip\n"; + echo "RedirectXtra comando enviado a Canal $channel en $call_server_ip and \nExtraChannel $extrachannel\n to $exten en $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Una de estas variables No es válido:\n"; - echo "Canal $channel debe ser mayor de 2 caracteres\n"; + echo "Channel $channel debe ser mayor de 2 caracteres\n"; echo "queryCID $queryCID debe ser mayor de 14 caracteres\n"; echo "exten $exten debe ser fijado\n"; echo "ext_context $ext_context debe ser fijado\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel no está activo en $server_ip, Redirect comando no insertado\n"; + echo "Channel $channel no está activo en $server_ip, Redirect comando no insertado\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel No es válido or queryCID $queryCID No es válido or filename: $filename No es válido, $ACTION comando no insertado\n"; + echo "Channel $channel No es válido or queryCID $queryCID No es válido or filename: $filename No es válido, $ACTION comando no insertado\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel no está activo en $server_ip, $ACTION comando no insertado\n"; + echo "Channel $channel no está activo en $server_ip, $ACTION comando no insertado\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel No es válido or exten $exten No es válido or filename: $filename No es válido, $ACTION comando no insertado\n"; + echo "Channel $channel No es válido or exten $exten No es válido or filename: $filename No es válido, $ACTION comando no insertado\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_es/park_calls_display.php b/LANG_www/agc_es/park_calls_display.php index 0e512d2b..53d9a015 100644 --- a/LANG_www/agc_es/park_calls_display.php +++ b/LANG_www/agc_es/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/timeclock.php b/LANG_www/agc_es/timeclock.php index 389c84d8..a6845e7f 100644 --- a/LANG_www/agc_es/timeclock.php +++ b/LANG_www/agc_es/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='COMIENZO', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='COMIENZO'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'COMIENZO') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30segundos of your last login/logout + ### You cannot log in or out within 30 segundos of your last login/logout $VDdisplayMESSAGE = "No puede iniciar sesión o en un plazo de 30 segundos de su última conexión o desconexión"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOSALIR') or ($status=='COMIENZO') or ($status=='SALIR') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Que en la sesión$NOW_TIME
Cantidad de tiempo que se han registrado en:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='SALIR', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='SALIR', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='SALIR', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOSALIR') or ($status=='COMIENZO') or ($status=='SALIR') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERROR: timeclock entrada de registro ya realizados:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOSALIR') or ($status=='COMIENZO') or ($status=='SALIR') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Vez desde que se conectó por última vez en:$totTIME_HMS"; $log_action = 'login'; @@ -377,8 +377,8 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Cantidad de tiempo que se han registrado en:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'SALIR'; - $LOGtimeMESSAGE = "Iniciado la sesión en que usted en: $last_action_date
Cantidad de tiempo que se han registrado en:$totTIME_HMS

Haga clic a continuación para acceder SALIR-out"; + $button_name = 'LOGOUT'; + $LOGtimeMESSAGE = "Iniciado la sesión en que usted en: $last_action_date
Cantidad de tiempo que se han registrado en:$totTIME_HMS

Haga clic a continuación para acceder LOGOUT-out"; } echo"\n"; diff --git a/LANG_www/agc_es/vdc_db_query.php b/LANG_www/agc_es/vdc_db_query.php index 2792deeb..6e09a40f 100644 --- a/LANG_www/agc_es/vdc_db_query.php +++ b/LANG_www/agc_es/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('SALIR',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("COMIENZO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("COMIENZO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID No es válido\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID No es válido\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 segundos, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_PARADA|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|GRABACIÓN_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a SALIR record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','SALIR','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### COMIENZO Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### COMIENZO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_es/vicidial.php b/LANG_www/agc_es/vicidial.php index 7a22f754..f73c7217 100644 --- a/LANG_www/agc_es/vicidial.php +++ b/LANG_www/agc_es/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls en hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsegundos for campaign call and agent stats + $campagentstatctmax = '3'; # Number of segundos for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name en login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups en campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Colgar al Cliente $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TeléfonoSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT DIAL by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('SALIR',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "USTED DEBE ENTRAR A LA PRIMERA TIMECLOCK
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("COMIENZO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("COMIENZO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Canal: $row[1]
LlamadorID: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Canal=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "A MEDIDA - \n"; + echo "CUSTOM - \n"; echo "
Número Marcado: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $LlamadorID_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TeléfonoSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TeléfonoSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### COMIENZO SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsegundos counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call segundos counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'A MEDIDAER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_SALIR') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + 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"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // 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 + " UID: " + CIDcheck + "   Espeerar al Ring... " + MD_ring_secondS + " segundos"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINICIAR_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') || (quick_transfer_button == 'PREINICIAR_3') || (quick_transfer_button == 'PREINICIAR_4') || (quick_transfer_button == 'PREINICIAR_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"TRANSFERENCIA"; - if (quick_transfer_button == 'PREINICIAR_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINICIAR_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINICIAR_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINICIAR_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINICIAR_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTeléfonoE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'SALIR') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Canal has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINICIAR_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINICIAR_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') || (quick_transfer_button == 'PREINICIAR_3') || (quick_transfer_button == 'PREINICIAR_4') || (quick_transfer_button == 'PREINICIAR_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"TRANSFERENCIA"; - if (quick_transfer_button == 'PREINICIAR_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINICIAR_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINICIAR_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINICIAR_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINICIAR_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLCOLGAR&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTeléfonoE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTeléfonoE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "A MEDIDAER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"SALIR"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE SALIR LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"SALIR"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Recarga the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Recarga the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "NOTIFICACIÓN TIMER: " + timer_action_seconds + "segundos

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "NOTIFICACIÓN TIMER: " + timer_action_seconds + " segundos

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"TRANSFERENCIA"; } - if ( (quick_transfer_button == 'PREINICIAR_1') || (quick_transfer_button == 'PREINICIAR_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"TRANSFERENCIA"; } @@ -10457,7 +10486,7 @@ echo "\n";
-segundos: + segundos:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - REINICIAR | + REINICIAR | ENVIAR



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- REINICIAR | + REINICIAR | ENVIAR



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Canal - Canal + Canal + Canal MI SERVICIO REPETIDO SOLAMENTE
";} diff --git a/LANG_www/agc_es/voicemail_check.php b/LANG_www/agc_es/voicemail_check.php index 5000b441..9d0b97d6 100644 --- a/LANG_www/agc_es/voicemail_check.php +++ b/LANG_www/agc_es/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/active_list_refresh.php b/LANG_www/agc_fr/active_list_refresh.php index 95bd4142..0d81835a 100644 --- a/LANG_www/agc_fr/active_list_refresh.php +++ b/LANG_www/agc_fr/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_fr/astguiclient.php b/LANG_www/agc_fr/astguiclient.php index a95ff105..fdfb77f3 100644 --- a/LANG_www/agc_fr/astguiclient.php +++ b/LANG_www/agc_fr/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR RACCROCHER/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR RACCROCHER/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "APPELS EN COURS SUR CE TELEPHONE:
"; + var live_calls_HTML = "APPELS EN COURS SUR CE TELEPHONE:
#CANAL CLIENTCANAL DISTANTENREGISTREMENTRACCROCHERTRANSFERTMISE EN ATT
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CANAL CLIENTCANAL DISTANTRECORDRACCROCHERTRANSFERTMISE EN ATT
" + var out_log_HTML = "
# APPEL DATE/TIMENOMBRELONGUEUR (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# APPEL DATE/TIMENOMBRELENGTH (M:SS)
" + var in_log_HTML = "
# APPEL DATE/TIMEIN-NOMBREAPPELANTLONGUEUR
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# APPEL DATE/TIMEIN-NOMBREAPPELANTLENGTH
TRUNK RACCROCHER

+
TRUNK HANGUP

Active Trunks Menu
Raccrocher le Faisceau   |   Intercepter le Faisceau   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
TRANSFERT D'APPEL EN COURS
Canal à transférer: Canal
TRANSFERT D'APPEL EN COURS
Canal à transférer: Channel
Extensions:
Extensions

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Composer une Extension LOCALE
Téléphone appelant de: Canal
Composer une Extension LOCALE
Téléphone appelant de: Channel
Extensions:
Extensions

@@ -2839,7 +2839,7 @@ echo "\n";
-ARRÊT | DEBUT     Vitesse de rafraichissement: 1000 ms Plus rapidement | Plus lentement

+STOP | START     Vitesse de rafraichissement: 1000 ms Plus rapidement | Plus lentement

Initialisation..
Extensions Actives
diff --git a/LANG_www/agc_fr/call_log_display.php b/LANG_www/agc_fr/call_log_display.php index 46d08fdc..b31579b9 100644 --- a/LANG_www/agc_fr/call_log_display.php +++ b/LANG_www/agc_fr/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/conf_exten_check.php b/LANG_www/agc_fr/conf_exten_check.php index 14e91144..dee740a4 100644 --- a/LANG_www/agc_fr/conf_exten_check.php +++ b/LANG_www/agc_fr/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is sur is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|DEBUT",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_DÉCONNEXION';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Statut: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$CanalA[$counter] ~"; - # echo "$CanalA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/inbound_popup.php b/LANG_www/agc_fr/inbound_popup.php index b9caf9bb..f5c0101a 100644 --- a/LANG_www/agc_fr/inbound_popup.php +++ b/LANG_www/agc_fr/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/live_exten_check.php b/LANG_www/agc_fr/live_exten_check.php index 6d0bee78..a20eefa0 100644 --- a/LANG_www/agc_fr/live_exten_check.php +++ b/LANG_www/agc_fr/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "CanalA: $ChanneLA[$counter] ~"; - echo "CanalB: $ChanneLB[$counter] ~"; - echo "CanalBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/manager_send.php b/LANG_www/agc_fr/manager_send.php index b65fac24..9d690c25 100644 --- a/LANG_www/agc_fr/manager_send.php +++ b/LANG_www/agc_fr/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "extenName $extenName est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "extenName $extenName est obligatoire\n"; echo "exten $exten est obligatoire\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Canal $channel est invalide or queryCID $queryCID est invalide, Hangup commande non insérée\n"; + echo "Channel $channel est invalide or queryCID $queryCID est invalide, Hangup commande non insérée\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Canal $channel n'est pas en ligne sur $call_server_ip, Hangup commande non insérée $rowx[0]\n$stmt\n"; + echo "Channel $channel n'est pas en ligne sur $call_server_ip, Hangup commande non insérée $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Canal $channel in use by another agent sur $call_server_ip, Hangup commande non insérée $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent sur $call_server_ip, Hangup commande non insérée $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "extenName $extenName est obligatoire\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "extenName $extenName est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "extenName $extenName est obligatoire\n"; echo "exten $exten est obligatoire\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; - echo "ExtraCanal $extrachannel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; + echo "ExtraChannel $extrachannel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel n'est pas en ligne sur $call_server_ip, Redirect commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $call_server_ip, Redirect commande non insérée\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel n'est pas en ligne sur $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel n'est pas en ligne sur $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; - echo "ExtraCanal $extrachannel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; + echo "ExtraChannel $extrachannel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canal $channel n'est pas en ligne sur $call_server_ip, Redirect commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $call_server_ip, Redirect commande non insérée\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel n'est pas en ligne sur $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canal $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel n'est pas en ligne sur $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra commande envoyée pour Canal $channel and \nExtraCanal $extrachannel\n to $exten sur $server_ip\n"; + echo "RedirectXtra commande envoyée pour Canal $channel and \nExtraChannel $extrachannel\n to $exten sur $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten sur $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra commande envoyée pour Canal $channel sur $call_server_ip and \nExtraCanal $extrachannel\n to $exten sur $server_ip\n"; + echo "RedirectXtra commande envoyée pour Canal $channel sur $call_server_ip and \nExtraChannel $extrachannel\n to $exten sur $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Une de ces variables est invalide:\n"; - echo "Canal $channel doit avoir plus de 2 caractères \n"; + echo "Channel $channel doit avoir plus de 2 caractères \n"; echo "queryCID $queryCID doit avoir plus de 14 caractères \n"; echo "exten $exten est obligatoire\n"; echo "ext_context $ext_context est obligatoire\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $server_ip, Redirect commande non insérée\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel est invalide or queryCID $queryCID est invalide or filename: $filename est invalide, $ACTION commande non insérée\n"; + echo "Channel $channel est invalide or queryCID $queryCID est invalide or filename: $filename est invalide, $ACTION commande non insérée\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Canal $channel n'est pas en ligne sur $server_ip, $ACTION commande non insérée\n"; + echo "Channel $channel n'est pas en ligne sur $server_ip, $ACTION commande non insérée\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canal $channel est invalide or exten $exten est invalide or filename: $filename est invalide, $ACTION commande non insérée\n"; + echo "Channel $channel est invalide or exten $exten est invalide or filename: $filename est invalide, $ACTION commande non insérée\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_fr/park_calls_display.php b/LANG_www/agc_fr/park_calls_display.php index e14563f4..64c8dc1a 100644 --- a/LANG_www/agc_fr/park_calls_display.php +++ b/LANG_www/agc_fr/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/timeclock.php b/LANG_www/agc_fr/timeclock.php index 1d14200a..0913900b 100644 --- a/LANG_www/agc_fr/timeclock.php +++ b/LANG_www/agc_fr/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='DEBUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='DEBUT'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'DEBUT') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30secondes of your last login/logout + ### You cannot log in or out within 30 secondes of your last login/logout $VDdisplayMESSAGE = "Vous ne pouvez pas vous connecter ou dans un délai de 30 secondes de votre dernière connexion ou déconnexion"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTODÉCONNEXION') or ($status=='DEBUT') or ($status=='DÉCONNEXION') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Vous vous êtes connecté à$NOW_TIME
Montant de temps vous avez été enregistrés dans:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='DÉCONNEXION', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='DÉCONNEXION', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='DÉCONNEXION', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTODÉCONNEXION') or ($status=='DEBUT') or ($status=='DÉCONNEXION') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERREUR: timeclock entrée de journal déjà fait:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTODÉCONNEXION') or ($status=='DEBUT') or ($status=='DÉCONNEXION') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Temps écoulé depuis la dernière session ont été vous-en:$totTIME_HMS"; $log_action = 'login'; @@ -377,8 +377,8 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Montant de temps vous avez été enregistrés dans:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'DÉCONNEXION'; - $LOGtimeMESSAGE = "Vous vous êtes inscrit en ligne à: $last_action_date
Montant de temps vous avez été enregistrés dans:$totTIME_HMS

Cliquez ci-dessous pour vous connecter DÉCONNEXION-out"; + $button_name = 'LOGOUT'; + $LOGtimeMESSAGE = "Vous vous êtes inscrit en ligne à: $last_action_date
Montant de temps vous avez été enregistrés dans:$totTIME_HMS

Cliquez ci-dessous pour vous connecter LOGOUT-out"; } echo"\n"; diff --git a/LANG_www/agc_fr/vdc_db_query.php b/LANG_www/agc_fr/vdc_db_query.php index 03226f50..c6bfd79d 100644 --- a/LANG_www/agc_fr/vdc_db_query.php +++ b/LANG_www/agc_fr/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('DÉCONNEXION',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("DEBUT|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("DEBUT|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID est invalide\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID est invalide\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 secondes, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_ARRÊT|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|ENREGISTREMENT_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a DÉCONNEXION record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','DÉCONNEXION','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### DEBUT Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### DEBUT QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_fr/vicidial.php b/LANG_www/agc_fr/vicidial.php index fcf7013d..bc313c16 100644 --- a/LANG_www/agc_fr/vicidial.php +++ b/LANG_www/agc_fr/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls sur hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsecondes for campaign call and agent stats + $campagentstatctmax = '3'; # Number of secondes for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name sur login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups sur campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Raccrocher $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TéléphoneSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT COMPOSER by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('DÉCONNEXION',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "Vous devez vous connecter pour timeclock LE PREMIER
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("DEBUT|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("DEBUT|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Canal: $row[1]
Appelant: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Canal=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "COUTUME - \n"; + echo "CUSTOM - \n"; echo "
Numéro Composé: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $Appelant_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TéléphoneSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TéléphoneSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### DEBUT SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsecondes counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call secondes counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'COUTUMEER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_DÉCONNEXION') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Appel Numéro 2nd.: TÉLÉPHONE PRINCIPAL or TELEPHONE 2nd. or ADRESSE3 or TERMINER LA SAISIE"; + var man_status = "Appel Numéro 2nd.: TÉLÉPHONE PRINCIPAL or TELEPHONE 2nd. or ADRESSE3 or TERMINER LA SAISIE"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Appeler: " + status_display_number + " UID: " + CIDcheck + "   Attente... " + MD_ring_secondS + "secondes"; + document.getElementById("MainStatuSSpan").innerHTML = " Appeler: " + status_display_number + " UID: " + CIDcheck + "   Attente... " + MD_ring_secondS + " secondes"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINITIALISATION_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINITIALISATION_1') || (quick_transfer_button == 'PREINITIALISATION_2') || (quick_transfer_button == 'PREINITIALISATION_3') || (quick_transfer_button == 'PREINITIALISATION_4') || (quick_transfer_button == 'PREINITIALISATION_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; - if (quick_transfer_button == 'PREINITIALISATION_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTéléphoneE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'DÉCONNEXION') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Canal has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PREINITIALISATION_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PREINITIALISATION_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PREINITIALISATION_1') || (quick_transfer_button == 'PREINITIALISATION_2') || (quick_transfer_button == 'PREINITIALISATION_3') || (quick_transfer_button == 'PREINITIALISATION_4') || (quick_transfer_button == 'PREINITIALISATION_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; - if (quick_transfer_button == 'PREINITIALISATION_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PREINITIALISATION_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLRACCROCHER&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTéléphoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTéléphoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "COUTUMEER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"DÉCONNEXION"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE DÉCONNEXION LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"DÉCONNEXION"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Rafraichir the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Rafraichir the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICATION: " + timer_action_seconds + "secondes

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICATION: " + timer_action_seconds + " secondes

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Quick"; } - if ( (quick_transfer_button == 'PREINITIALISATION_1') || (quick_transfer_button == 'PREINITIALISATION_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Quick"; } @@ -10457,7 +10486,7 @@ echo "\n";
-secondes: + secondes:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - REINITIALISATION | + REINITIALISATION | VALIDER



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- REINITIALISATION | + REINITIALISATION | VALIDER



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Canal - Canal + Canal + Canal RAPPELS PERSONNELS
";} diff --git a/LANG_www/agc_fr/voicemail_check.php b/LANG_www/agc_fr/voicemail_check.php index 3f979c5d..38fa7f95 100644 --- a/LANG_www/agc_fr/voicemail_check.php +++ b/LANG_www/agc_fr/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/active_list_refresh.php b/LANG_www/agc_it/active_list_refresh.php index 42773644..994fb9cb 100644 --- a/LANG_www/agc_it/active_list_refresh.php +++ b/LANG_www/agc_it/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_it/astguiclient.php b/LANG_www/agc_it/astguiclient.php index 249dd205..c7759742 100644 --- a/LANG_www/agc_it/astguiclient.php +++ b/LANG_www/agc_it/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR RIAGGANCIA/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR RIAGGANCIA/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "CHIAMATE IN CORSO SU QUESTO TELEFONO:
"; + var live_calls_HTML = "CHIAMATE IN CORSO SU QUESTO TELEFONO:
#CANALE CLIENTCANALE REMOTORegistrazioneRIAGGANCIATRASFATTESA
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CANALE CLIENTCANALE REMOTORECORDRIAGGANCIATRASFATTESA
" + var out_log_HTML = "
# DATA/ORA CHIAMATANUMEROLUNGHEZZA (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# DATA/ORA CHIAMATANUMEROLENGTH (M:SS)
" + var in_log_HTML = "
# DATA/ORA CHIAMATAIN-NUMEROCALLERIDLUNGHEZZA
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# DATA/ORA CHIAMATAIN-NUMEROCALLERIDLENGTH
TRUNK RIAGGANCIA

+
TRUNK HANGUP

Active Trunks Menu
Disconnetti il Trunk   |   Dirotta il Trunk   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
TRASFERIMENTO DELLA CHIAMATA IN CORSO
Canale trasferito: Canale
TRASFERIMENTO DELLA CHIAMATA IN CORSO
Canale trasferito: Channel
Interni:
Menu Interni

@@ -2772,7 +2772,7 @@ echo "\n"; - +
LOCAL Interni Dial
Chiamata proveniente da: Canale
LOCAL Interni Dial
Chiamata proveniente da: Channel
Interni:
Menu Interni

@@ -2839,7 +2839,7 @@ echo "\n";
-ARRESTO | INIZIO     Frequenza di refresh: 1000 ms Piu` veloce | Piu` lento

+STOP | START     Frequenza di refresh: 1000 ms Piu` veloce | Piu` lento

Inizializzazione..
Interni Attivi
diff --git a/LANG_www/agc_it/call_log_display.php b/LANG_www/agc_it/call_log_display.php index d20de4cb..1e8d6e86 100644 --- a/LANG_www/agc_it/call_log_display.php +++ b/LANG_www/agc_it/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/conf_exten_check.php b/LANG_www/agc_it/conf_exten_check.php index df5cfa1e..2496b77e 100644 --- a/LANG_www/agc_it/conf_exten_check.php +++ b/LANG_www/agc_it/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is su is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|INIZIO",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanaleA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanaleA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$CanaleA[$counter] ~"; - # echo "$CanaleA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/inbound_popup.php b/LANG_www/agc_it/inbound_popup.php index 886692ce..51416989 100644 --- a/LANG_www/agc_it/inbound_popup.php +++ b/LANG_www/agc_it/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/live_exten_check.php b/LANG_www/agc_it/live_exten_check.php index 4c73c549..0262a41e 100644 --- a/LANG_www/agc_it/live_exten_check.php +++ b/LANG_www/agc_it/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaleA: $ChanneLA[$counter] ~"; - echo "CanaleB: $ChanneLB[$counter] ~"; - echo "CanaleBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaleA: $ChanneLA[$counter] ~"; - echo "CanaleB: $ChanneLB[$counter] ~"; - echo "CanaleBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaleA: $ChanneLA[$counter] ~"; - echo "CanaleB: $ChanneLB[$counter] ~"; - echo "CanaleBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaleA: $ChanneLA[$counter] ~"; - echo "CanaleB: $ChanneLB[$counter] ~"; - echo "CanaleBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "CanaleA: $ChanneLA[$counter] ~"; - echo "CanaleB: $ChanneLB[$counter] ~"; - echo "CanaleBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/manager_send.php b/LANG_www/agc_it/manager_send.php index 0a878412..f4f118b6 100644 --- a/LANG_www/agc_it/manager_send.php +++ b/LANG_www/agc_it/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "extenName $extenName deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "extenName $extenName deve essere impostato\n"; echo "exten $exten deve essere impostato\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Canale $channel non e` valido or queryCID $queryCID non e` valido, Hangup comando non inserito\n"; + echo "Channel $channel non e` valido or queryCID $queryCID non e` valido, Hangup comando non inserito\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Canale $channel non e` attivo su $call_server_ip, Hangup comando non inserito $rowx[0]\n$stmt\n"; + echo "Channel $channel non e` attivo su $call_server_ip, Hangup comando non inserito $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Canale $channel in use by another agent su $call_server_ip, Hangup comando non inserito $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent su $call_server_ip, Hangup comando non inserito $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "extenName $extenName deve essere impostato\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "extenName $extenName deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "extenName $extenName deve essere impostato\n"; echo "exten $exten deve essere impostato\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; - echo "ExtraCanale $extrachannel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; + echo "ExtraChannel $extrachannel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canale $channel non e` attivo su $call_server_ip, Redirect comando non inserito\n"; + echo "Channel $channel non e` attivo su $call_server_ip, Redirect comando non inserito\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel non e` attivo su $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canale $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; + echo "Channel $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel non e` attivo su $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; - echo "ExtraCanale $extrachannel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; + echo "ExtraChannel $extrachannel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canale $channel non e` attivo su $call_server_ip, Redirect comando non inserito\n"; + echo "Channel $channel non e` attivo su $call_server_ip, Redirect comando non inserito\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel non e` attivo su $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canale $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; + echo "Channel $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel non e` attivo su $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando inviato per Canale $channel and \nExtraCanale $extrachannel\n to $exten su $server_ip\n"; + echo "RedirectXtra comando inviato per Canale $channel and \nExtraChannel $extrachannel\n to $exten su $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten su $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando inviato per Canale $channel su $call_server_ip and \nExtraCanale $extrachannel\n to $exten su $server_ip\n"; + echo "RedirectXtra comando inviato per Canale $channel su $call_server_ip and \nExtraChannel $extrachannel\n to $exten su $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Una di queste variabili non e` valido:\n"; - echo "Canale $channel deve avere piu' di 2 caratteri\n"; + echo "Channel $channel deve avere piu' di 2 caratteri\n"; echo "queryCID $queryCID deve avere piu' di 14 caratteri\n"; echo "exten $exten deve essere impostato\n"; echo "ext_context $ext_context deve essere impostato\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Canale $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; + echo "Channel $channel non e` attivo su $server_ip, Redirect comando non inserito\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canale $channel non e` valido or queryCID $queryCID non e` valido or filename: $filename non e` valido, $ACTION comando non inserito\n"; + echo "Channel $channel non e` valido or queryCID $queryCID non e` valido or filename: $filename non e` valido, $ACTION comando non inserito\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Canale $channel non e` attivo su $server_ip, $ACTION comando non inserito\n"; + echo "Channel $channel non e` attivo su $server_ip, $ACTION comando non inserito\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canale $channel non e` valido or exten $exten non e` valido or filename: $filename non e` valido, $ACTION comando non inserito\n"; + echo "Channel $channel non e` valido or exten $exten non e` valido or filename: $filename non e` valido, $ACTION comando non inserito\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_it/park_calls_display.php b/LANG_www/agc_it/park_calls_display.php index b3728be8..c5d2e0b7 100644 --- a/LANG_www/agc_it/park_calls_display.php +++ b/LANG_www/agc_it/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/timeclock.php b/LANG_www/agc_it/timeclock.php index 9f538fdb..8299312d 100644 --- a/LANG_www/agc_it/timeclock.php +++ b/LANG_www/agc_it/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='INIZIO', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='INIZIO'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'INIZIO') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30secondi of your last login/logout + ### You cannot log in or out within 30 secondi of your last login/logout $VDdisplayMESSAGE = "Non è possibile accedere o entro 30 secondi del tuo ultimo accesso o il logout"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOLOGOUT') or ($status=='INIZIO') or ($status=='LOGOUT') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOLOGOUT') or ($status=='INIZIO') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERRORE: orologio registro entrata già fatto:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOLOGOUT') or ($status=='INIZIO') or ($status=='LOGOUT') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Tempo dallultimo registrato in:$totTIME_HMS"; $log_action = 'login'; diff --git a/LANG_www/agc_it/vdc_db_query.php b/LANG_www/agc_it/vdc_db_query.php index e2731da7..bddc5156 100644 --- a/LANG_www/agc_it/vdc_db_query.php +++ b/LANG_www/agc_it/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -595,7 +604,7 @@ if ($ACTION == 'LogiNCamPaigns') } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("INIZIO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("INIZIO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID non e` valido\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID non e` valido\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 secondi, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_ARRESTO|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|Registrazione_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### INIZIO Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### INIZIO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_it/vicidial.php b/LANG_www/agc_it/vicidial.php index 04c7943e..2b8e6b4f 100644 --- a/LANG_www/agc_it/vicidial.php +++ b/LANG_www/agc_it/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls su hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsecondi for campaign call and agent stats + $campagentstatctmax = '3'; # Number of secondi for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name su login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups su campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Riaggancia il cliente $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefonoSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT CHIAMA by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("INIZIO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("INIZIO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1287,7 +1289,7 @@ echo "
Canale: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Canale=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "CLIENTE - \n"; + echo "CUSTOM - \n"; echo "
Numero chiamato: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefonoSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefonoSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1763,7 +1765,7 @@ else { $VICIDiaL_park_on_extension = "$park_ext"; $VICIDiaL_park_on_filename = "$park_file_name"; - echo "\n"; + echo "\n"; } echo "\n"; @@ -1771,7 +1773,7 @@ else if (strlen($web_form_address)>0) { $VICIDiaL_web_form_address = "$web_form_address"; - echo "\n"; + echo "\n"; } else { @@ -1785,7 +1787,7 @@ else if (strlen($web_form_address_two)>0) { $VICIDiaL_web_form_address_two = "$web_form_address_two"; - echo "\n"; + echo "\n"; } else { @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### INIZIO SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsecondi counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call secondi counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'CLIENTEER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Chiama Numero Altern.: NUMERO PRINCIPALE or NUMERO ALTERNATIVO or INDIRIZZO3 or Termina Contatto"; + var man_status = "Chiama Numero Altern.: NUMERO PRINCIPALE or NUMERO ALTERNATIVO or INDIRIZZO3 or Termina Contatto"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " In Chiamata: " + status_display_number + " UID: " + CIDcheck + "   In attesa del Ring... " + MD_ring_secondS + "secondi"; + document.getElementById("MainStatuSSpan").innerHTML = " In Chiamata: " + status_display_number + " UID: " + CIDcheck + "   In attesa del Ring... " + MD_ring_secondS + " secondi"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefonoE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Canale has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLRIAGGANCIA&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonoE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonoE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "CLIENTEER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Aggiorna the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Aggiorna the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICA: " + timer_action_seconds + "secondi

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICA: " + timer_action_seconds + " secondi

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"QUICK"; } - if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"QUICK"; } @@ -10457,7 +10486,7 @@ echo "\n";
-secondi: + secondi:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESET | + RESET | INVIA



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESET | + RESET | INVIA



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Canale - Canale + Canale + Canale CHIAMATABACK PERSONALE (nessun altro potra` richiamarlo)
";} @@ -10964,7 +10993,7 @@ if ( ($alt_phone_dialing) and ($auto_dial_level==0) ) FILE REGISTRAZIONE:

-ID Registrazione:
+ID RECORD:
Start Registrazione
diff --git a/LANG_www/agc_it/voicemail_check.php b/LANG_www/agc_it/voicemail_check.php index b119c033..e30cc236 100644 --- a/LANG_www/agc_it/voicemail_check.php +++ b/LANG_www/agc_it/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/active_list_refresh.php b/LANG_www/agc_nl/active_list_refresh.php index 2b789618..98a5d753 100644 --- a/LANG_www/agc_nl/active_list_refresh.php +++ b/LANG_www/agc_nl/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_nl/astguiclient.php b/LANG_www/agc_nl/astguiclient.php index e5f2057c..eb360da4 100644 --- a/LANG_www/agc_nl/astguiclient.php +++ b/LANG_www/agc_nl/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR OPHANGEN/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR OPHANGEN/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "LIVE GESPREKKEN OP DEZE TELEFOON:
"; + var live_calls_HTML = "LIVE GESPREKKEN OP DEZE TELEFOON:
#CLIENT KANAALREMOTE KANAALOPENEMENOPHANGENXFERPARKEER
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CLIENT KANAALREMOTE KANAALRECORDOPHANGENXFERPARKEER
" + var out_log_HTML = "
# DATUM\/TIJD GESPREKNUMMERLENGTE (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# DATUM\/TIJD GESPREKNUMMERLENGTH (M:SS)
" + var in_log_HTML = "
# DATUM\/TIJD GESPREKINKOMEND-NUMMERCALLERIDLENGTE
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# DATUM\/TIJD GESPREKINKOMEND-NUMMERCALLERIDLENGTH
TRUNK OPHANGEN

+
TRUNK HANGUP

Active Trunks Menu
Trunk Ophangen   |   Trunk Kapen   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
LIVE GESPREK DOORSCHAKELEN
Doorschakelkanaal: Kanaal
LIVE GESPREK DOORSCHAKELEN
Doorschakelkanaal: Channel
Extenties:
Extentie Menu

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Bel Lokale Extenties
Telefoon belt vanaf: Kanaal
Bel Lokale Extenties
Telefoon belt vanaf: Channel
Extenties:
Extentie Menu

diff --git a/LANG_www/agc_nl/call_log_display.php b/LANG_www/agc_nl/call_log_display.php index 2faaa4d1..e66935ab 100644 --- a/LANG_www/agc_nl/call_log_display.php +++ b/LANG_www/agc_nl/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/conf_exten_check.php b/LANG_www/agc_nl/conf_exten_check.php index cff7c2f2..03451858 100644 --- a/LANG_www/agc_nl/conf_exten_check.php +++ b/LANG_www/agc_nl/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is op is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_UITLOGGEN';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Status: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanaalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanaalA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$KanaalA[$counter] ~"; - # echo "$KanaalA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/inbound_popup.php b/LANG_www/agc_nl/inbound_popup.php index b1a10113..27e2b6f4 100644 --- a/LANG_www/agc_nl/inbound_popup.php +++ b/LANG_www/agc_nl/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/live_exten_check.php b/LANG_www/agc_nl/live_exten_check.php index 5a2e8fba..6e3c3172 100644 --- a/LANG_www/agc_nl/live_exten_check.php +++ b/LANG_www/agc_nl/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanaalA: $ChanneLA[$counter] ~"; - echo "KanaalB: $ChanneLB[$counter] ~"; - echo "KanaalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanaalA: $ChanneLA[$counter] ~"; - echo "KanaalB: $ChanneLB[$counter] ~"; - echo "KanaalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanaalA: $ChanneLA[$counter] ~"; - echo "KanaalB: $ChanneLB[$counter] ~"; - echo "KanaalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanaalA: $ChanneLA[$counter] ~"; - echo "KanaalB: $ChanneLB[$counter] ~"; - echo "KanaalBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "KanaalA: $ChanneLA[$counter] ~"; - echo "KanaalB: $ChanneLB[$counter] ~"; - echo "KanaalBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/manager_send.php b/LANG_www/agc_nl/manager_send.php index 87382173..db564c75 100644 --- a/LANG_www/agc_nl/manager_send.php +++ b/LANG_www/agc_nl/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "extenName $extenName moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "extenName $extenName moet ingevuld zijn\n"; echo "exten $exten moet ingevuld zijn\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Kanaal $channel is niet geldig or queryCID $queryCID is niet geldig, Hangup commando niet uitgevoerd\n"; + echo "Channel $channel is niet geldig or queryCID $queryCID is niet geldig, Hangup commando niet uitgevoerd\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Kanaal $channel is niet live op $call_server_ip, Hangup commando niet uitgevoerd $rowx[0]\n$stmt\n"; + echo "Channel $channel is niet live op $call_server_ip, Hangup commando niet uitgevoerd $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Kanaal $channel in use by another agent op $call_server_ip, Hangup commando niet uitgevoerd $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent op $call_server_ip, Hangup commando niet uitgevoerd $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "extenName $extenName moet ingevuld zijn\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "extenName $extenName moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "extenName $extenName moet ingevuld zijn\n"; echo "exten $exten moet ingevuld zijn\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; - echo "ExtraKanaal $extrachannel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; + echo "ExtraChannel $extrachannel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanaal $channel is niet live op $call_server_ip, Redirect commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $call_server_ip, Redirect commando niet uitgevoerd\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel is niet live op $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanaal $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel is niet live op $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; - echo "ExtraKanaal $extrachannel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; + echo "ExtraChannel $extrachannel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanaal $channel is niet live op $call_server_ip, Redirect commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $call_server_ip, Redirect commando niet uitgevoerd\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel is niet live op $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanaal $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel is niet live op $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra commando verstuurd voor Kanaal $channel and \nExtraKanaal $extrachannel\n to $exten op $server_ip\n"; + echo "RedirectXtra commando verstuurd voor Kanaal $channel and \nExtraChannel $extrachannel\n to $exten op $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten op $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra commando verstuurd voor Kanaal $channel op $call_server_ip and \nExtraKanaal $extrachannel\n to $exten op $server_ip\n"; + echo "RedirectXtra commando verstuurd voor Kanaal $channel op $call_server_ip and \nExtraChannel $extrachannel\n to $exten op $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Een van deze variabelen is niet geldig:\n"; - echo "Kanaal $channel moet groter zijn dan 2 karakters\n"; + echo "Channel $channel moet groter zijn dan 2 karakters\n"; echo "queryCID $queryCID moet groter zijn dan 14 karakters\n"; echo "exten $exten moet ingevuld zijn\n"; echo "ext_context $ext_context moet ingevuld zijn\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Kanaal $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $server_ip, Redirect commando niet uitgevoerd\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanaal $channel is niet geldig or queryCID $queryCID is niet geldig or filename: $filename is niet geldig, $ACTION commando niet uitgevoerd\n"; + echo "Channel $channel is niet geldig or queryCID $queryCID is niet geldig or filename: $filename is niet geldig, $ACTION commando niet uitgevoerd\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Kanaal $channel is niet live op $server_ip, $ACTION commando niet uitgevoerd\n"; + echo "Channel $channel is niet live op $server_ip, $ACTION commando niet uitgevoerd\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanaal $channel is niet geldig or exten $exten is niet geldig or filename: $filename is niet geldig, $ACTION commando niet uitgevoerd\n"; + echo "Channel $channel is niet geldig or exten $exten is niet geldig or filename: $filename is niet geldig, $ACTION commando niet uitgevoerd\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_nl/park_calls_display.php b/LANG_www/agc_nl/park_calls_display.php index 6f6b3112..19477e07 100644 --- a/LANG_www/agc_nl/park_calls_display.php +++ b/LANG_www/agc_nl/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/timeclock.php b/LANG_www/agc_nl/timeclock.php index 4570ec51..5b7a756c 100644 --- a/LANG_www/agc_nl/timeclock.php +++ b/LANG_www/agc_nl/timeclock.php @@ -224,7 +224,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) } if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30seconden of your last login/logout + ### You cannot log in or out within 30 seconden of your last login/logout $VDdisplayMESSAGE = "Je kunt niet inloggen binnen 30 seconden na je laatste in- of uitlogpoging"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOUITLOGGEN') or ($status=='START') or ($status=='UITLOGGEN') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Je bent ingelogd op $NOW_TIME
Tijd die je ingelogd bent geweest: $totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='UITLOGGEN', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='UITLOGGEN', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='UITLOGGEN', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOUITLOGGEN') or ($status=='START') or ($status=='UITLOGGEN') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "FOUT: tijdslot log toevoeging reeds gemaakt: $status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOUITLOGGEN') or ($status=='START') or ($status=='UITLOGGEN') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Tijd sinds je laatste login: $totTIME_HMS"; $log_action = 'login'; @@ -377,7 +377,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Tijd dat je bent ingelogd$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'UITLOGGEN'; + $button_name = 'LOGOUT'; $LOGtimeMESSAGE = "Je bent ingelogd om: $last_action_date
Tijd dat je bent ingelogd$totTIME_HMS

Klik op UITLOGGEN om uit te loggen"; } diff --git a/LANG_www/agc_nl/vdc_db_query.php b/LANG_www/agc_nl/vdc_db_query.php index a10df158..96817ca9 100644 --- a/LANG_www/agc_nl/vdc_db_query.php +++ b/LANG_www/agc_nl/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,7 +598,7 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('UITLOGGEN',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID is niet geldig\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID is niet geldig\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 seconden, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|OPENEMEN_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a UITLOGGEN record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','UITLOGGEN','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_nl/vicidial.php b/LANG_www/agc_nl/vicidial.php index f83e6b01..01d0a938 100644 --- a/LANG_www/agc_nl/vicidial.php +++ b/LANG_www/agc_nl/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls op hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofseconden for campaign call and agent stats + $campagentstatctmax = '3'; # Number of seconden for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name op login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups op campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Ophangen Klant $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefoonSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT BEL by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('UITLOGGEN',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "JE MOET EERS INLOGGEN BIJ DE TIJDKLOK
"; @@ -1287,7 +1289,7 @@ echo "
Kanaal: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Kanaal=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "AANGEPAST - \n"; + echo "CUSTOM - \n"; echo "
Nummer Gekozen: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefoonSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefoonSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callseconden counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call seconden counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'AANGEPASTER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_UITLOGGEN') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Bel Alt. Tel. Nummer: HOOFD TEL. or ALT TEL. or ADRES3 or LEAD AFRONDEN"; + var man_status = "Bel Alt. Tel. Nummer: HOOFD TEL. or ALT TEL. or ADRES3 or LEAD AFRONDEN"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Bellen: " + status_display_number + " UID: " + CIDcheck + "   Wachten op Kiestoon... " + MD_ring_secondS + "seconden"; + document.getElementById("MainStatuSSpan").innerHTML = " Bellen: " + status_display_number + " UID: " + CIDcheck + "   Wachten op Kiestoon... " + MD_ring_secondS + " seconden"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefoonE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'UITLOGGEN') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Kanaal has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLOPHANGEN&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "AANGEPASTER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"UITLOGGEN"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE UITLOGGEN LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"UITLOGGEN"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Ververs the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Ververs the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER AANMELDING: " + timer_action_seconds + "seconden

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER AANMELDING: " + timer_action_seconds + " seconden

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Snelle"; } - if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Snelle"; } @@ -10457,7 +10486,7 @@ echo "\n";
-seconden: + seconden:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESET | + RESET | OPSLAAN



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESET | + RESET | OPSLAAN



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Kanaal - Kanaal + Kanaal + Kanaal ALLEEN MIJN TERUGBELLER
";} diff --git a/LANG_www/agc_nl/voicemail_check.php b/LANG_www/agc_nl/voicemail_check.php index 0954123a..341aa602 100644 --- a/LANG_www/agc_nl/voicemail_check.php +++ b/LANG_www/agc_nl/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/active_list_refresh.php b/LANG_www/agc_pl/active_list_refresh.php index 98e5b627..a58d52c9 100644 --- a/LANG_www/agc_pl/active_list_refresh.php +++ b/LANG_www/agc_pl/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_pl/astguiclient.php b/LANG_www/agc_pl/astguiclient.php index f6596f0e..9bd1e790 100644 --- a/LANG_www/agc_pl/astguiclient.php +++ b/LANG_www/agc_pl/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR ROZŁĄCZ/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR ROZŁĄCZ/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "AKTYWNE ROZMOWY Z TEGO TELEFONU:
"; + var live_calls_HTML = "AKTYWNE ROZMOWY Z TEGO TELEFONU:
#KANAŁ KLIENCKIKANAŁ ZDALNYNAGRYWAJROZŁĄCZTRANSFERPARKING
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#KANAŁ KLIENCKIKANAŁ ZDALNYRECORDROZŁĄCZTRANSFERPARKING
" + var out_log_HTML = "
# POŁĄCZENIE DATA/CZASNUMERDŁUGOŚĆ (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# POŁĄCZENIE DATA/CZASNUMERLENGTH (M:SS)
" + var in_log_HTML = "
# POŁĄCZENIE DATA/CZASIN-NUMERIDROZMÓWCYDŁUGOŚĆ
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# POŁĄCZENIE DATA/CZASIN-NUMERIDROZMÓWCYLENGTH
TRUNK ROZŁĄCZ

+
TRUNK HANGUP

Active Trunks Menu
Rozłącz międzymiastową   |   Przejmij międzymiastową   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
AKTYWNA ROZMOWA PRZENIESIONA
Kanały do przeniesienia: Kanał
AKTYWNA ROZMOWA PRZENIESIONA
Kanały do przeniesienia: Channel
NumerWenętrzny:
Menu rozszerzeń

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Wybieranie numerów wewnętrznych
Połączenie przychodzące z: Kanał
Wybieranie numerów wewnętrznych
Połączenie przychodzące z: Channel
NumerWenętrzny:
Menu rozszerzeń

@@ -2839,7 +2839,7 @@ echo "\n";
-BATENTE | START     Szybkość odswieżania: 1000 ms Szybciej | Wolniej

+STOP | START     Szybkość odswieżania: 1000 ms Szybciej | Wolniej

Inicjalizuje..
Aktywne numery wewnętrzne
diff --git a/LANG_www/agc_pl/call_log_display.php b/LANG_www/agc_pl/call_log_display.php index 6c5606f6..a697f15d 100644 --- a/LANG_www/agc_pl/call_log_display.php +++ b/LANG_www/agc_pl/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/conf_exten_check.php b/LANG_www/agc_pl/conf_exten_check.php index 8304beef..26b41dbd 100644 --- a/LANG_www/agc_pl/conf_exten_check.php +++ b/LANG_www/agc_pl/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is na is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_WYLOGUJ';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Status: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanałA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanałA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$KanałA[$counter] ~"; - # echo "$KanałA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/inbound_popup.php b/LANG_www/agc_pl/inbound_popup.php index 237549eb..8bffa4e5 100644 --- a/LANG_www/agc_pl/inbound_popup.php +++ b/LANG_www/agc_pl/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/live_exten_check.php b/LANG_www/agc_pl/live_exten_check.php index 306892f1..240d21f0 100644 --- a/LANG_www/agc_pl/live_exten_check.php +++ b/LANG_www/agc_pl/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanałA: $ChanneLA[$counter] ~"; - echo "KanałB: $ChanneLB[$counter] ~"; - echo "KanałBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanałA: $ChanneLA[$counter] ~"; - echo "KanałB: $ChanneLB[$counter] ~"; - echo "KanałBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanałA: $ChanneLA[$counter] ~"; - echo "KanałB: $ChanneLB[$counter] ~"; - echo "KanałBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanałA: $ChanneLA[$counter] ~"; - echo "KanałB: $ChanneLB[$counter] ~"; - echo "KanałBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "KanałA: $ChanneLA[$counter] ~"; - echo "KanałB: $ChanneLB[$counter] ~"; - echo "KanałBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/manager_send.php b/LANG_www/agc_pl/manager_send.php index ba07e9d9..06fb12c7 100644 --- a/LANG_www/agc_pl/manager_send.php +++ b/LANG_www/agc_pl/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "extenName $extenName musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "extenName $extenName musi być ustawiony\n"; echo "exten $exten musi być ustawiony\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Kanał $channel nie jest prawidłowy or queryCID $queryCID nie jest prawidłowy, Hangup komenda nie wstawiona\n"; + echo "Channel $channel nie jest prawidłowy or queryCID $queryCID nie jest prawidłowy, Hangup komenda nie wstawiona\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Kanał $channel nie jest aktywna na $call_server_ip, Hangup komenda nie wstawiona $rowx[0]\n$stmt\n"; + echo "Channel $channel nie jest aktywna na $call_server_ip, Hangup komenda nie wstawiona $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Kanał $channel in use by another agent na $call_server_ip, Hangup komenda nie wstawiona $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent na $call_server_ip, Hangup komenda nie wstawiona $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "extenName $extenName musi być ustawiony\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "extenName $extenName musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "extenName $extenName musi być ustawiony\n"; echo "exten $exten musi być ustawiony\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; - echo "ExtraKanał $extrachannel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; + echo "ExtraChannel $extrachannel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanał $channel nie jest aktywna na $call_server_ip, Redirect komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $call_server_ip, Redirect komenda nie wstawiona\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie jest aktywna na $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanał $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie jest aktywna na $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; - echo "ExtraKanał $extrachannel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; + echo "ExtraChannel $extrachannel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanał $channel nie jest aktywna na $call_server_ip, Redirect komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $call_server_ip, Redirect komenda nie wstawiona\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie jest aktywna na $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanał $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie jest aktywna na $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra komenda wysłana do Kanał $channel and \nExtraKanał $extrachannel\n to $exten na $server_ip\n"; + echo "RedirectXtra komenda wysłana do Kanał $channel and \nExtraChannel $extrachannel\n to $exten na $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten na $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra komenda wysłana do Kanał $channel na $call_server_ip and \nExtraKanał $extrachannel\n to $exten na $server_ip\n"; + echo "RedirectXtra komenda wysłana do Kanał $channel na $call_server_ip and \nExtraChannel $extrachannel\n to $exten na $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Jedna z tych zmiennych nie jest prawidłowy:\n"; - echo "Kanał $channel musi mieć więcej niż 2 znaki\n"; + echo "Channel $channel musi mieć więcej niż 2 znaki\n"; echo "queryCID $queryCID musi mieć więcje niż 14 znaków\n"; echo "exten $exten musi być ustawiony\n"; echo "ext_context $ext_context musi być ustawiony\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Kanał $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $server_ip, Redirect komenda nie wstawiona\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanał $channel nie jest prawidłowy or queryCID $queryCID nie jest prawidłowy or filename: $filename nie jest prawidłowy, $ACTION komenda nie wstawiona\n"; + echo "Channel $channel nie jest prawidłowy or queryCID $queryCID nie jest prawidłowy or filename: $filename nie jest prawidłowy, $ACTION komenda nie wstawiona\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Kanał $channel nie jest aktywna na $server_ip, $ACTION komenda nie wstawiona\n"; + echo "Channel $channel nie jest aktywna na $server_ip, $ACTION komenda nie wstawiona\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanał $channel nie jest prawidłowy or exten $exten nie jest prawidłowy or filename: $filename nie jest prawidłowy, $ACTION komenda nie wstawiona\n"; + echo "Channel $channel nie jest prawidłowy or exten $exten nie jest prawidłowy or filename: $filename nie jest prawidłowy, $ACTION komenda nie wstawiona\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_pl/park_calls_display.php b/LANG_www/agc_pl/park_calls_display.php index 8a1b8d5a..1b3785c6 100644 --- a/LANG_www/agc_pl/park_calls_display.php +++ b/LANG_www/agc_pl/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/timeclock.php b/LANG_www/agc_pl/timeclock.php index f25009b5..edc3f085 100644 --- a/LANG_www/agc_pl/timeclock.php +++ b/LANG_www/agc_pl/timeclock.php @@ -224,7 +224,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) } if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30sekundy of your last login/logout + ### You cannot log in or out within 30 sekundy of your last login/logout $VDdisplayMESSAGE = "Nie można zalogować się w ciągu 30 sekund od ostatniego logowania lub wylogowywania"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOWYLOGUJ') or ($status=='START') or ($status=='WYLOGUJ') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Możesz zalogować się na$NOW_TIME
Czas był zalogowany w:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='WYLOGUJ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='WYLOGUJ', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='WYLOGUJ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOWYLOGUJ') or ($status=='START') or ($status=='WYLOGUJ') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERROR: timeclock wpisu już wykonane:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOWYLOGUJ') or ($status=='START') or ($status=='WYLOGUJ') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Czas od twojego ostatniego logowania w:$totTIME_HMS"; $log_action = 'login'; @@ -377,8 +377,8 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Kwota czas były rejestrowane w:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'WYLOGUJ'; - $LOGtimeMESSAGE = "Możesz zalogować się na stronie: $last_action_date
Kwota czas były rejestrowane w:$totTIME_HMS

Kliknij poniżej, aby zalogować WYLOGUJ-out"; + $button_name = 'LOGOUT'; + $LOGtimeMESSAGE = "Możesz zalogować się na stronie: $last_action_date
Kwota czas były rejestrowane w:$totTIME_HMS

Kliknij poniżej, aby zalogować LOGOUT-out"; } echo"\n"; diff --git a/LANG_www/agc_pl/vdc_db_query.php b/LANG_www/agc_pl/vdc_db_query.php index 4432379c..51d8e832 100644 --- a/LANG_www/agc_pl/vdc_db_query.php +++ b/LANG_www/agc_pl/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,7 +598,7 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('WYLOGUJ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID nie jest prawidłowy\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID nie jest prawidłowy\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 sekundy, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_BATENTE|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|NAGRYWAJ_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a WYLOGUJ record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','WYLOGUJ','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pl/vicidial.php b/LANG_www/agc_pl/vicidial.php index 45c9702f..be7be0b7 100644 --- a/LANG_www/agc_pl/vicidial.php +++ b/LANG_www/agc_pl/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls na hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsekundy for campaign call and agent stats + $campagentstatctmax = '3'; # Number of sekundy for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name na login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups na campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Odłącz kilenta $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefonSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT WYBIERZ by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('WYLOGUJ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "Należy zalogować się do TIMECLOCK PIERWSZEJ
"; @@ -1287,7 +1289,7 @@ echo "
Kanał: $row[1]
IDRozmówcy: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Kanał=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "UŻYTKOWNIKA - \n"; + echo "CUSTOM - \n"; echo "
Wybierany numer: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $IDRozmówcy_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefonSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefonSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsekundy counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call sekundy counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'UŻYTKOWNIKAER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_WYLOGUJ') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Zadzwoń pod numer alt.: NUMER PODSTAWOWY or NUMER ALT. or ADRES3 or ZAKOŃCZ WPROWADZANIE DANYCH"; + var man_status = "Zadzwoń pod numer alt.: NUMER PODSTAWOWY or NUMER ALT. or ADRES3 or ZAKOŃCZ WPROWADZANIE DANYCH"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Dzwoni: " + status_display_number + " UID: " + CIDcheck + "   Czeka na dzwonek... " + MD_ring_secondS + "sekundy"; + document.getElementById("MainStatuSSpan").innerHTML = " Dzwoni: " + status_display_number + " UID: " + CIDcheck + "   Czeka na dzwonek... " + MD_ring_secondS + " sekundy"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefonE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'WYLOGUJ') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Kanał has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLROZŁĄCZ&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefonE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "UŻYTKOWNIKAER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"WYLOGUJ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE WYLOGUJ LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"WYLOGUJ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Odswież the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Odswież the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "ZAWIADOMIENIE TIMER: " + timer_action_seconds + "sekundy

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "ZAWIADOMIENIE TIMER: " + timer_action_seconds + " sekundy

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Szybka"; } - if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Szybka"; } @@ -10457,7 +10486,7 @@ echo "\n";
-sekundy: + sekundy:     @@ -10736,7 +10765,7 @@ if ($agent_display_dialable_leads > 0) - height=550>
Call Wrapup sekundy remaining in wrapup

+ height=550>
Call Wrapup sekundy remaining in wrapup



Finish Wrapup and Move On @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESET | + RESET | ZATWIERDŹ



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESET | + RESET | ZATWIERDŹ



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Kanał - Kanał + Kanał + Kanał TYLKO MOJE INNE TERMINY
";} diff --git a/LANG_www/agc_pl/voicemail_check.php b/LANG_www/agc_pl/voicemail_check.php index db993759..b1cef0f6 100644 --- a/LANG_www/agc_pl/voicemail_check.php +++ b/LANG_www/agc_pl/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/active_list_refresh.php b/LANG_www/agc_pt/active_list_refresh.php index 7f714668..59b162f7 100644 --- a/LANG_www/agc_pt/active_list_refresh.php +++ b/LANG_www/agc_pt/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_pt/astguiclient.php b/LANG_www/agc_pt/astguiclient.php index 6c4ce683..c3a1a4e0 100644 --- a/LANG_www/agc_pt/astguiclient.php +++ b/LANG_www/agc_pt/astguiclient.php @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "VIVO CONVIDA ESTE TELEFONE:
"; + var live_calls_HTML = "VIVO CONVIDA ESTE TELEFONE:
#CANALETA DO CLIENTECANALETA REMOTAREGISTROHANGUPXFERPARQUE
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#CANALETA DO CLIENTECANALETA REMOTARECORDHANGUPXFERPARQUE
" + var out_log_HTML = "
# DATE/TIME DA CHAMADANÚMEROCOMPRIMENTO (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# DATE/TIME DA CHAMADANÚMEROLENGTH (M:SS)
" + var in_log_HTML = "
# DATE/TIME DA CHAMADAIN-NÚMEROCALLERIDCOMPRIMENTO
" while (loop_ct < in_calls) { loop_ct++; @@ -2758,7 +2758,7 @@ echo "\n"; -
# DATE/TIME DA CHAMADAIN-NÚMEROCALLERIDLENGTH
+
TRANSFERÊNCIA VIVA DA CHAMADA
Canaleta a ser transferida: Canaleta
TRANSFERÊNCIA VIVA DA CHAMADA
Canaleta a ser transferida: Channel
Extensões:
Menu Das Extensões

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Seletor LOCAL Das Extensões
Telefone que chama-se de: Canaleta
Seletor LOCAL Das Extensões
Telefone que chama-se de: Channel
Extensões:
Menu Das Extensões

@@ -2839,7 +2839,7 @@ echo "\n";
-BATENTE | COMEÇO     Refresque a taxa: 1000 ms Mais rapidamente | Mais lento

+STOP | START     Refresque a taxa: 1000 ms Mais rapidamente | Mais lento

Inicializar..
Extensões Ativas
diff --git a/LANG_www/agc_pt/call_log_display.php b/LANG_www/agc_pt/call_log_display.php index 987e46e7..4160a7d4 100644 --- a/LANG_www/agc_pt/call_log_display.php +++ b/LANG_www/agc_pt/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/conf_exten_check.php b/LANG_www/agc_pt/conf_exten_check.php index fefc5e3f..ac6f93f0 100644 --- a/LANG_www/agc_pt/conf_exten_check.php +++ b/LANG_www/agc_pt/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is em is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|COMEÇO",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanaletaA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $CanaletaA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$CanaletaA[$counter] ~"; - # echo "$CanaletaA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/inbound_popup.php b/LANG_www/agc_pt/inbound_popup.php index 0aa52190..fcd7fd48 100644 --- a/LANG_www/agc_pt/inbound_popup.php +++ b/LANG_www/agc_pt/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/live_exten_check.php b/LANG_www/agc_pt/live_exten_check.php index 0552b782..8af6fd7b 100644 --- a/LANG_www/agc_pt/live_exten_check.php +++ b/LANG_www/agc_pt/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaletaA: $ChanneLA[$counter] ~"; - echo "CanaletaB: $ChanneLB[$counter] ~"; - echo "CanaletaBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaletaA: $ChanneLA[$counter] ~"; - echo "CanaletaB: $ChanneLB[$counter] ~"; - echo "CanaletaBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaletaA: $ChanneLA[$counter] ~"; - echo "CanaletaB: $ChanneLB[$counter] ~"; - echo "CanaletaBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "CanaletaA: $ChanneLA[$counter] ~"; - echo "CanaletaB: $ChanneLB[$counter] ~"; - echo "CanaletaBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "CanaletaA: $ChanneLA[$counter] ~"; - echo "CanaletaB: $ChanneLB[$counter] ~"; - echo "CanaletaBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/manager_send.php b/LANG_www/agc_pt/manager_send.php index 26aacd94..5c82b78f 100644 --- a/LANG_www/agc_pt/manager_send.php +++ b/LANG_www/agc_pt/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "extenName $extenName deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "extenName $extenName deve ser ajustado\n"; echo "exten $exten deve ser ajustado\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Canaleta $channel é inválido or queryCID $queryCID é inválido, Hangup comando não introduzido\n"; + echo "Channel $channel é inválido or queryCID $queryCID é inválido, Hangup comando não introduzido\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Canaleta $channel não está vivo em $call_server_ip, Hangup comando não introduzido $rowx[0]\n$stmt\n"; + echo "Channel $channel não está vivo em $call_server_ip, Hangup comando não introduzido $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Canaleta $channel in use by another agent em $call_server_ip, Hangup comando não introduzido $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent em $call_server_ip, Hangup comando não introduzido $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "extenName $extenName deve ser ajustado\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "extenName $extenName deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "extenName $extenName deve ser ajustado\n"; echo "exten $exten deve ser ajustado\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; - echo "ExtraCanaleta $extrachannel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; + echo "ExtraChannel $extrachannel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canaleta $channel não está vivo em $call_server_ip, Redirect comando não introduzido\n"; + echo "Channel $channel não está vivo em $call_server_ip, Redirect comando não introduzido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está vivo em $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canaleta $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; + echo "Channel $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está vivo em $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; - echo "ExtraCanaleta $extrachannel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; + echo "ExtraChannel $extrachannel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Canaleta $channel não está vivo em $call_server_ip, Redirect comando não introduzido\n"; + echo "Channel $channel não está vivo em $call_server_ip, Redirect comando não introduzido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está vivo em $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Canaleta $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; + echo "Channel $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel não está vivo em $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando emitido para Canaleta $channel and \nExtraCanaleta $extrachannel\n to $exten em $server_ip\n"; + echo "RedirectXtra comando emitido para Canaleta $channel and \nExtraChannel $extrachannel\n to $exten em $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten em $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra comando emitido para Canaleta $channel em $call_server_ip and \nExtraCanaleta $extrachannel\n to $exten em $server_ip\n"; + echo "RedirectXtra comando emitido para Canaleta $channel em $call_server_ip and \nExtraChannel $extrachannel\n to $exten em $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Uma destas variáveis é inválido:\n"; - echo "Canaleta $channel deve ser mais grande de 2 caráteres\n"; + echo "Channel $channel deve ser mais grande de 2 caráteres\n"; echo "queryCID $queryCID deve ser mais grande de 14 caráteres\n"; echo "exten $exten deve ser ajustado\n"; echo "ext_context $ext_context deve ser ajustado\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Canaleta $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; + echo "Channel $channel não está vivo em $server_ip, Redirect comando não introduzido\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canaleta $channel é inválido or queryCID $queryCID é inválido or filename: $filename é inválido, $ACTION comando não introduzido\n"; + echo "Channel $channel é inválido or queryCID $queryCID é inválido or filename: $filename é inválido, $ACTION comando não introduzido\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Canaleta $channel não está vivo em $server_ip, $ACTION comando não introduzido\n"; + echo "Channel $channel não está vivo em $server_ip, $ACTION comando não introduzido\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Canaleta $channel é inválido or exten $exten é inválido or filename: $filename é inválido, $ACTION comando não introduzido\n"; + echo "Channel $channel é inválido or exten $exten é inválido or filename: $filename é inválido, $ACTION comando não introduzido\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_pt/park_calls_display.php b/LANG_www/agc_pt/park_calls_display.php index 99c34930..42e595af 100644 --- a/LANG_www/agc_pt/park_calls_display.php +++ b/LANG_www/agc_pt/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/timeclock.php b/LANG_www/agc_pt/timeclock.php index 919ff2f4..82d84e2b 100644 --- a/LANG_www/agc_pt/timeclock.php +++ b/LANG_www/agc_pt/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='COMEÇO', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='COMEÇO'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'COMEÇO') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30segundos of your last login/logout + ### You cannot log in or out within 30 segundos of your last login/logout $VDdisplayMESSAGE = "Você não pode efetuar login ou para fora dentro de 30 segundos do seu último login ou logout"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOLOGOUT') or ($status=='COMEÇO') or ($status=='LOGOUT') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOLOGOUT') or ($status=='COMEÇO') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERRO: timeclock entrada do log já realizados:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOLOGOUT') or ($status=='COMEÇO') or ($status=='LOGOUT') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Vez desde que foi registrado em:$totTIME_HMS"; $log_action = 'login'; diff --git a/LANG_www/agc_pt/vdc_db_query.php b/LANG_www/agc_pt/vdc_db_query.php index 9cc1138e..03b020f7 100644 --- a/LANG_www/agc_pt/vdc_db_query.php +++ b/LANG_www/agc_pt/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -595,7 +604,7 @@ if ($ACTION == 'LogiNCamPaigns') } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("COMEÇO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("COMEÇO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID é inválido\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID é inválido\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 segundos, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_BATENTE|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|REGISTRO_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### COMEÇO Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### COMEÇO QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_pt/vicidial.php b/LANG_www/agc_pt/vicidial.php index c2616940..118e4cf7 100644 --- a/LANG_www/agc_pt/vicidial.php +++ b/LANG_www/agc_pt/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls em hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsegundos for campaign call and agent stats + $campagentstatctmax = '3'; # Number of segundos for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name em login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups em campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Cliente Do Hangup $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefoneSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT SELETOR by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("COMEÇO|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("COMEÇO|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Canaleta: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Canaleta=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "COSTUME - \n"; + echo "CUSTOM - \n"; echo "
O Número Marcou: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefoneSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefoneSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### COMEÇO SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsegundos counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call segundos counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'COSTUMEER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Número Alt Do Seletor: TELEFONE PRINCIPAL or ALT DEL TELEFONO or ENDEREÇO3 or REVESTIMENTO"; + var man_status = "Número Alt Do Seletor: TELEFONE PRINCIPAL or ALT DEL TELEFONO or ENDEREÇO3 or REVESTIMENTO"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Chamada: " + status_display_number + " UID: " + CIDcheck + "   Anel de espera... " + MD_ring_secondS + "segundos"; + document.getElementById("MainStatuSSpan").innerHTML = " Chamada: " + status_display_number + " UID: " + CIDcheck + "   Anel de espera... " + MD_ring_secondS + " segundos"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PRESTAURAÇÃO_1') || (quick_transfer_button == 'PRESTAURAÇÃO_2') || (quick_transfer_button == 'PRESTAURAÇÃO_3') || (quick_transfer_button == 'PRESTAURAÇÃO_4') || (quick_transfer_button == 'PRESTAURAÇÃO_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; - if (quick_transfer_button == 'PRESTAURAÇÃO_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefoneE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Canaleta has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PRESTAURAÇÃO_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PRESTAURAÇÃO_1') || (quick_transfer_button == 'PRESTAURAÇÃO_2') || (quick_transfer_button == 'PRESTAURAÇÃO_3') || (quick_transfer_button == 'PRESTAURAÇÃO_4') || (quick_transfer_button == 'PRESTAURAÇÃO_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; - if (quick_transfer_button == 'PRESTAURAÇÃO_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PRESTAURAÇÃO_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "COSTUMEER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Refresque the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Refresque the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "NOTIFICAÇÃO TIMER: " + timer_action_seconds + "segundos

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "NOTIFICAÇÃO TIMER: " + timer_action_seconds + " segundos

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; } - if ( (quick_transfer_button == 'PRESTAURAÇÃO_1') || (quick_transfer_button == 'PRESTAURAÇÃO_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"RÁPIDA"; } @@ -10457,7 +10486,7 @@ echo "\n";
-segundos: + segundos:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESTAURAÇÃO | + RESTAURAÇÃO | SUBMETA



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESTAURAÇÃO | + RESTAURAÇÃO | SUBMETA



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Canaleta - Canaleta + Canaleta + Canaleta MINHA RECHAMADA SOMENTE
";} @@ -10964,7 +10993,7 @@ if ( ($alt_phone_dialing) and ($auto_dial_level==0) ) LIMA DE GRAVAÇÃO:

-ID REGISTRO:
+ID RECORD:
Comece Gravar
diff --git a/LANG_www/agc_pt/voicemail_check.php b/LANG_www/agc_pt/voicemail_check.php index a874d40c..3c9455f2 100644 --- a/LANG_www/agc_pt/voicemail_check.php +++ b/LANG_www/agc_pt/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/active_list_refresh.php b/LANG_www/agc_ru/active_list_refresh.php index ca7c00aa..482e4c83 100644 --- a/LANG_www/agc_ru/active_list_refresh.php +++ b/LANG_www/agc_ru/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_ru/astguiclient.php b/LANG_www/agc_ru/astguiclient.php index c38ff648..12927b44 100644 --- a/LANG_www/agc_ru/astguiclient.php +++ b/LANG_www/agc_ru/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR РАЗЪЕДИНЕНИЕ/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR РАЗЪЕДИНЕНИЕ/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "ЖИВЫЕ ВЫЗОВЫ НА ЭТОТ ТЕЛЕФОН:
"; + var live_calls_HTML = "ЖИВЫЕ ВЫЗОВЫ НА ЭТОТ ТЕЛЕФОН:
#КАНАЛ КЛИЕНТАУДАЛЕННЫЙ КАНАЛЗАПИСЬРАЗЪЕДИНЕНИЕПЕРЕВОДПАРКОВКА
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#КАНАЛ КЛИЕНТАУДАЛЕННЫЙ КАНАЛRECORDРАЗЪЕДИНЕНИЕПЕРЕВОДПАРКОВКА
" + var out_log_HTML = "
# ЗВОНИТЬ ДАТА/ВРЕМЯНОМЕРДЛИНА (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# ЗВОНИТЬ ДАТА/ВРЕМЯНОМЕРLENGTH (M:SS)
" + var in_log_HTML = "
# ЗВОНИТЬ ДАТА/ВРЕМЯВ-НОМЕРВЫЗЫВАЮЩИЙIDДЛИНА
" while (loop_ct < in_calls) { loop_ct++; @@ -2468,7 +2468,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} start_all_refresh(); } function pause() // Pauses the refreshing of the lists - {active_display=2; display_message=" - ACTIVE DISPLAY ПАУЗПАD -";} + {active_display=2; display_message=" - ACTIVE DISPLAY PAUSED -";} function start() // resumes the refreshing of the lists {active_display=1; display_message='';} function faster() // lowers by 1000 milliseconds the time until the next refresh @@ -2734,7 +2734,7 @@ echo "\n"; -
# ЗВОНИТЬ ДАТА/ВРЕМЯВ-НОМЕРВЫЗЫВАЮЩИЙIDLENGTH
TRUNK РАЗЪЕДИНЕНИЕ

+
TRUNK HANGUP

Active Trunks Menu
Hangup Trunk   |   Hijack Trunk   |   @@ -2745,7 +2745,7 @@ echo "\n"; -
ЛОКАЛЬНВЙ РАЗЪЕДИНЕНИЕ

+
ЛОКАЛЬНВЙ HANGUP

Активное Локальное Меню
Hangup Local   |   Hijack Local   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
ПЕРЕВОД ЖИВОГО ВЫЗОВА
Канал в который будет переведен: Канал
ПЕРЕВОД ЖИВОГО ВЫЗОВА
Канал в который будет переведен: Channel
Расширения:
Меню Расширений

@@ -2772,7 +2772,7 @@ echo "\n"; - +
ЛОКАЛЬНОЕ Расширение Набора номера
Телефонный вызов от: Канал
ЛОКАЛЬНОЕ Расширение Набора номера
Телефонный вызов от: Channel
Расширения:
Меню Расширений

@@ -2839,7 +2839,7 @@ echo "\n";
-STOP | СТАРТ     Норма обновлений: 1000 ms Быстрее | Медленее

+STOP | START     Норма обновлений: 1000 ms Быстрее | Медленее

Инициализация..
Активные Расширения
diff --git a/LANG_www/agc_ru/call_log_display.php b/LANG_www/agc_ru/call_log_display.php index 61e10dab..ff70ef0f 100644 --- a/LANG_www/agc_ru/call_log_display.php +++ b/LANG_www/agc_ru/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/conf_exten_check.php b/LANG_www/agc_ru/conf_exten_check.php index cf896812..2029f8a5 100644 --- a/LANG_www/agc_ru/conf_exten_check.php +++ b/LANG_www/agc_ru/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is на is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|СТАРТ",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_ВЫХОД';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Статус: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $КаналA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $КаналA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$КаналA[$counter] ~"; - # echo "$КаналA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/inbound_popup.php b/LANG_www/agc_ru/inbound_popup.php index 032c32e1..8846450b 100644 --- a/LANG_www/agc_ru/inbound_popup.php +++ b/LANG_www/agc_ru/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/live_exten_check.php b/LANG_www/agc_ru/live_exten_check.php index 6226e934..c855647b 100644 --- a/LANG_www/agc_ru/live_exten_check.php +++ b/LANG_www/agc_ru/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "КаналA: $ChanneLA[$counter] ~"; - echo "КаналB: $ChanneLB[$counter] ~"; - echo "КаналBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "КаналA: $ChanneLA[$counter] ~"; - echo "КаналB: $ChanneLB[$counter] ~"; - echo "КаналBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "КаналA: $ChanneLA[$counter] ~"; - echo "КаналB: $ChanneLB[$counter] ~"; - echo "КаналBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "КаналA: $ChanneLA[$counter] ~"; - echo "КаналB: $ChanneLB[$counter] ~"; - echo "КаналBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "КаналA: $ChanneLA[$counter] ~"; - echo "КаналB: $ChanneLB[$counter] ~"; - echo "КаналBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/manager_send.php b/LANG_www/agc_ru/manager_send.php index 9b4deb81..843a5654 100644 --- a/LANG_www/agc_ru/manager_send.php +++ b/LANG_www/agc_ru/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "extenName $extenName должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "extenName $extenName должен быть установлен\n"; echo "exten $exten должен быть установлен\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Канал $channel это неправильно or queryCID $queryCID это неправильно, Hangup команда не введена\n"; + echo "Channel $channel это неправильно or queryCID $queryCID это неправильно, Hangup команда не введена\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Канал $channel это не активно на $call_server_ip, Hangup команда не введена $rowx[0]\n$stmt\n"; + echo "Channel $channel это не активно на $call_server_ip, Hangup команда не введена $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Канал $channel in use by another agent на $call_server_ip, Hangup команда не введена $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent на $call_server_ip, Hangup команда не введена $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "extenName $extenName должен быть установлен\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "extenName $extenName должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "extenName $extenName должен быть установлен\n"; echo "exten $exten должен быть установлен\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; - echo "ExtraКанал $extrachannel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; + echo "ExtraChannel $extrachannel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Канал $channel это не активно на $call_server_ip, Redirect команда не введена\n"; + echo "Channel $channel это не активно на $call_server_ip, Redirect команда не введена\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel это не активно на $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Канал $channel это не активно на $server_ip, Redirect команда не введена\n"; + echo "Channel $channel это не активно на $server_ip, Redirect команда не введена\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel это не активно на $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; - echo "ExtraКанал $extrachannel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; + echo "ExtraChannel $extrachannel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Канал $channel это не активно на $call_server_ip, Redirect команда не введена\n"; + echo "Channel $channel это не активно на $call_server_ip, Redirect команда не введена\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel это не активно на $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Канал $channel это не активно на $server_ip, Redirect команда не введена\n"; + echo "Channel $channel это не активно на $server_ip, Redirect команда не введена\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel это не активно на $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra посылать команду для Канал $channel and \nExtraКанал $extrachannel\n to $exten на $server_ip\n"; + echo "RedirectXtra посылать команду для Канал $channel and \nExtraChannel $extrachannel\n to $exten на $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten на $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra посылать команду для Канал $channel на $call_server_ip and \nExtraКанал $extrachannel\n to $exten на $server_ip\n"; + echo "RedirectXtra посылать команду для Канал $channel на $call_server_ip and \nExtraChannel $extrachannel\n to $exten на $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Одна из этих переменных это неправильно:\n"; - echo "Канал $channel должно быть больше чем 2 символа\n"; + echo "Channel $channel должно быть больше чем 2 символа\n"; echo "queryCID $queryCID должно быть больше чем 14 символов\n"; echo "exten $exten должен быть установлен\n"; echo "ext_context $ext_context должен быть установлен\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Канал $channel это не активно на $server_ip, Redirect команда не введена\n"; + echo "Channel $channel это не активно на $server_ip, Redirect команда не введена\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Канал $channel это неправильно or queryCID $queryCID это неправильно or filename: $filename это неправильно, $ACTION команда не введена\n"; + echo "Channel $channel это неправильно or queryCID $queryCID это неправильно or filename: $filename это неправильно, $ACTION команда не введена\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Канал $channel это не активно на $server_ip, $ACTION команда не введена\n"; + echo "Channel $channel это не активно на $server_ip, $ACTION команда не введена\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Канал $channel это неправильно or exten $exten это неправильно or filename: $filename это неправильно, $ACTION команда не введена\n"; + echo "Channel $channel это неправильно or exten $exten это неправильно or filename: $filename это неправильно, $ACTION команда не введена\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_ru/park_calls_display.php b/LANG_www/agc_ru/park_calls_display.php index 9b99ff0b..056fd3a8 100644 --- a/LANG_www/agc_ru/park_calls_display.php +++ b/LANG_www/agc_ru/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/timeclock.php b/LANG_www/agc_ru/timeclock.php index b2aab8e9..e8d8114f 100644 --- a/LANG_www/agc_ru/timeclock.php +++ b/LANG_www/agc_ru/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='СТАРТ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='СТАРТ'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'СТАРТ') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30секунды of your last login/logout + ### You cannot log in or out within 30 секунды of your last login/logout $VDdisplayMESSAGE = "Вы не можете войти или в течение 30 секунд после вашего последнего входа в систему или Logout"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOВЫХОД') or ($status=='СТАРТ') or ($status=='ВЫХОД') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Вы вошли на$NOW_TIME
Количество раз, когда вы были зарегистрированы в:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='ВЫХОД', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='ВЫХОД', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='ВЫХОД', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOВЫХОД') or ($status=='СТАРТ') or ($status=='ВЫХОД') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ОШИБКА: timeclock вход вход уже сделал:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOВЫХОД') or ($status=='СТАРТ') or ($status=='ВЫХОД') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Время с момента вашего последнего входа в:$totTIME_HMS"; $log_action = 'login'; @@ -377,8 +377,8 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Количество раз, когда вы вышли в:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'ВЫХОД'; - $LOGtimeMESSAGE = "Вы вошли в по адресу: $last_action_date
Количество раз, когда вы вышли в:$totTIME_HMS

Нажмите ВЫХОД для входа из"; + $button_name = 'LOGOUT'; + $LOGtimeMESSAGE = "Вы вошли в по адресу: $last_action_date
Количество раз, когда вы вышли в:$totTIME_HMS

Нажмите LOGOUT для входа из"; } echo"\n"; diff --git a/LANG_www/agc_ru/vdc_db_query.php b/LANG_www/agc_ru/vdc_db_query.php index 73ff7aa9..c0a24560 100644 --- a/LANG_www/agc_ru/vdc_db_query.php +++ b/LANG_www/agc_ru/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('ВЫХОД',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("СТАРТ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("СТАРТ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -1877,8 +1886,8 @@ if ($ACTION == 'manDiaLnextCaLL') $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); mysql_select_db("$queuemetrics_dbname", $linkB); - # UNПАУЗПАALL - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='UNПАУЗПАALL',serverid='$queuemetrics_log_id';"; + # UNPAUSEALL + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='UNPAUSEALL',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00038',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2287,8 +2296,8 @@ if ($ACTION == 'manDiaLonly') $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); mysql_select_db("$queuemetrics_dbname", $linkB); - # UNПАУЗПАALL - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='UNПАУЗПАALL',serverid='$queuemetrics_log_id';"; + # UNPAUSEALL + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='UNPAUSEALL',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00049',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID это неправильно\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID это неправильно\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 секунды, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3002,7 +3068,7 @@ if ($stage == "end") { if ($enable_queuemetrics_logging > 0) { - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='ПАУЗПАALL',serverid='$queuemetrics_log_id';"; + $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';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00083',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3075,7 +3141,7 @@ if ($stage == "end") { if ($enable_queuemetrics_logging > 0) { - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='ПАУЗПАALL',serverid='$queuemetrics_log_id';"; + $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';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00088',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|ЗАПИСЬ_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a ВЫХОД record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','ВЫХОД','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4537,7 +4603,7 @@ if ($ACTION == 'userLOGout') $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); mysql_select_db("$queuemetrics_dbname", $linkB); - # $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='$campaign',agent='Agent/$user',verb='ПАУЗПА',serverid='1';"; + # $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='$campaign',agent='Agent/$user',verb='PAUSE',serverid='1';"; # if ($DB) {echo "$stmt\n";} # # $rslt=mysql_query($stmt, $linkB); @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### СТАРТ Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5815,7 +5881,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ($enable_queuemetrics_logging > 0) { if ( (ereg('READY',$stage)) or (ereg('CLOSER',$stage)) ) {$QMstatus='UNPAUSEALL';} - if (ereg('ПАУЗПА',$stage)) {$QMstatus='ПАУЗПАALL';} + if (ereg('PAUSE',$stage)) {$QMstatus='PAUSEALL';} $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); mysql_select_db("$queuemetrics_dbname", $linkB); @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### СТАРТ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6025,7 +6091,7 @@ if ($ACTION == 'PauseCodeSubmit') $linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); mysql_select_db("$queuemetrics_dbname", $linkB); - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='ПАУЗПАREASON',serverid='$queuemetrics_log_id',data1='$status';"; + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='NONE',queue='NONE',agent='Agent/$user',verb='PAUSEREASON',serverid='$queuemetrics_log_id',data1='$status';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00177',$user,$server_ip,$session_name,$one_mysql_log);} @@ -6149,7 +6215,7 @@ if ($ACTION == 'AGENTSview') $loop_count++; } echo "
Канал: $row[1]
ВызывающийID: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Канал=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "ПОЛЬЗОВАТЕЛЬСКИЙ - \n"; + echo "CUSTOM - \n"; echo "
Набранный Номер: $row[8]

\n"; - echo "    -READY      -INCALL      -ПАУЗПАD  \n"; + echo "    -READY      -INCALL      -PAUSED  \n"; if ($comments=='AgentXferViewSelect') { echo "

Close Window "; @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_ru/vicidial.php b/LANG_www/agc_ru/vicidial.php index 8bbe3226..e86b91f9 100644 --- a/LANG_www/agc_ru/vicidial.php +++ b/LANG_www/agc_ru/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls на hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofсекунды for campaign call and agent stats + $campagentstatctmax = '3'; # Number of секунды for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name на login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups на campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Разъединить Клиента $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$ТелефонSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT НАБОР НОМЕРА by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('ВЫХОД',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "Вы должны войти в систему TIMECLOCK ПЕРВЫЙ
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("СТАРТ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("СТАРТ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1287,7 +1289,7 @@ echo "
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $ВызывающийID_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($ТелефонSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($ТелефонSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### СТАРТ SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -1999,12 +2001,12 @@ else $affected_rows = mysql_affected_rows($linkB); echo "\n"; - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtimE',call_id='NONE',queue='NONE',agent='Agent/$VD_login',verb='ПАУЗПАALL',serverid='$queuemetrics_log_id';"; + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtimE',call_id='NONE',queue='NONE',agent='Agent/$VD_login',verb='PAUSEALL',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'01046',$VD_login,$server_ip,$session_name,$one_mysql_log);} $affected_rows = mysql_affected_rows($linkB); - echo "\n"; + echo "\n"; mysql_close($linkB); mysql_select_db("$VARDB_database", $link); @@ -2039,12 +2041,12 @@ else $affected_rows = mysql_affected_rows($linkB); echo "\n"; - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtimE',call_id='NONE',queue='NONE',agent='Agent/$VD_login',verb='ПАУЗПАALL',serverid='$queuemetrics_log_id';"; + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtimE',call_id='NONE',queue='NONE',agent='Agent/$VD_login',verb='PAUSEALL',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'01049',$VD_login,$server_ip,$session_name,$one_mysql_log);} $affected_rows = mysql_affected_rows($linkB); - echo "\n"; + echo "\n"; mysql_close($linkB); mysql_select_db("$VARDB_database", $link); @@ -2140,12 +2142,12 @@ echo " 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'01063',$VD_login,$server_ip,$session_name,$one_mysql_log);} $affected_rows = mysql_affected_rows($linkB); - echo "\n"; + echo "\n"; mysql_close($linkB); mysql_select_db("$VARDB_database", $link); @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callсекунды counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call секунды counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'ПОЛЬЗОВАТЕЛЬСКИЙER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_ВЫХОД') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -3429,18 +3431,18 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var APIPausE_array = APIPausE.split("!"); if (APIPausE_ID == APIPausE_array[1]) { - // alert("ПАУЗПА ALREADY RECEIVED"); + // alert("PAUSE ALREADY RECEIVED"); } else { APIPausE_ID = APIPausE_array[1]; - if (APIPausE_array[0]=='ПАУЗПА') + if (APIPausE_array[0]=='PAUSE') { if (VD_live_customer_call==1) { // set to pause на next dispo document.vicidial_form.DispoSelectStop.checked=true; - // alert("Setting dispo to ПАУЗПА"); + // alert("Setting dispo to PAUSE"); } else { @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Набор Альт.Номера: ОСНОВНОЙ ТЕЛЕФОН or АЛЬТ. ТЕЛЕФОН or АДРЕСС 3 or ФИНИШ LEAD"; + var man_status = "Набор Альт.Номера: ОСНОВНОЙ ТЕЛЕФОН or АЛЬТ. ТЕЛЕФОН or АДРЕСС 3 or ФИНИШ LEAD"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Запрос: " + status_display_number + " UID: " + CIDcheck + "   Ожидание Кольца вызова... " + MD_ring_secondS + "секунды"; + document.getElementById("MainStatuSSpan").innerHTML = " Запрос: " + status_display_number + " UID: " + CIDcheck + "   Ожидание Кольца вызова... " + MD_ring_secondS + " секунды"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTТелефонE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'ВЫХОД') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Канал has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLРАЗЪЕДИНЕНИЕ&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTТелефонE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTТелефонE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7717,7 +7738,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} PauseCode_HTML = ''; document.vicidial_form.PauseCodeSelection.value = ''; var VD_pause_codes_ct_half = parseInt(VD_pause_codes_ct / 2); - PauseCode_HTML = "
ПАУЗПА CODE
"; + PauseCode_HTML = "
PAUSE CODE
"; var loop_ct = 0; while (loop_ct < VD_pause_codes_ct) { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "ПОЛЬЗОВАТЕЛЬСКИЙER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ВЫХОД"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE ВЫХОД LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ВЫХОД"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Обновление the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Обновление the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9365,7 +9386,7 @@ function phone_number_format(formatphone) { { if ( (AutoDialWaiting == 1) || (VD_live_customer_call==1) || (alt_dial_active==1) ) { - alert("ТЫ ДОЛЖЕН БЫТЬ ПАУЗПАD сменить группу"); + alert("ТЫ ДОЛЖЕН БЫТЬ PAUSED сменить группу"); } else { @@ -9388,7 +9409,7 @@ function phone_number_format(formatphone) { { if ( (AutoDialWaiting == 1) || (VD_live_customer_call==1) || (alt_dial_active==1) ) { - alert("ТЫ ДОЛЖЕН БЫТЬ ПАУЗПАD сменить группу"); + alert("ТЫ ДОЛЖЕН БЫТЬ PAUSED сменить группу"); } else { @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "ТАЙМЕР УВЕДОМЛЕНИЯ: " + timer_action_seconds + "секунды

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "ТАЙМЕР УВЕДОМЛЕНИЯ: " + timer_action_seconds + " секунды

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -9907,7 +9936,7 @@ else if (dispo_check_all_pause != '1') { document.vicidial_form.DispoSelectStop.checked=false; - alert("unchecking ПАУЗПА"); + alert("unchecking PAUSE"); } } else @@ -10070,7 +10099,7 @@ else start_all_refresh(); } function pause() // Pauses the refreshing of the lists - {active_display=2; display_message=" - ACTIVE DISPLAY ПАУЗПАD - ";} + {active_display=2; display_message=" - ACTIVE DISPLAY PAUSED - ";} function start() // resumes the refreshing of the lists {active_display=1; display_message='';} function faster() // lowers by 1000 milliseconds the time until the next refresh @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Быстрой"; } - if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Быстрой"; } @@ -10457,7 +10486,7 @@ echo "\n";
-секунды: + секунды:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESET | + RESET | SUBMIT



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESET | + RESET | SUBMIT



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Канал - Канал + Канал + Канал ТОЛЬКО МОИ ВЫЗОВBACK
";} diff --git a/LANG_www/agc_ru/voicemail_check.php b/LANG_www/agc_ru/voicemail_check.php index f775c5f5..8d28dba3 100644 --- a/LANG_www/agc_ru/voicemail_check.php +++ b/LANG_www/agc_ru/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/active_list_refresh.php b/LANG_www/agc_sk/active_list_refresh.php index 3f46525b..a9da0569 100644 --- a/LANG_www/agc_sk/active_list_refresh.php +++ b/LANG_www/agc_sk/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_sk/astguiclient.php b/LANG_www/agc_sk/astguiclient.php index 3efb17ec..a97c57ea 100644 --- a/LANG_www/agc_sk/astguiclient.php +++ b/LANG_www/agc_sk/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR POLOŹIŤ/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR POLOŹIŤ/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "ŽIVÉ HOVORY NA TOMTO TELEFÓNE:
"; + var live_calls_HTML = "ŽIVÉ HOVORY NA TOMTO TELEFÓNE:
#KLIENTSKÝ KANÁLVZDIALENÝ KANÁLZÁZNAMPOLOŹIŤPREPOJIŤZAPARKOVAŤ
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#KLIENTSKÝ KANÁLVZDIALENÝ KANÁLRECORDPOLOŹIŤPREPOJIŤZAPARKOVAŤ
" + var out_log_HTML = "
# DÁTUM HOVORU/ČASČÍSLODĹŽKA (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# DÁTUM HOVORU/ČASČÍSLOLENGTH (M:SS)
" + var in_log_HTML = "
# DÁTUM HOVORU/ČASV-ČÍSLEIDVOLAJÚCEHODĹŽKA
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# DÁTUM HOVORU/ČASV-ČÍSLEIDVOLAJÚCEHOLENGTH
TRUNK POLOŹIŤ

+
TRUNK HANGUP

Active Trunks Menu
Zložiť trunk   |   Capturar Trunk   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
PRESMEROVANIE ŽIVÉHO HOVORU
Kanál má byť presmerovaný: Kanál
PRESMEROVANIE ŽIVÉHO HOVORU
Kanál má byť presmerovaný: Channel
Pobočky:
Menu pobočiek

@@ -2772,7 +2772,7 @@ echo "\n"; - +
Volanie LOKÁLNYCH pobočiek
Volanie telefónu z: Kanál
Volanie LOKÁLNYCH pobočiek
Volanie telefónu z: Channel
Pobočky:
Menu pobočiek

@@ -2839,7 +2839,7 @@ echo "\n";
-ZASTAVIŤ | SPUSTIŤ     Doba obnovenia: 1000 ms Rýchlejšie | Pomalšie

+STOP | START     Doba obnovenia: 1000 ms Rýchlejšie | Pomalšie

Inicializovať..
Aktívne pobočky
diff --git a/LANG_www/agc_sk/call_log_display.php b/LANG_www/agc_sk/call_log_display.php index ac32a7cf..c628693c 100644 --- a/LANG_www/agc_sk/call_log_display.php +++ b/LANG_www/agc_sk/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/conf_exten_check.php b/LANG_www/agc_sk/conf_exten_check.php index 4e6869d6..b3395669 100644 --- a/LANG_www/agc_sk/conf_exten_check.php +++ b/LANG_www/agc_sk/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is na is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|SPUSTIŤ",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_ODHLÁSIŤ';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|Stav: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanálA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $KanálA[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$KanálA[$counter] ~"; - # echo "$KanálA[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/inbound_popup.php b/LANG_www/agc_sk/inbound_popup.php index 17d239a2..006fccbe 100644 --- a/LANG_www/agc_sk/inbound_popup.php +++ b/LANG_www/agc_sk/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/live_exten_check.php b/LANG_www/agc_sk/live_exten_check.php index 33c26162..3f2b511b 100644 --- a/LANG_www/agc_sk/live_exten_check.php +++ b/LANG_www/agc_sk/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanálA: $ChanneLA[$counter] ~"; - echo "KanálB: $ChanneLB[$counter] ~"; - echo "KanálBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanálA: $ChanneLA[$counter] ~"; - echo "KanálB: $ChanneLB[$counter] ~"; - echo "KanálBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanálA: $ChanneLA[$counter] ~"; - echo "KanálB: $ChanneLB[$counter] ~"; - echo "KanálBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "KanálA: $ChanneLA[$counter] ~"; - echo "KanálB: $ChanneLB[$counter] ~"; - echo "KanálBtrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "KanálA: $ChanneLA[$counter] ~"; - echo "KanálB: $ChanneLB[$counter] ~"; - echo "KanálBtrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/manager_send.php b/LANG_www/agc_sk/manager_send.php index 39574e30..7ab8d978 100644 --- a/LANG_www/agc_sk/manager_send.php +++ b/LANG_www/agc_sk/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "extenName $extenName musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "extenName $extenName musí byť nastavené\n"; echo "exten $exten musí byť nastavené\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "Kanál $channel Nie je správny or queryCID $queryCID Nie je správny, Hangup príkaz nebol vložený\n"; + echo "Channel $channel Nie je správny or queryCID $queryCID Nie je správny, Hangup príkaz nebol vložený\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "Kanál $channel nie je živá na $call_server_ip, Hangup príkaz nebol vložený $rowx[0]\n$stmt\n"; + echo "Channel $channel nie je živá na $call_server_ip, Hangup príkaz nebol vložený $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "Kanál $channel in use by another agent na $call_server_ip, Hangup príkaz nebol vložený $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent na $call_server_ip, Hangup príkaz nebol vložený $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "extenName $extenName musí byť nastavené\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "extenName $extenName musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "extenName $extenName musí byť nastavené\n"; echo "exten $exten musí byť nastavené\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; - echo "ExtraKanál $extrachannel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; + echo "ExtraChannel $extrachannel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanál $channel nie je živá na $call_server_ip, Redirect príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $call_server_ip, Redirect príkaz nebol vložený\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie je živá na $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanál $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie je živá na $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; - echo "ExtraKanál $extrachannel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; + echo "ExtraChannel $extrachannel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "Kanál $channel nie je živá na $call_server_ip, Redirect príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $call_server_ip, Redirect príkaz nebol vložený\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie je živá na $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "Kanál $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel nie je živá na $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra príkaz poslaný pre Kanál $channel and \nExtraKanál $extrachannel\n to $exten na $server_ip\n"; + echo "RedirectXtra príkaz poslaný pre Kanál $channel and \nExtraChannel $extrachannel\n to $exten na $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten na $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra príkaz poslaný pre Kanál $channel na $call_server_ip and \nExtraKanál $extrachannel\n to $exten na $server_ip\n"; + echo "RedirectXtra príkaz poslaný pre Kanál $channel na $call_server_ip and \nExtraChannel $extrachannel\n to $exten na $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "Jeden z týchto premených Nie je správny:\n"; - echo "Kanál $channel musí byť viac ako 2 znaky\n"; + echo "Channel $channel musí byť viac ako 2 znaky\n"; echo "queryCID $queryCID musí byť viac ako 14 znakov\n"; echo "exten $exten musí byť nastavené\n"; echo "ext_context $ext_context musí byť nastavené\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "Kanál $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $server_ip, Redirect príkaz nebol vložený\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanál $channel Nie je správny or queryCID $queryCID Nie je správny or filename: $filename Nie je správny, $ACTION príkaz nebol vložený\n"; + echo "Channel $channel Nie je správny or queryCID $queryCID Nie je správny or filename: $filename Nie je správny, $ACTION príkaz nebol vložený\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "Kanál $channel nie je živá na $server_ip, $ACTION príkaz nebol vložený\n"; + echo "Channel $channel nie je živá na $server_ip, $ACTION príkaz nebol vložený\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "Kanál $channel Nie je správny or exten $exten Nie je správny or filename: $filename Nie je správny, $ACTION príkaz nebol vložený\n"; + echo "Channel $channel Nie je správny or exten $exten Nie je správny or filename: $filename Nie je správny, $ACTION príkaz nebol vložený\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_sk/park_calls_display.php b/LANG_www/agc_sk/park_calls_display.php index b7e1e7b3..c78858d2 100644 --- a/LANG_www/agc_sk/park_calls_display.php +++ b/LANG_www/agc_sk/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/timeclock.php b/LANG_www/agc_sk/timeclock.php index e7a48c41..263b6d2f 100644 --- a/LANG_www/agc_sk/timeclock.php +++ b/LANG_www/agc_sk/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='SPUSTIŤ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='SPUSTIŤ'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != 'SPUSTIŤ') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30sekúnd of your last login/logout + ### You cannot log in or out within 30 sekúnd of your last login/logout $VDdisplayMESSAGE = "Nemôžete sa prihlásiť alebo sa do 30 sekúnd od vášho posledného prihlásenia alebo odhlásenie"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTOODHLÁSIŤ') or ($status=='SPUSTIŤ') or ($status=='ODHLÁSIŤ') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "Ste odhlásený na$NOW_TIME
Množstvo času, ste prihlásený-in:$totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='ODHLÁSIŤ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='ODHLÁSIŤ', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='ODHLÁSIŤ', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTOODHLÁSIŤ') or ($status=='SPUSTIŤ') or ($status=='ODHLÁSIŤ') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERROR: timeclock log vstupe už bolo dosiahnuté:$status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTOODHLÁSIŤ') or ($status=='SPUSTIŤ') or ($status=='ODHLÁSIŤ') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "Čas od Vášho posledného prihlásenia-in:$totTIME_HMS"; $log_action = 'login'; @@ -377,7 +377,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "Množstvo času, ktoré ste vykáceli-in:$totTIME_HMS"; $log_action = 'logout'; - $button_name = 'ODHLÁSIŤ'; + $button_name = 'LOGOUT'; $LOGtimeMESSAGE = "Ste prihlásený-in na adrese: $last_action_date
Množstvo času, ktoré ste vykáceli-in:$totTIME_HMS

Kliknite na Logout nižšie log-out"; } diff --git a/LANG_www/agc_sk/vdc_db_query.php b/LANG_www/agc_sk/vdc_db_query.php index 854f496e..d8d776e6 100644 --- a/LANG_www/agc_sk/vdc_db_query.php +++ b/LANG_www/agc_sk/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('ODHLÁSIŤ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("SPUSTIŤ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("SPUSTIŤ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID Nie je správny\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID Nie je správny\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 sekúnd, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_ZASTAVIŤ|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|ZÁZNAM_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a ODHLÁSIŤ record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','ODHLÁSIŤ','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### SPUSTIŤ Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### SPUSTIŤ QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_sk/vicidial.php b/LANG_www/agc_sk/vicidial.php index 41758510..bf553749 100644 --- a/LANG_www/agc_sk/vicidial.php +++ b/LANG_www/agc_sk/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls na hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number ofsekúnd for campaign call and agent stats + $campagentstatctmax = '3'; # Number of sekúnd for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name na login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups na campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Zložiť zákazníka $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$TelefónSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT VOLAŤ by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('ODHLÁSIŤ',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "Musíte sa prihlásiť do TIMECLOCK PRVEJ
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("SPUSTIŤ|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("SPUSTIŤ|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
Kanál: $row[1]
IDvolajúceho: $row[3]
Channel: $row[1]
CallerID: $row[3]
\n"; $phone = eregi_replace(".*\<","",$row[3]); @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_Kanál=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -316,7 +316,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_comment_c=$row[11]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_d=$row[12]"; $local_web_callerID_QUERY_STRING.="&callerID_comment_e=$row[13]"; - echo "UPRAVENÉ - \n"; + echo "CUSTOM - \n"; echo "
Volané číslo: $row[8]
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1698,7 +1700,7 @@ else $updater_check_enabled=$row[45]; $AFLogging_enabled=$row[46]; $QUEUE_ACTION_enabled=$row[47]; - $IDvolajúceho_popup_enabled=$row[48]; + $CallerID_popup_enabled=$row[48]; $voicemail_button_enabled=$row[49]; $enable_fast_refresh=$row[50]; $fast_refresh_rate=$row[51]; @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($TelefónSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($TelefónSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### SPUSTIŤ SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live callsekúnd counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call sekúnd counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3019,7 +3021,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {threeway_cid = campaign_cid;} if (three_way_call_cid == 'AGENT_PHONE') {threeway_cid = outbound_cid;} - if (three_way_call_cid == 'UPRAVENÉER') + if (three_way_call_cid == 'CUSTOMER') {threeway_cid = document.vicidial_form.phone_number.value;} if (three_way_call_cid == 'AGENT_CHOOSE') { @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_ODHLÁSIŤ') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Volať alternatívne telefónne číslo: ZÁKLADNÉ TEL. ČÍSLO or ALTERN. TELEFÓN or Adresa 3 or UKONCIT ZOZNAM KONTAKTOV"; + var man_status = "Volať alternatívne telefónne číslo: ZÁKLADNÉ TEL. ČÍSLO or ALTERN. TELEFÓN or Adresa 3 or UKONCIT ZOZNAM KONTAKTOV"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " Volané: " + status_display_number + " UID: " + CIDcheck + "   Čakanie na zvonenie... " + MD_ring_secondS + "sekúnd"; + document.getElementById("MainStatuSSpan").innerHTML = " Volané: " + status_display_number + " UID: " + CIDcheck + "   Čakanie na zvonenie... " + MD_ring_secondS + " sekúnd"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_1') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_2') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_3') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_4') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Rýchly"; - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTTelefónE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'ODHLÁSIŤ') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("Kanál has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'PZNOVU INCIALIZOVAŤ_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_1') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_2') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_3') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_4') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Rýchly"; - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALLPOLOŹIŤ&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefónE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTTelefónE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7752,7 +7773,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { VD_group_aliases_ct_half = (VD_group_aliases_ct_half - 1); GroupAlias_HTML = GroupAlias_HTML + "CAMPAIGN - " + campaign_cid + "

"; - GroupAlias_HTML = GroupAlias_HTML + "UPRAVENÉER - " + document.vicidial_form.phone_number.value + "

"; + GroupAlias_HTML = GroupAlias_HTML + "CUSTOMER - " + document.vicidial_form.phone_number.value + "

"; GroupAlias_HTML = GroupAlias_HTML + "AGENT_PHONE - " + outbound_cid + "

"; } var loop_ct = 0; @@ -8499,10 +8520,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ODHLÁSIŤ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); - alert("PLEASE CLICK THE ODHLÁSIŤ LINK TO LOG OUT NEXT TIME.\n"); + alert("PLEASE CLICK THE LOGOUT LINK TO LOG OUT NEXT TIME.\n"); } } @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"ODHLÁSIŤ"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Osviežiť the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// Osviežiť the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER OZNAM: " + timer_action_seconds + "sekúnd

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER OZNAM: " + timer_action_seconds + " sekúnd

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"Rýchly"; } - if ( (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_1') || (quick_transfer_button == 'PZNOVU INCIALIZOVAŤ_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"Rýchly"; } @@ -10457,7 +10486,7 @@ echo "\n";
-sekúnd: + sekúnd:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - ZNOVU INCIALIZOVAŤ | + ZNOVU INCIALIZOVAŤ | POTVRDIŤ



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- ZNOVU INCIALIZOVAŤ | + ZNOVU INCIALIZOVAŤ | POTVRDIŤ



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Kanál - Kanál + Kanál + Kanál LEN MOJE PREPLÁNOVANÉ HOVORY
";} diff --git a/LANG_www/agc_sk/voicemail_check.php b/LANG_www/agc_sk/voicemail_check.php index 71705ac9..29a65913 100644 --- a/LANG_www/agc_sk/voicemail_check.php +++ b/LANG_www/agc_sk/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/active_list_refresh.php b/LANG_www/agc_tw/active_list_refresh.php index ac16bc42..49075a18 100644 --- a/LANG_www/agc_tw/active_list_refresh.php +++ b/LANG_www/agc_tw/active_list_refresh.php @@ -470,7 +470,7 @@ if ($ADD==5) $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='table') {echo "\n";} +if ($format=='table') {echo "\n";} if ($format=='table') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_tw/astguiclient.php b/LANG_www/agc_tw/astguiclient.php index 62e2fc72..e88babc5 100644 --- a/LANG_www/agc_tw/astguiclient.php +++ b/LANG_www/agc_tw/astguiclient.php @@ -718,7 +718,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE TRUNK LIST FOR 掛斷/HIJACK MENU FUNCTIONS +// LIVE TRUNK LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busytrunkhangup() { document.getElementById("TrunkHangupContent").innerHTML = Nactiveext; @@ -765,7 +765,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} } // ################################################################################ -// LIVE LOCAL LIST FOR 掛斷/HIJACK MENU FUNCTIONS +// LIVE LOCAL LIST FOR HANGUP/HIJACK MENU FUNCTIONS function refresh_busylocalhangup() { document.getElementById("LocalHangupContent").innerHTML = Nactiveext; @@ -1386,7 +1386,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=3; if (live_calls > 0) { - var live_calls_HTML = "通話號碼清單:
"; + var live_calls_HTML = "通話號碼清單:
#進端通道遠端通道錄音掛斷駐留
"; if ( (LCAcount > live_calls) || (LCAcount < live_calls) ) { LCAe[0]=''; LCAe[1]=''; LCAe[2]=''; LCAe[3]=''; LCAe[4]=''; LCAe[5]=''; @@ -1533,7 +1533,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "
#進端通道遠端通道RECORD掛斷駐留
" + var out_log_HTML = "
# 通話日期\/時間號碼長度 (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1561,7 +1561,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# 通話日期\/時間號碼LENGTH (M:SS)
" + var in_log_HTML = "
# 通話日期\/時間IN-NUMMERCALLERID長度
" while (loop_ct < in_calls) { loop_ct++; @@ -2734,7 +2734,7 @@ echo "\n"; -
# 通話日期\/時間IN-NUMMERCALLERIDLENGTH
TRUNK 掛斷

+
TRUNK HANGUP

Active Trunks Menu
掛斷 Trunk   |   介入 Trunk   |   @@ -2758,7 +2758,7 @@ echo "\n"; - +
來電轉接
通話已被轉接: 渠道
來電轉接
通話已被轉接: Channel
分機:
分機表

@@ -2772,7 +2772,7 @@ echo "\n"; - +
撥給LOCAL分機
電話來源: 渠道
撥給LOCAL分機
電話來源: Channel
分機:
分機表

@@ -2839,7 +2839,7 @@ echo "\n";
-停止 | 開始     更新比例: 1000 ms 較快速 | 較慢速

+STOP | START     更新比例: 1000 ms 較快速 | 較慢速

起始中..
使用中分機
diff --git a/LANG_www/agc_tw/call_log_display.php b/LANG_www/agc_tw/call_log_display.php index dc5e60d9..0a094c6e 100644 --- a/LANG_www/agc_tw/call_log_display.php +++ b/LANG_www/agc_tw/call_log_display.php @@ -188,7 +188,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/conf_exten_check.php b/LANG_www/agc_tw/conf_exten_check.php index d64467c4..fa32043a 100644 --- a/LANG_www/agc_tw/conf_exten_check.php +++ b/LANG_www/agc_tw/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is on is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents @@ -465,7 +502,7 @@ echo " ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR $Ashift_logout=0; - if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|開始",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("ALL",$shift_enforcement)) and (!ereg("OFF|START",$VU_agent_shift_enforcement_override)) ) or (ereg("ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if (strlen($LOGgroup_shiftsSQL) < 3) @@ -531,7 +568,7 @@ echo " if ($AexternalDEAD > 0) {$Alogin='DEAD_EXTERNAL';} if ($Ashift_logout > 0) - {$Alogin='SHIFT_登出';} + {$Alogin='SHIFT_LOGOUT';} echo 'DateTime: ' . $NOW_TIME . '|UnixTime: ' . $StarTtime . '|Logged-in: ' . $Alogin . '|CampCalls: ' . $RingCalls . '|狀態: ' . $Astatus . '|DiaLCalls: ' . $DiaLCalls . '|APIHanguP: ' . $external_hangup . '|APIStatuS: ' . $external_status . '|APIPausE: ' . $external_pause . '|APIDiaL: ' . $external_dial . '|DEADcall: ' . $DEADcustomer . '|InGroupChange: ' . $InGroupChangeDetails . '|APIFields: ' . $external_update_fields . '|APIFieldsData: ' . $external_update_fields_data . '|APITimerAction: ' . $timer_action . '|APITimerMessage: ' . $timer_action_message . '|APITimerSeconds: ' . $timer_action_seconds . "\n"; @@ -556,7 +593,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $渠道A[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } $stmt="SELECT channel FROM live_channels where server_ip = '$server_ip' and extension = '$conf_exten';"; @@ -570,7 +607,7 @@ echo " { $loop_count++; $total_conf++; $row=mysql_fetch_row($rslt); - $渠道A[$total_conf] = "$row[0]"; + $ChannelA[$total_conf] = "$row[0]"; if ($format=='debug') {echo "\n";} } } @@ -582,8 +619,8 @@ echo " while($total_conf > $counter) { $counter++; - $countecho = "$countecho$渠道A[$counter] ~"; - # echo "$渠道A[$counter] ~"; + $countecho = "$countecho$ChannelA[$counter] ~"; + # echo "$ChannelA[$counter] ~"; } echo "$countecho\n"; @@ -616,7 +653,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/dbconnect.php b/LANG_www/agc_tw/dbconnect.php index 723d3c59..89d88689 100644 --- a/LANG_www/agc_tw/dbconnect.php +++ b/LANG_www/agc_tw/dbconnect.php @@ -1,10 +1,10 @@ - LICENSE: AGPLv2 +# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) { diff --git a/LANG_www/agc_tw/inbound_popup.php b/LANG_www/agc_tw/inbound_popup.php index d7148261..9f4f3425 100644 --- a/LANG_www/agc_tw/inbound_popup.php +++ b/LANG_www/agc_tw/inbound_popup.php @@ -234,7 +234,7 @@ echo "";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "
渠道: $row[1]
Channel: $row[1]
CallerID: $row[3]
\n"; @@ -305,7 +305,7 @@ else $local_web_callerID_QUERY_STRING.="&callerID_prefix=$NXX"; $local_web_callerID_QUERY_STRING.="&callerID_last4=$XXXX"; $local_web_callerID_QUERY_STRING.="&callerID_Time=$row[6]"; - $local_web_callerID_QUERY_STRING.="&callerID_渠道=$row[1]"; + $local_web_callerID_QUERY_STRING.="&callerID_Channel=$row[1]"; $local_web_callerID_QUERY_STRING.="&callerID_uniqueID=$row[0]"; $local_web_callerID_QUERY_STRING.="&callerID_phone_ext=$row[5]"; $local_web_callerID_QUERY_STRING.="&callerID_server_ip=$row[2]"; @@ -343,7 +343,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/live_exten_check.php b/LANG_www/agc_tw/live_exten_check.php index 21fa156e..9a3066cb 100644 --- a/LANG_www/agc_tw/live_exten_check.php +++ b/LANG_www/agc_tw/live_exten_check.php @@ -165,9 +165,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "渠道A: $ChanneLA[$counter] ~"; - echo "渠道B: $ChanneLB[$counter] ~"; - echo "渠道Btrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -179,9 +179,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "渠道A: $ChanneLA[$counter] ~"; - echo "渠道B: $ChanneLB[$counter] ~"; - echo "渠道Btrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -193,9 +193,9 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "渠道A: $ChanneLA[$counter] ~"; - echo "渠道B: $ChanneLB[$counter] ~"; - echo "渠道Btrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { @@ -207,16 +207,16 @@ echo "$row[0]|"; { $row=mysql_fetch_row($rslt); echo "Conversation: $counter ~"; - echo "渠道A: $ChanneLA[$counter] ~"; - echo "渠道B: $ChanneLB[$counter] ~"; - echo "渠道Btrunk: $row[0]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $row[0]|"; } else { echo "Conversation: $counter ~"; - echo "渠道A: $ChanneLA[$counter] ~"; - echo "渠道B: $ChanneLB[$counter] ~"; - echo "渠道Btrunk: $ChanneLA[$counter]|"; + echo "ChannelA: $ChanneLA[$counter] ~"; + echo "ChannelB: $ChanneLB[$counter] ~"; + echo "ChannelBtrunk: $ChanneLA[$counter]|"; } } } @@ -270,7 +270,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/manager_send.php b/LANG_www/agc_tw/manager_send.php index d887f1c1..6672ea14 100644 --- a/LANG_www/agc_tw/manager_send.php +++ b/LANG_www/agc_tw/manager_send.php @@ -320,7 +320,7 @@ if ($ACTION=="OriginateName") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "extenName $extenName 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -349,7 +349,7 @@ if ($ACTION=="OriginateNameVmail") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "extenName $extenName 需被設定\n"; echo "exten $exten 需被設定\n"; @@ -486,7 +486,7 @@ if ($ACTION=="Hangup") if ( (strlen($channel)<3) or (strlen($queryCID)<15) ) { $channel_live=0; - echo "渠道 $channel 是無效的 or queryCID $queryCID 是無效的, Hangup 指令未插入\n"; + echo "Channel $channel 是無效的 or queryCID $queryCID 是無效的, Hangup 指令未插入\n"; } else { @@ -527,7 +527,7 @@ if ($ACTION=="Hangup") if ($row[0]==0) { $channel_live=0; - echo "渠道 $channel 非可用 on $call_server_ip, Hangup 指令未插入 $rowx[0]\n$stmt\n"; + echo "Channel $channel 非可用 on $call_server_ip, Hangup 指令未插入 $rowx[0]\n$stmt\n"; } else { @@ -545,7 +545,7 @@ if ($ACTION=="Hangup") if ($row[0] > 0) { $channel_live=0; - echo "渠道 $channel in use by another agent on $call_server_ip, Hangup 指令未插入 $rowx[0]\n$stmt\n"; + echo "Channel $channel in use by another agent on $call_server_ip, Hangup 指令未插入 $rowx[0]\n$stmt\n"; if ($WeBRooTWritablE > 0) { $fp = fopen ("./vicidial_debug.txt", "a"); @@ -571,7 +571,7 @@ if ($ACTION=="Hangup") if ($rowx[0] > 0) { ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -694,7 +694,7 @@ if ($ACTION=="RedirectVD") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -777,7 +777,7 @@ if ($ACTION=="RedirectToPark") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "extenName $extenName 需被設定\n"; @@ -807,7 +807,7 @@ if ($ACTION=="RedirectFromPark") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -831,7 +831,7 @@ if ($ACTION=="RedirectName") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "extenName $extenName 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -860,7 +860,7 @@ if ($ACTION=="RedirectNameVmail") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "extenName $extenName 需被設定\n"; echo "exten $exten 需被設定\n"; @@ -900,8 +900,8 @@ if ($ACTION=="RedirectXtraCXNeW") $channel_liveX=0; $channel_liveY=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; - echo "Extra渠道 $extrachannel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; + echo "ExtraChannel $extrachannel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -1008,7 +1008,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "渠道 $channel 非可用 on $call_server_ip, Redirect 指令未插入\n"; + echo "Channel $channel 非可用 on $call_server_ip, Redirect 指令未插入\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel 非可用 on $call_server_ip";} } } @@ -1027,7 +1027,7 @@ if ($ACTION=="RedirectXtraCXNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "渠道 $channel 非可用 on $server_ip, Redirect 指令未插入\n"; + echo "Channel $channel 非可用 on $server_ip, Redirect 指令未插入\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel 非可用 on $server_ip";} } } @@ -1125,8 +1125,8 @@ if ($ACTION=="RedirectXtraNeW") $channel_liveX=0; $channel_liveY=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; - echo "Extra渠道 $extrachannel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; + echo "ExtraChannel $extrachannel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -1225,7 +1225,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveX=0; - echo "渠道 $channel 非可用 on $call_server_ip, Redirect 指令未插入\n"; + echo "Channel $channel 非可用 on $call_server_ip, Redirect 指令未插入\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel 非可用 on $call_server_ip";} } } @@ -1244,7 +1244,7 @@ if ($ACTION=="RedirectXtraNeW") if ($rowx[0]==0) { $channel_liveY=0; - echo "渠道 $channel 非可用 on $server_ip, Redirect 指令未插入\n"; + echo "Channel $channel 非可用 on $server_ip, Redirect 指令未插入\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel 非可用 on $server_ip";} } } @@ -1257,7 +1257,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02057',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra 指令發送 渠道 $channel and \nExtra渠道 $extrachannel\n to $exten on $server_ip\n"; + echo "RedirectXtra 指令發送 渠道 $channel and \nExtraChannel $extrachannel\n to $exten on $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel and $extrachannel to $exten on $server_ip";} } else @@ -1284,7 +1284,7 @@ if ($ACTION=="RedirectXtraNeW") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02059',$user,$server_ip,$session_name,$one_mysql_log);} - echo "RedirectXtra 指令發送 渠道 $channel on $call_server_ip and \nExtra渠道 $extrachannel\n to $exten on $server_ip\n"; + echo "RedirectXtra 指令發送 渠道 $channel on $call_server_ip and \nExtraChannel $extrachannel\n to $exten on $server_ip\n"; if (ereg("SECOND|FIRST|DEBUG",$filename)) {$DBout .= "$channel/$call_server_ip and $extrachannel/$server_ip to $exten";} } } @@ -1346,7 +1346,7 @@ if ($ACTION=="Redirect") { $channel_live=0; echo "其中一個變數 是無效的:\n"; - echo "渠道 $channel 需大於兩個字元\n"; + echo "Channel $channel 需大於兩個字元\n"; echo "queryCID $queryCID 需大於14個字元\n"; echo "exten $exten 需被設定\n"; echo "ext_context $ext_context 需被設定\n"; @@ -1371,7 +1371,7 @@ if ($ACTION=="Redirect") if ($rowx[0]==0) { $channel_live=0; - echo "渠道 $channel 非可用 on $server_ip, Redirect 指令未插入\n"; + echo "Channel $channel 非可用 on $server_ip, Redirect 指令未插入\n"; } } if ($channel_live==1) @@ -1403,7 +1403,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($filename)<8) ) { $channel_live=0; - echo "渠道 $channel 是無效的 or queryCID $queryCID 是無效的 or filename: $filename 是無效的, $ACTION 指令未插入\n"; + echo "Channel $channel 是無效的 or queryCID $queryCID 是無效的 or filename: $filename 是無效的, $ACTION 指令未插入\n"; } else { @@ -1422,7 +1422,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($rowx[0]==0) { $channel_live=0; - echo "渠道 $channel 非可用 on $server_ip, $ACTION 指令未插入\n"; + echo "Channel $channel 非可用 on $server_ip, $ACTION 指令未插入\n"; } } if ($channel_live==1) @@ -1490,7 +1490,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ( (strlen($exten)<3) or (strlen($channel)<4) or (strlen($filename)<8) ) { $channel_live=0; - echo "渠道 $channel 是無效的 or exten $exten 是無效的 or filename: $filename 是無效的, $ACTION 指令未插入\n"; + echo "Channel $channel 是無效的 or exten $exten 是無效的 or filename: $filename 是無效的, $ACTION 指令未插入\n"; } else { @@ -1673,7 +1673,7 @@ if ($ACTION=="VolumeControl") $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -if ($format=='debug') {echo "\n";} +if ($format=='debug') {echo "\n";} if ($format=='debug') {echo "\n\n\n";} exit; diff --git a/LANG_www/agc_tw/park_calls_display.php b/LANG_www/agc_tw/park_calls_display.php index 9cd1aa07..d3bee36d 100644 --- a/LANG_www/agc_tw/park_calls_display.php +++ b/LANG_www/agc_tw/park_calls_display.php @@ -138,7 +138,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/timeclock.php b/LANG_www/agc_tw/timeclock.php index 74ad9a95..f80e0e9d 100644 --- a/LANG_www/agc_tw/timeclock.php +++ b/LANG_www/agc_tw/timeclock.php @@ -214,17 +214,17 @@ if ( ($stage == 'login') or ($stage == 'logout') ) else { ### No vicidial_timeclock_status record found, insert one - $stmt="INSERT INTO vicidial_timeclock_status set status='開始', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; + $stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - $status='開始'; + $status='START'; $totTIME_HMS='0:00:00'; $affected_rows = mysql_affected_rows($link); print "\n"; } - if ( ($last_action_sec < 30) and ($status != '開始') ) + if ( ($last_action_sec < 30) and ($status != 'START') ) { - ### You cannot log in or out within 30秒 of your last login/logout + ### You cannot log in or out within 30 秒 of your last login/logout $VDdisplayMESSAGE = "您不能在前次登出或登入後30秒內再次登出或登入"; echo"\n"; @@ -262,7 +262,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) if ($commit == 'YES') { - if ( ( ($status=='AUTO登出') or ($status=='開始') or ($status=='登出') ) and ($stage=='login') ) + if ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='login') ) { $VDdisplayMESSAGE = "You have now logged-in"; $LOGtimeMESSAGE = "You logged in at $NOW_TIME"; @@ -296,7 +296,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) $LOGtimeMESSAGE = "您登出在$NOW_TIME
您登入的時間(多久時間): $totTIME_HMS"; ### Add a record to the timeclock log - $stmt="INSERT INTO vicidial_timeclock_log set event='登出', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_log set event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -311,14 +311,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; ### Update the user's timeclock status record - $stmt="UPDATE vicidial_timeclock_status set status='登出', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; + $stmt="UPDATE vicidial_timeclock_status set status='LOGOUT', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); print "\n"; ### Add a record to the timeclock audit log - $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='登出', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; + $stmt="INSERT INTO vicidial_timeclock_audit_log set timeclock_id='$timeclock_id', event='LOGOUT', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip', login_sec='$last_action_sec', event_date='$NOW_TIME';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); @@ -332,7 +332,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) print "\n"; } - if ( ( ( ($status=='AUTO登出') or ($status=='開始') or ($status=='登出') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) + if ( ( ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) and ($stage=='logout') ) or ( ($status=='LOGIN') and ($stage=='login') ) ) {echo "ERROR: timeclock log entry already made: $status|$stage"; exit;} if ($referrer=='agent') @@ -366,7 +366,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) - if ( ($status=='AUTO登出') or ($status=='開始') or ($status=='登出') ) + if ( ($status=='AUTOLOGOUT') or ($status=='START') or ($status=='LOGOUT') ) { $VDdisplayMESSAGE = "自從您上次登入已經有(多久時間): $totTIME_HMS"; $log_action = 'login'; @@ -377,7 +377,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = "您已經登入的時間(多久時間): $totTIME_HMS"; $log_action = 'logout'; - $button_name = '登出'; + $button_name = 'LOGOUT'; $LOGtimeMESSAGE = "您登入在: $last_action_date
您已經登入的時間(多久時間): $totTIME_HMS

點選下方登出進行登出"; } diff --git a/LANG_www/agc_tw/vdc_db_query.php b/LANG_www/agc_tw/vdc_db_query.php index 8d3f596f..6b3c0d1b 100644 --- a/LANG_www/agc_tw/vdc_db_query.php +++ b/LANG_www/agc_tw/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -85,6 +85,8 @@ # - $vtiger_callback_id - ('16534'...) # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) +# - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -226,12 +228,14 @@ # 91228-1340 - Added API fields update functions # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update +# 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-136'; -$build = '100104-1509'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -407,6 +411,11 @@ if (isset($_GET["nodeletevdac"])) {$nodeletevdac=$_GET["nodeletevdac"];} elseif (isset($_POST["nodeletevdac"])) {$nodeletevdac=$_POST["nodeletevdac"];} if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territories"];} elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} +if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} + elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -589,13 +598,13 @@ if ($ACTION == 'LogiNCamPaigns') $rowx=mysql_fetch_row($rslt); $last_agent_event = $rowx[0]; } - if ( (strlen($last_agent_event)<2) or (ereg('登出',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) {$show_campaign_list=0;} } } ### CHECK TO SEE IF AGENT IS WITHIN THEIR SHIFT IF RESTRICTED, IF NOT, OUTPUT ERROR - if ( ( (ereg("開始|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("開始|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1854,7 +1863,7 @@ if ($ACTION == 'manDiaLnextCaLL') } ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2262,7 +2271,7 @@ if ($ACTION == 'manDiaLonly') ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -2316,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID 是無效的\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID 是無效的\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 秒, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -2481,6 +2544,9 @@ if ($stage == "start") if ($stage == "end") { + $status_dispo = 'DISPO'; + if ($alt_num_status > 0) + {$status_dispo = 'ALTNUM';} ##### get call type from vicidial_live_agents table $VLA_inOUT='NONE'; $stmt="SELECT comments FROM vicidial_live_agents where user='$user' order by last_update_time desc limit 1;"; @@ -2578,7 +2644,7 @@ if ($stage == "end") if ($VLA_inOUT == 'INBOUND') { - $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where lead_id='$lead_id' and user='$user' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00062',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2596,7 +2662,7 @@ if ($stage == "end") } ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -3155,7 +3221,7 @@ if ($stage == "end") } ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_log set $SQLterm end_epoch='$StarTtime', length_in_sec='$length_in_sec', status='$status_dispo' where uniqueid='$uniqueid' and lead_id='$lead_id' and user='$user' order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00090',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3204,7 +3270,7 @@ if ($stage == "end") if (strlen($SQLterm) > 0) { ##### update the duration and end time in the vicidial_log table - $stmt="UPDATE vicidial_closer_log set $SQLterm where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; + $stmt="UPDATE vicidial_closer_log set $SQLterm, status='$status_dispo' where lead_id='$lead_id' and call_date > \"$four_hours_ago\" order by call_date desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00092',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3372,7 +3438,7 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00098',$user,$server_ip,$session_name,$one_mysql_log);} - echo "REC_停止|$rec_channels[$loop_count]|$filename[$loop_count]|"; + echo "REC_STOP|$rec_channels[$loop_count]|$filename[$loop_count]|"; if (strlen($filename)>2) { $stmt="SELECT recording_id,start_epoch,vicidial_id,lead_id FROM recording_log where filename='$filename[$loop_count]'"; @@ -3416,7 +3482,7 @@ if ($stage == "end") echo "$recording_id|$length_in_min|"; # $fp = fopen ("./recording_debug_$NOW_DATE$txt", "a"); - # fwrite ($fp, "$NOW_TIME|錄音_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); + # fwrite ($fp, "$NOW_TIME|RECORD_LOG|$filename[$loop_count]|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|$VDIDselect|\n"); # fclose($fp); } else {echo "||";} @@ -4335,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4358,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -4406,8 +4472,8 @@ if ($ACTION == 'userLOGout') $row=mysql_fetch_row($rslt); $user_group = trim("$row[0]"); } - ##### Insert a 登出 record into the user log - $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','登出','$campaign','$NOW_TIME','$StarTtime','$user_group');"; + ##### Insert a LOGOUT record into the user log + $stmt="INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$user','LOGOUT','$campaign','$NOW_TIME','$StarTtime','$user_group');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00128',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4505,7 +4571,7 @@ if ($ACTION == 'userLOGout') if ($vla_delete > 0) { ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -4577,7 +4643,7 @@ if ($ACTION == 'userLOGout') ################################################################################ ### updateDISPO - update the vicidial_list table to reflect the agent choice of -### call disposition for that leand +### call disposition for that lead ################################################################################ if ($ACTION == 'updateDISPO') { @@ -5031,7 +5097,7 @@ if ($ACTION == 'updateDISPO') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00158',$user,$server_ip,$session_name,$one_mysql_log);} } - ####### 開始 Vtiger Call Logging ####### + ####### START Vtiger Call Logging ####### $stmt = "SELECT enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00197',$user,$server_ip,$session_name,$one_mysql_log);} @@ -5420,7 +5486,7 @@ if ($ACTION == 'updateDISPO') ####### END Vtiger Call Logging ####### ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5616,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -5792,7 +5858,7 @@ if ( ($ACTION == 'VDADpause') || ($ACTION == 'VDADready') ) if ( ($affected_rows > 0) or ($comments == 'NO_STATUS_CHANGE') ) { ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### START QUEUEMETRICS LOGGING LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id 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);} @@ -5994,7 +6060,7 @@ if ($ACTION == 'PauseCodeSubmit') if ($affected_rows > 0) { ############################################# - ##### 開始 QUEUEMETRICS LOGGING LOOKUP ##### + ##### 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;"; $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);} @@ -6503,7 +6569,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); -echo "\n"; +echo "\n"; echo "\n\n\n"; } diff --git a/LANG_www/agc_tw/vicidial.php b/LANG_www/agc_tw/vicidial.php index 21ad04e7..f4fed316 100644 --- a/LANG_www/agc_tw/vicidial.php +++ b/LANG_www/agc_tw/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -269,10 +269,12 @@ # 91228-1339 - Added API "fields update" functions and "timer action" functions # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions +# 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-247'; -$build = '100107-0108'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -391,7 +393,7 @@ $view_scripts = '1'; # set to 1 to show the SCRIPTS tab $dispo_check_all_pause = '0'; # set to 1 to allow for persistent pause after dispo $callholdstatus = '1'; # set to 1 to show calls on hold count $agentcallsstatus = '0'; # set to 1 to show agent status and call dialed count - $campagentstatctmax = '3'; # Number of秒 for campaign call and agent stats + $campagentstatctmax = '3'; # Number of 秒 for campaign call and agent stats $show_campname_pulldown = '1'; # set to 1 to show campaign name on login pulldown $webform_sessionname = '1'; # set to 1 to include the session_name in webform URL $local_consult_xfers = '1'; # set to 1 to send consultative transfers from original server @@ -403,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups on campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon 掛斷客戶電話 $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$電話SComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT WÄHLEN by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -914,7 +916,7 @@ $VDloginDISPLAY=0; $last_agent_event = $rowx[0]; } if ($DB>0) {echo "|$stmt|$events_to_parse|$last_agent_event|";} - if ( (strlen($last_agent_event)<2) or (ereg('登出',$last_agent_event)) ) + if ( (strlen($last_agent_event)<2) or (ereg('LOGOUT',$last_agent_event)) ) { $VDloginDISPLAY=1; $VDdisplayMESSAGE = "您必須先登入TIMECLOCK
"; @@ -923,7 +925,7 @@ $VDloginDISPLAY=0; ### END - CHECK TO SEE IF AGENT IS LOGGED IN TO TIMECLOCK, IF NOT, OUTPUT ERROR ### BEGIN - CHECK TO SEE IF SHIFT ENFORCEMENT IS ENABLED AND AGENT IS OUTSIDE OF THEIR SHIFTS, IF SO, OUTPUT ERROR - if ( ( (ereg("開始|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("開始|ALL",$VU_agent_shift_enforcement_override)) ) + if ( ( (ereg("START|ALL",$shift_enforcement)) and (!ereg("OFF",$VU_agent_shift_enforcement_override)) ) or (ereg("START|ALL",$VU_agent_shift_enforcement_override)) ) { $shift_ok=0; if ( (strlen($LOGgroup_shiftsSQL) < 3) and ($VU_shift_override_flag < 1) ) @@ -1238,23 +1240,23 @@ echo "
0) ) { $campaign_recording = $VU_vicidial_recording_override; - echo "\n"; + echo "\n"; } if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') ) {$scheduled_callbacks='1';} @@ -1718,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($電話SComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1728,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($電話SComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -1912,7 +1914,7 @@ else $SIqueryCID = "S$CIDdate$session_id"; ############################################# - ##### 開始 SYSTEM_SETTINGS LOOKUP ##### + ##### START SYSTEM_SETTINGS LOOKUP ##### $stmt = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,vicidial_agent_disable,allow_sipsak_messages FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01040',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2226,7 +2228,7 @@ $XFwidth = ($MASTERwidth + 320); # 750 - transfer/conference $HCwidth = ($MASTERwidth + 310); # 740 - hotkeys and callbacks $CQwidth = ($MASTERwidth + 300); # 730 - calls in queue listings $AMwidth = ($MASTERwidth + 270); # 700 - preset-dial links -$SCwidth = ($MASTERwidth + 230); # 670 - live call秒 counter, sidebar link +$SCwidth = ($MASTERwidth + 230); # 670 - live call 秒 counter, sidebar link $MUwidth = ($MASTERwidth + 180); # 610 - agent mute $SSwidth = ($MASTERwidth + 176); # 606 - scroll script $SDwidth = ($MASTERwidth + 170); # 600 - scroll script, customer data and calls-in-session @@ -3359,7 +3361,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { showDiv('SysteMDisablEBoX'); } - if (AGLogiN == 'SHIFT_登出') + if (AGLogiN == 'SHIFT_LOGOUT') { shift_logout_flag=1; } @@ -4091,6 +4093,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Insert or update the vicidial_log entry for a customer call function DialLog(taskMDstage,nodeletevdac) { + var alt_num_status = 0; if (taskMDstage == "start") { var MDlogEPOCH = 0; @@ -4107,10 +4110,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (document.vicidial_form.DiaLAltPhonE.checked==true) { + alt_num_status = 1; reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "撥打其他電話號碼: 主要電話 or 其他電話 or 地址3 or 結束紀錄"; + var man_status = "撥打其他電話號碼: 主要電話 or 其他電話 or 地址3 or 結束紀錄"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4135,14 +4139,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} xmlhttp = new XMLHttpRequest(); } if (xmlhttp) - { + { manDiaLlog_query = "format=text&server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlogCaLL&stage=" + taskMDstage + "&uniqueid=" + document.vicidial_form.uniqueid.value + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&lead_id=" + document.vicidial_form.lead_id.value + "&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; + "&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; 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; @@ -4376,14 +4380,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Open up a callback customer record as manual dial preview mode function new_callback_call(taskCBid,taskLEADid) { - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; hideDiv('CallBacKsLisTBox'); ManualDialNext(taskCBid,taskLEADid,'','','','0'); } @@ -4455,7 +4460,6 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; agent_dialed_number=1; @@ -4463,11 +4467,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (tempDiaLnow == 'PREVIEW') { + // alt_phone_dialing=1; agent_dialed_type='MANUAL_PREVIEW'; buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=true; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; } else { @@ -4505,14 +4511,15 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} agent_dialed_number=1; agent_dialed_type='MANUAL_DIALFAST'; - alt_phone_dialing=1; + // alt_phone_dialing=1; auto_dial_level=0; manual_dial_in_progress=1; MainPanelToFront(); buildDiv('DiaLLeaDPrevieW'); - buildDiv('DiaLDiaLAltPhonE'); + if (alt_phone_dialing == 1) + {buildDiv('DiaLDiaLAltPhonE');} document.vicidial_form.LeadPreview.checked=false; - document.vicidial_form.DiaLAltPhonE.checked=true; + // document.vicidial_form.DiaLAltPhonE.checked=true; ManualDialNext("","",MDDiaLCodEform,MDPhonENumbeRform,MDLookuPLeaD,MDVendorLeadCode,'0'); } } @@ -4550,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4574,7 +4581,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (alt_dial_status_display=='0') { // alert(document.getElementById("MainStatuSSpan").innerHTML); - document.getElementById("MainStatuSSpan").innerHTML = " 撥號中: " + status_display_number + " UID: " + CIDcheck + "   進入閒置狀態... " + MD_ring_secondS + "秒"; + document.getElementById("MainStatuSSpan").innerHTML = " 撥號中: " + status_display_number + " UID: " + CIDcheck + "   進入閒置狀態... " + MD_ring_secondS + " 秒"; // alert("channel not found yet:\n" + campaign); } } @@ -4584,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4620,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -4666,30 +4687,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'P重置_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'P重置_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'P重置_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'P重置_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'P重置_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'P重置_1') || (quick_transfer_button == 'P重置_2') || (quick_transfer_button == 'P重置_3') || (quick_transfer_button == 'P重置_4') || (quick_transfer_button == 'P重置_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"快速傳遞\""; - if (quick_transfer_button == 'P重置_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'P重置_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'P重置_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'P重置_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'P重置_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -5751,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALT電話E') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -6028,7 +6049,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (temp_reason != '登出') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -6124,7 +6145,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } else { - // alert("渠道 has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); + // alert("Channel has changed from:\n" + lastcustchannel + '|' + lastcustserverip + "\nto:\n" + reVDIC_data_VDAC[3] + '|' + reVDIC_data_VDAC[4]); document.vicidial_form.callchannel.value = reVDIC_data_VDAC[3]; lastcustchannel = reVDIC_data_VDAC[3]; document.vicidial_form.callserverip.value = reVDIC_data_VDAC[4]; @@ -6507,30 +6528,30 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (prepopulate_transfer_preset_enabled > 0) { - if (prepopulate_transfer_preset == 'P重置_1') + if (prepopulate_transfer_preset == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (prepopulate_transfer_preset == 'P重置_2') + if (prepopulate_transfer_preset == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (prepopulate_transfer_preset == 'P重置_3') + if (prepopulate_transfer_preset == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (prepopulate_transfer_preset == 'P重置_4') + if (prepopulate_transfer_preset == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (prepopulate_transfer_preset == 'P重置_5') + if (prepopulate_transfer_preset == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } - if ( (quick_transfer_button == 'P重置_1') || (quick_transfer_button == 'P重置_2') || (quick_transfer_button == 'P重置_3') || (quick_transfer_button == 'P重置_4') || (quick_transfer_button == 'P重置_5') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"快速傳遞\""; - if (quick_transfer_button == 'P重置_1') + if (quick_transfer_button == 'PRESET_1') {document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber;} - if (quick_transfer_button == 'P重置_2') + if (quick_transfer_button == 'PRESET_2') {document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber;} - if (quick_transfer_button == 'P重置_3') + if (quick_transfer_button == 'PRESET_3') {document.vicidial_form.xfernumber.value = CalL_XC_c_NuMber;} - if (quick_transfer_button == 'P重置_4') + if (quick_transfer_button == 'PRESET_4') {document.vicidial_form.xfernumber.value = CalL_XC_d_NuMber;} - if (quick_transfer_button == 'P重置_5') + if (quick_transfer_button == 'PRESET_5') {document.vicidial_form.xfernumber.value = CalL_XC_e_NuMber;} } @@ -7262,7 +7283,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} 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=CALL掛斷&nodeletevdac=" + nodeletevdac; + 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; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(custhangup_query); @@ -7375,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALT電話E'); + ManualDialOnly('ALTPhonE'); } else { @@ -7413,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALT電話E'); + ManualDialOnly('ALTPhonE'); } else { @@ -8499,7 +8520,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"登出"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('CLOSE'); alert("下次登出時請點擊登出連結.\n"); @@ -8515,7 +8536,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (VDRP_stage != 'PAUSED') { - AutoDial_ReSume_PauSe("VDADpause",'','','',"登出"); + AutoDial_ReSume_PauSe("VDADpause",'','','',"LOGOUT"); } LogouT('NORMAL'); } @@ -9074,7 +9095,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// 更新 the agents view sidebar or xfer frame +// RefresH the agents view sidebar or xfer frame function refresh_agents_view(RAlocation,RAcount) { if (RAcount > 0) @@ -9185,7 +9206,7 @@ function phone_number_format(formatphone) { // ################################################################################ -// 更新 the calls in queue bottombar +// RefresH the calls in queue bottombar function refresh_calls_in_queue(CQcount) { if (CQcount > 0) @@ -9535,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "計時器通知: " + timer_action_seconds + "秒

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "計時器通知: " + timer_action_seconds + " 秒

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9838,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10261,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"快速傳遞\""; } - if ( (quick_transfer_button == 'P重置_1') || (quick_transfer_button == 'P重置_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"快速傳遞\""; } @@ -10457,7 +10486,7 @@ echo "\n";
-秒: + 秒:     @@ -10873,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - 重置 | + 重置 | 確認送出



 
@@ -10883,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- 重置 | + 重置 | 確認送出



 
@@ -10891,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - 渠道 - 渠道 + 渠道 + 渠道 只有個人回撥
";} diff --git a/LANG_www/agc_tw/voicemail_check.php b/LANG_www/agc_tw/voicemail_check.php index 527645fc..8a289064 100644 --- a/LANG_www/agc_tw/voicemail_check.php +++ b/LANG_www/agc_tw/voicemail_check.php @@ -132,7 +132,7 @@ if ($format=='debug') { $ENDtime = date("U"); $RUNtime = ($ENDtime - $StarTtime); - echo "\n"; + echo "\n"; echo "\n\n\n"; } diff --git a/bin/ADMIN_archive_log_tables.pl b/bin/ADMIN_archive_log_tables.pl index 6be2d49d..83687770 100644 --- a/bin/ADMIN_archive_log_tables.pl +++ b/bin/ADMIN_archive_log_tables.pl @@ -26,6 +26,7 @@ # 90615-1701 - First version # 100101-1722 - Added error safety checks # 100103-2052 - Formatting fixes, name change, added initial table counts and added archive tables to official SQL files +# 100109-1018 - Added vicidial_carrier_log archiving # ### begin parsing run-time options ### @@ -186,6 +187,7 @@ if (!$T) } + ##### vicidial_log $stmtA = "SELECT count(*) from vicidial_log;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; @@ -236,6 +238,7 @@ if (!$T) } + ##### server_performance $stmtA = "SELECT count(*) from server_performance;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; @@ -260,6 +263,7 @@ if (!$T) $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + ##### vicidial_agent_log $stmtA = "SELECT count(*) from vicidial_agent_log;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; @@ -308,6 +312,59 @@ if (!$T) $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; } } + + + + ##### vicidial_carrier_log + $stmtA = "SELECT count(*) from vicidial_carrier_log;"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + $sthArows=$sthA->rows; + if ($sthArows > 0) + { + @aryA = $sthA->fetchrow_array; + $vicidial_carrier_log_count = $aryA[0]; + } + $sthA->finish(); + + $stmtA = "SELECT count(*) from vicidial_carrier_log_archive;"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + $sthArows=$sthA->rows; + if ($sthArows > 0) + { + @aryA = $sthA->fetchrow_array; + $vicidial_carrier_log_archive_count = $aryA[0]; + } + $sthA->finish(); + + if (!$Q) {print "\nProcessing vicidial_carrier_log table... ($vicidial_carrier_log_count|$vicidial_carrier_log_archive_count)\n";} + $stmtA = "INSERT IGNORE INTO vicidial_carrier_log_archive SELECT * from vicidial_carrier_log;"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + + $sthArows = $sthA->rows; + if (!$Q) {print "$sthArows rows inserted into vicidial_carrier_log_archive table \n";} + + $rv = $sthA->err(); + if (!$rv) + { + $stmtA = "DELETE FROM vicidial_carrier_log WHERE call_date < '$del_time';"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + $sthArows = $sthA->rows; + if (!$Q) {print "$sthArows rows deleted from vicidial_carrier_log table \n";} + + $stmtA = "optimize table vicidial_carrier_log;"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + + $stmtA = "optimize table vicidial_carrier_log_archive;"; + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + } + + #$dbhA->disconnect(); #print "$del_time\n\n"; diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index dda04aa6..3a8c3245 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -112,7 +112,7 @@ cpu_idle_percent SMALLINT(3) UNSIGNED NOT NULL default '0', disk_usage VARCHAR(255) default '1', sounds_update ENUM('Y','N') default 'N', vicidial_recording_limit MEDIUMINT(8) default '60', -carrier_logging_active ENUM('Y','N') default 'N', +carrier_logging_active ENUM('Y','N') default 'Y', vicidial_balance_rank TINYINT(3) UNSIGNED default '0', rebuild_music_on_hold ENUM('Y','N') default 'Y', active_agent_login_server ENUM('Y','N') default 'Y', @@ -2024,7 +2024,9 @@ CREATE TABLE vicidial_log_archive LIKE vicidial_log; CREATE TABLE vicidial_agent_log_archive LIKE vicidial_agent_log; ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT NULL; -UPDATE system_settings SET db_schema_version='1191',db_schema_update_date=NOW(); +CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; + +UPDATE system_settings SET db_schema_version='1193',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/extras/upgrade_2.2.0.sql b/extras/upgrade_2.2.0.sql index 12b59ca6..fabd2eb8 100644 --- a/extras/upgrade_2.2.0.sql +++ b/extras/upgrade_2.2.0.sql @@ -727,4 +727,11 @@ ALTER TABLE vicidial_carrier_log ADD answered_time SMALLINT(4) UNSIGNED default UPDATE system_settings SET db_schema_version='1192',db_schema_update_date=NOW(); +ALTER TABLE servers MODIFY carrier_logging_active ENUM('Y','N') default 'Y'; +UPDATE servers SET carrier_logging_active='Y'; + +CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; + +UPDATE system_settings SET db_schema_version='1193',db_schema_update_date=NOW(); + UPDATE system_settings SET version='2.2.0rc1',db_schema_update_date=NOW(); diff --git a/translations/br_language.txt b/translations/br_language.txt index 95aee3c5..02ade863 100644 --- a/translations/br_language.txt +++ b/translations/br_language.txt @@ -310,7 +310,7 @@ Dial Now|Discar Agora| CB Comments|Comentarios do CB| Title|Título| STATUS| STATUS| -RESET|REINICIAR| + RESET| REINICIAR| CLEAR FORM|LIMPAR FORMULARIO| SUBMIT|ENVIAR| Incoming|Entrante| @@ -319,7 +319,7 @@ Called|Ligado| Campaign|Campanha| Status|Status| Inserted|Inserido| - seconds|segundos| + seconds| segundos| HELP|AJUDA| Login|Login| User|Usuário| @@ -327,15 +327,13 @@ Password|Senha| VERSION|VERSÃO| BUILD|CONFIGURAÇÃO| Server|Servidor| -RECORD|REGISTRO| -HANGUP|DESLIGAR| +RECORD |REGISTRO | +>HANGUP|>DESLIGAR| >XFER|>TRANFERENCIA| PARK|ESPERA| IN-NUMBER|NUMERO ENTRANTE| NUMBER|NUMERO| -LENGTH|COMPRIMENTO| CALLERID|CALLERID| -CallerID|CallerID| CALL| CHAMADA| PICKUP|CAPTURAR| CONFERENCE|CONFERENCIA| @@ -344,8 +342,8 @@ Send DTMF|Enviar DTMF| BORDER|BORDA| ORDER|ORDEM| on |ligado| -LOGOUT|SAIR| -Channel|Canal| +>LOGOUT|>SAIR| + Channel| Canal| Extensions|Extensões| Conferences|Conferencias| Conference|Conferencia| @@ -355,8 +353,6 @@ Welcome|Bem vindo| VOICEMAIL|CAIXA POSTAL| NEW| NOVO| OLD| VELHO| -STOP|BATENTE| -START|INICIAR| Pause | Pausa | Resume|Início| Faster|Mais rápido| @@ -364,7 +360,6 @@ Slower|Mais devagar| Initializing|Inicializando| Invalid|Inválido| Username|Usuário| -CUSTOM|CUSTOMIZADO| Notes|Notas| First|Primeiro| MI: |MI:| diff --git a/translations/de_language.txt b/translations/de_language.txt index 4f784d53..d4377a63 100644 --- a/translations/de_language.txt +++ b/translations/de_language.txt @@ -286,7 +286,7 @@ CB Comments|WV Anmerkungen| Title|Titel| Your Status|Ihr Status| STATUS| STATUS| -RESET|ZURÜCKSETZEN| + RESET| ZURÜCKSETZEN| CLEAR FORM|FORMULAR ZURÜCKSETZEN| SUBMIT|ÜBERNEHMEN| Incoming|Eingehend| @@ -295,7 +295,7 @@ Called|Angerufen| Campaign|Kampagne| Status|Status| Inserted|Eingefügt| - seconds|Sekunden| + seconds| Sekunden| HELP|HILFE| Login|Login| User|Benutzer| @@ -303,15 +303,13 @@ Password|Passwort| VERSION|VERSION| BUILD|BUILD| Server|Server| -RECORD|AUFNAHME| -HANGUP|AUFLEGEN| +RECORD |AUFNAHME | +>HANGUP|>AUFLEGEN| >XFER|VERBINDEN| PARK|PARK| IN-NUMBER|IN-NUMMER| NUMBER|NUMMER| -LENGTH|LÄNGE| CALLERID|ANRUFERID| -CallerID|AnruferID| CALL| ANRUF| PICKUP|ABNEHMEN| CONFERENCE|KONFERENZ| @@ -319,8 +317,8 @@ Refresh|Aktualisieren| Send DTMF|DTMF Senden| ORDER|BESTELLEN| on | an | -LOGOUT|LOGOUT| -Channel|Kanal| +>LOGOUT|>LOGOUT| + Channel| Kanal| Extensions|Erweiterungen| Conferences|Konferenzen| Conference|Konferenz| @@ -330,8 +328,6 @@ Welcome|Willkommen| VOICEMAIL|VOICEMAIL| NEW| NEU| OLD| ALT| -STOP|STOP| -START|START| Pause | Pause | Resume|WiederAufnehmen| Faster|Schneller| @@ -339,7 +335,6 @@ Slower|Langsamer| Initializing|Initialisierung| Invalid|Unzulässig| Username|Username| -CUSTOM|ANGEPASST| Notes|Anmerkungen| First|Vorname| MI: |MI:| diff --git a/translations/el_language.txt b/translations/el_language.txt index b90ddc66..b0cb40ca 100644 --- a/translations/el_language.txt +++ b/translations/el_language.txt @@ -311,7 +311,7 @@ Dial Now|Κάλεσε Τώρα| CB Comments|Σχόλια CB| Title|Τίτλος| STATUS| ΚΑΤΑΣΤΑΣΗ| -RESET|ΕΠΑΝΑΦΟΡΑ| + RESET| ΕΠΑΝΑΦΟΡΑ| CLEAR FORM|ΕΠΑΝΑΦΟΡΑ| SUBMIT|ΥΠΟΒΑΛΕΤΕ| Incoming|Εισερχόμενο| @@ -320,7 +320,7 @@ Called|Αποκαλούμενος| Campaign|Εκστρατεία| Status|Κατάσταση| Inserted|Εισαγωγή | - seconds|δευτερόλεπτα| + seconds| δευτερόλεπτα| HELP|ΒΟΗΘΕΙΑ| Login|Σύνδεση| User|Χρήστης| @@ -328,15 +328,13 @@ Password|Κωδικός πρόσβασης| VERSION|ΕΚΔΟΣΗ| BUILD|ΔΗΜΙΟΥΡΓΙΑ| Server|Κεντρικός υπολογιστής| -RECORD|ΕΓΓΡΑΦΗ| -HANGUP|ΚΛΕΙΣΙΜΟ| +RECORD |ΕΓΓΡΑΦΗ | +>HANGUP|>ΚΛΕΙΣΙΜΟ| >XFER|>XFER| PARK|ΣΤΑΘΜΕΥΣΗ| IN-NUMBER|ΣΕ-ΑΡΙΘΜΟ| NUMBER|ΑΡΙΘΜΟΣ| -LENGTH|ΜΗΚΟΣ| CALLERID|CALLERID| -CallerID|CallerID| CALL| ΚΛΗΣΗ| PICKUP|ΕΠΑΝΑΛΕΙΨΗ| CONFERENCE|ΣΥΝΔΙΑΣΚΕΨΗ| @@ -344,8 +342,8 @@ Refresh|Ανανέωση| Send DTMF|Στείλε DTMF| ORDER|ΤΑΞΙΝ| on | στο | -LOGOUT|ΑΠΟΣΥΝΔΕΣΗ| -Channel|Κανάλι| +>LOGOUT|>ΑΠΟΣΥΝΔΕΣΗ| + Channel| Κανάλι| Extensions|Τηλ.συνδέσεις| Conferences|Διασκέψεις| Conference|Διάσκεψη| @@ -355,8 +353,6 @@ Welcome|Χρήστης| VOICEMAIL|ΦΩΝ.ΤΑΧ.| NEW| ΝΕΟ| OLD| ΠΑΛΑΙΟ| -STOP|ΣΤΑΣΗ| -START|ΕΝΑΡΞΗ| Pause | Παύση | Resume|Επανάληψη| Faster|Γρηγορότερα| @@ -364,7 +360,6 @@ Slower|Πιό αργά| Initializing|Αρχή| Invalid|Ακυρο| Username|Όνομα χρήστη| -CUSTOM|ΣΥΝΗΘΕΙΑ| Notes|Σημειώσεις| First|Πρώτο| MI: |Μσ:| diff --git a/translations/es_language.txt b/translations/es_language.txt index 3036bc10..207097b1 100644 --- a/translations/es_language.txt +++ b/translations/es_language.txt @@ -313,7 +313,7 @@ CB Comments|Comentarios de los CBES| Title|Título| Your Status|Su Estado| STATUS| ESTADO| -RESET|REINICIAR| + RESET| REINICIAR| CLEAR FORM|REINICIAR| SUBMIT|ENVIAR| Incoming|Entrante| @@ -322,7 +322,7 @@ Called|Llamado| Campaign|Campaña| Status|Estado| Inserted|Insertado| - seconds|segundos| + seconds| segundos| HELP|AYUDA| Login|Conexión| User|Usuario| @@ -330,15 +330,13 @@ Password|Contraseña| VERSION|VERSIÓN| BUILD|CONSTRUCCION| Server|Servidor| -RECORD|GRABACIÓN| -HANGUP|COLGAR| +RECORD |GRABACIÓN | +>HANGUP|>COLGAR| >XFER|>TRANSFERENCIA| PARK|PARKING| IN-NUMBER|NÚMERO-ENTRANTE| NUMBER|NÚMERO| -LENGTH|LONGITUD| CALLERID|LLAMADORID| -CallerID|LlamadorID| CALL| LLAMADA| PICKUP|CAPTURAR| CONFERENCE|CONFERENCIA| @@ -346,8 +344,8 @@ Refresh|Recarga| Send DTMF|Enviar DTMF| ORDER|ORDEN| on | en | -LOGOUT|SALIR| -Channel|Canal| +>LOGOUT|>SALIR| + Channel| Canal| Extensions|Extensiones| Conferences|Conferencias| Conference|Conferencia| @@ -357,8 +355,6 @@ Welcome|Bienvenido| VOICEMAIL|BUZÓN DE VOZ| NEW| NUEVO| OLD| VIEJO| -STOP|PARADA| -START|COMIENZO| Pause | Pausa | Resume|Comienzo| Faster|Más rápido| @@ -366,7 +362,6 @@ Slower|Más lento| Initializing|Inizializando| Invalid|Inválido| Username|Nombre del usuario| -CUSTOM|A MEDIDA| Notes|Notas| First|Primero| MI: |IM: | diff --git a/translations/fr_language.txt b/translations/fr_language.txt index 5ae9ea4b..5b95b042 100644 --- a/translations/fr_language.txt +++ b/translations/fr_language.txt @@ -313,7 +313,7 @@ CB Comments|Commentaires du Rappel| Title|Titre| Your Status|Votre Statut| STATUS| STATUT| -RESET|REINITIALISATION| + RESET| REINITIALISATION| CLEAR FORM|EFFACER LE FORMULAIRE| SUBMIT|VALIDER| Incoming|Entrant| @@ -322,7 +322,7 @@ Called|Appelé| Campaign|Campagne| Status|Statut| Inserted|Inséré| - seconds|secondes| + seconds| secondes| HELP|AIDE| Login|Ouverture de Session| User|Utilisateur| @@ -330,15 +330,13 @@ Password|Mot de passe| VERSION|VERSION| BUILD|BUILD| Server|Serveur| -RECORD|ENREGISTREMENT| -HANGUP|RACCROCHER| +RECORD |ENREGISTREMENT | +>HANGUP|>RACCROCHER| >XFER|>TRANSFERT| PARK|MISE EN ATT| IN-NUMBER|IN-NUMBER| NUMBER|NOMBRE| -LENGTH|LONGUEUR| CALLERID|APPELANT| -CallerID|Appelant| CALL| APPEL| PICKUP|INTERCEPTER| CONFERENCE|CONFÉRENCE| @@ -346,8 +344,8 @@ Refresh|Rafraichir| Send DTMF|Envoyez DTMF| ORDER|ORDRE| on | sur | -LOGOUT|DÉCONNEXION| -Channel|Canal| +>LOGOUT|>DÉCONNEXION| + Channel| Canal| Extensions|Extensions| Conferences|Conférences| Conference|Conférence| @@ -357,8 +355,6 @@ Welcome|Bienvenue| VOICEMAIL|Boite Vocale| NEW| NOUVEAU| OLD| ANCIEN| -STOP|ARRÊT| -START|DEBUT| Pause | Pause | Resume|Résumé| Faster|Plus rapidement| @@ -366,7 +362,6 @@ Slower|Plus lentement| Initializing|Initialisation| Invalid|Invalide| Username|Username| -CUSTOM|COUTUME| Notes|Notes| First|Prenom| MI: |Mi:| diff --git a/translations/it_language.txt b/translations/it_language.txt index 5f89674e..4cd4de39 100644 --- a/translations/it_language.txt +++ b/translations/it_language.txt @@ -313,7 +313,7 @@ CB Comments|Note Richiamo| Title|Titolo| Your Status|Il tuo stato| STATUS| STATO| -RESET|RESET| + RESET| RESET| CLEAR FORM|PULISCI IL FORM| SUBMIT|INVIA| Incoming|In entrata| @@ -322,7 +322,7 @@ Called|Chiamato| Campaign|Campagna| Status|Stato| Inserted|Inserito| - seconds|secondi| + seconds| secondi| HELP|AIUTO| Login|Login| User|Utente| @@ -330,15 +330,13 @@ Password|Password| VERSION|VERSIONE| BUILD|BUILD| Server|Server| -RECORD|Registrazione| -HANGUP|RIAGGANCIA| +RECORD |Registrazione | +>HANGUP|>RIAGGANCIA| >XFER|>TRASF| PARK|ATTESA| IN-NUMBER|IN-NUMBER| NUMBER|NUMERO| -LENGTH|LUNGHEZZA| CALLERID|CALLERID| -CallerID|CallerID| CALL| CHIAMATA| PICKUP|RIPRENDI| CONFERENCE|CONFERENZA| @@ -346,8 +344,8 @@ Refresh|Aggiorna| Send DTMF|Trasmetti Tono Tastiera| ORDER|ORDINE| on | su | -LOGOUT|LOGOUT| -Channel|Canale| +>LOGOUT|>LOGOUT| + Channel| Canale| Extensions|Interni| Conferences|Conferenze| Conference|Conferenza| @@ -357,8 +355,6 @@ Welcome|Benvenuto| VOICEMAIL|VOICEMAIL| NEW| NUOVO| OLD| VECCHIO| -STOP|ARRESTO| -START|INIZIO| Pause | Pausa | Resume|Riprendi| Faster|Piu` veloce| @@ -366,7 +362,6 @@ Slower|Piu` lento| Initializing|Inizializzazione| Invalid|Non valido| Username|Username| -CUSTOM|CLIENTE| Notes|Note| First|Nome| MI: |MI: | diff --git a/translations/nl_language.txt b/translations/nl_language.txt index 6e4a8e1e..a8174d37 100644 --- a/translations/nl_language.txt +++ b/translations/nl_language.txt @@ -312,7 +312,7 @@ CB Comments|TB Opmerkingen| Title|Titel| Your Status|Jouw Status| STATUS| STATUS| -RESET|RESET| + RESET| RESET| CLEAR FORM|RESET FORM| SUBMIT|OPSLAAN| Incoming|Inkomend| @@ -321,7 +321,7 @@ Called|Gebeld| Campaign|Campagne| Status|Status| Inserted|Ingevoerd| - seconds|seconden| + seconds| seconden| HELP|HELP| Login|Inloggen| User|Gebruiker| @@ -329,15 +329,13 @@ Password|Wachtwoord| VERSION|VERSIE| BUILD|BUILD| Server|Server| -RECORD|OPENEMEN| -HANGUP|OPHANGEN| +RECORD |OPENEMEN | +>HANGUP|>OPHANGEN| >XFER|>XFER| PARK|PARKEER| IN-NUMBER|INKOMEND-NUMMER| NUMBER|NUMMER| -LENGTH|LENGTE| CALLERID|CALLERID| -CallerID|CallerID| CALL| BEL| PICKUP|OPPAKKEN| CONFERENCE|CONFERENTIE| @@ -345,8 +343,8 @@ Refresh|Ververs| Send DTMF|Stuur DTMF| ORDER|SORTEER| on | op | -LOGOUT|UITLOGGEN| -Channel|Kanaal| +>LOGOUT|>UITLOGGEN| + Channel| Kanaal| Extensions|Extenties| Conferences|Conferenties| Conference|Conferentie| @@ -356,8 +354,6 @@ Welcome|Welkom| VOICEMAIL|VOICEMAIL| NEW| NIEUW| OLD| OUD| -STOP|STOP| -START|START| Pause | Pauze | Resume|Doorgaan| Faster|Sneller| @@ -365,7 +361,6 @@ Slower|Langzamer| Initializing|Initialiseren| Invalid|Ongeldig| Username|Gebruikersnaam| -CUSTOM|AANGEPAST| Notes|Opmerkingen| First|Eerste| MI: |MI: | diff --git a/translations/pl_language.txt b/translations/pl_language.txt index f7d695ac..36295c96 100644 --- a/translations/pl_language.txt +++ b/translations/pl_language.txt @@ -313,7 +313,7 @@ CB Comments|Notatki| Title|Tytuł| Your Status|Twój Status| STATUS| STATUS| -RESET|RESET| + RESET| RESET| CLEAR FORM|WYCZYŚĆ FORMULARZ| SUBMIT|ZATWIERDŹ| Incoming|Przychodząca| @@ -322,7 +322,7 @@ Called|Zadzwoniono| Campaign|Kampania| Status|Status| Inserted|Wstawiony| - seconds|sekundy| + seconds| sekundy| HELP|POMOC| Login|Login| User|Użytkownik| @@ -330,15 +330,13 @@ Password|Hasło| VERSION|WERSJA| BUILD|KOMPILACJA| Server|Serwer| -RECORD|NAGRYWAJ| -HANGUP|ROZŁĄCZ| +RECORD |NAGRYWAJ | +>HANGUP|>ROZŁĄCZ| >XFER|>TRANSFER| PARK|PARKING| IN-NUMBER|IN-NUMBER| NUMBER|NUMER| -LENGTH|DŁUGOŚĆ| CALLERID|IDROZMÓWCY| -CallerID|IDRozmówcy| CALL| Rozmowa| PICKUP|ODBIERZ| CONFERENCE|KONFERENCJA| @@ -346,8 +344,8 @@ Refresh|Odswież| Send DTMF|Wyślij tonowo| ORDER|PORZĄDEK| on | na | -LOGOUT|WYLOGUJ| -Channel|Kanał| +>LOGOUT|>WYLOGUJ| + Channel| Kanał| Extensions|NumerWenętrzny| Conferences|Konferencje| Conference|Konferencja| @@ -357,8 +355,6 @@ Welcome|Witaj| VOICEMAIL|POCZTAGŁOSOWA| NEW| NOWY| OLD| STARY| -STOP|BATENTE| -START|START| Pause | Przerwa | Resume|Ponów| Faster|Szybciej| @@ -366,7 +362,6 @@ Slower|Wolniej| Initializing|Inicjalizuje| Invalid|Nieprawidłowy| Username|NazwaUżytkownika| -CUSTOM|UŻYTKOWNIKA| Notes|Notatki| First|Imię| MI: |2 Imię: | diff --git a/translations/pt_language.txt b/translations/pt_language.txt index 59df5dfe..bf5b7ab2 100644 --- a/translations/pt_language.txt +++ b/translations/pt_language.txt @@ -313,7 +313,7 @@ CB Comments|Comentários dos CB| Title|Título| Your Status|Seu Status| STATUS| STATUS| -RESET|RESTAURAÇÃO| + RESET| RESTAURAÇÃO| CLEAR FORM|RESTAURAÇÃO| SUBMIT|SUBMETA| Incoming|Entrante| @@ -322,7 +322,7 @@ Called|Chamado| Campaign|Campanha| Status|Status| Inserted|Introduzido| - seconds|segundos| + seconds| segundos| HELP|AJUDA| Login|Início de uma sessão| User|Usuário| @@ -330,15 +330,13 @@ Password|Senha| VERSION|VERSÃO| BUILD|CONFIGURAÇÃO| Server|Usuário| -RECORD|REGISTRO| -HANGUP|HANGUP| +RECORD |REGISTRO | +>HANGUP|>HANGUP| >XFER|>XFER| PARK|PARQUE| IN-NUMBER|IN-NUMBER| NUMBER|NÚMERO| -LENGTH|COMPRIMENTO| CALLERID|CALLERID| -CallerID|CallerID| CALL| CHAMADA| PICKUP|COLETOR| CONFERENCE|CONFERÊNCIA| @@ -346,8 +344,8 @@ Refresh|Refresque| Send DTMF|Emita DTMF| ORDER|ORDEM| on | em | -LOGOUT|LOGOUT| -Channel|Canaleta| +>LOGOUT|>LOGOUT| + Channel| Canaleta| Extensions|Extensões| Conferences|Conferências| Conference|Conferência| @@ -357,8 +355,6 @@ Welcome|Boa vinda| VOICEMAIL|VOICEMAIL| NEW| NOVO| OLD| VELHO| -STOP|BATENTE| -START|COMEÇO| Pause | Pausa | Resume|Resumo| Faster|Mais rapidamente| @@ -366,7 +362,6 @@ Slower|Mais lento| Initializing|Inicializar| Invalid|Inválido| Username|Username| -CUSTOM|COSTUME| Notes|Notas| First|Prime| MI: |Mi:| diff --git a/translations/ru_language.txt b/translations/ru_language.txt index b2763b8b..55369b68 100644 --- a/translations/ru_language.txt +++ b/translations/ru_language.txt @@ -313,7 +313,7 @@ CB Comments|CB Комментарии| Title|Title| Your Status|Ваш Статус| STATUS| СТАТУС| -RESET|RESET| + RESET| RESET| CLEAR FORM|ОЧИСТИТЬ ФОРМУ| SUBMIT|SUBMIT| Incoming|Входящий| @@ -322,7 +322,7 @@ Called|Вызванный| Campaign|Кампания| Status|Статус| Inserted|Введенный| - seconds|секунды| + seconds| секунды| HELP|ПОМОЩЬ| Login|Логин| User|Пользователь| @@ -330,15 +330,13 @@ Password|Пароль| VERSION|ВЕРСИЯ| BUILD|СБОРКА| Server|Сервер| -RECORD|ЗАПИСЬ| -HANGUP|РАЗЪЕДИНЕНИЕ| +RECORD |ЗАПИСЬ | +>HANGUP|>РАЗЪЕДИНЕНИЕ| >XFER|>ПЕРЕВОД| PARK|ПАРКОВКА| IN-NUMBER|В-НОМЕР| NUMBER|НОМЕР| -LENGTH|ДЛИНА| CALLERID|ВЫЗЫВАЮЩИЙID| -CallerID|ВызывающийID| CALL| ВЫЗОВ| PICKUP|PICKUP| CONFERENCE|КОНФЕРЕНЦИЯ| @@ -346,8 +344,8 @@ Refresh|Обновление| Send DTMF|Послать DTMF| ORDER|ПОРЯДОК| on | на | -LOGOUT|ВЫХОД| -Channel|Канал| +>LOGOUT|>ВЫХОД| + Channel| Канал| Extensions|Расширения| Conferences|Конференции| Conference|Конференция| @@ -357,8 +355,6 @@ Welcome|Добро пожаловать| VOICEMAIL|VOICEMAIL| NEW| НОВЫЙ| OLD| СТАРЫЙ| -PAUSE|ПАУЗПА| -START|СТАРТ| Pause | Пауза | Resume|Резюме| Faster|Быстрее| @@ -366,7 +362,6 @@ Slower|Медленее| Initializing|Инициализация| Invalid|Недопустимо| Username|Username| -CUSTOM|ПОЛЬЗОВАТЕЛЬСКИЙ| Notes|Примечания| First|Имя| MI: |MI: | diff --git a/translations/sk_language.txt b/translations/sk_language.txt index 80f10c6d..2cbcda83 100644 --- a/translations/sk_language.txt +++ b/translations/sk_language.txt @@ -313,7 +313,7 @@ CB Comments|Poznámky CB| Title|Titul| Your Status|Váš stav| STATUS| STAV| -RESET|ZNOVU INCIALIZOVAŤ| + RESET| ZNOVU INCIALIZOVAŤ| CLEAR FORM|VYMAZAŤ FORMULÁR| SUBMIT|POTVRDIŤ| Incoming|Príchodzie| @@ -322,7 +322,7 @@ Called|Volaný| Campaign|Kampaň| Status|Stav| Inserted|Vložiť| - seconds|sekúnd| + seconds| sekúnd| HELP|POMOC| Login|Prihlásiť| User|Užívateľ| @@ -330,15 +330,13 @@ Password|Heslo| VERSION|VERZIA| BUILD|POSTAVENÉ| Server|Server| -RECORD|ZÁZNAM| -HANGUP|POLOŹIŤ| +RECORD |ZÁZNAM | +>HANGUP|>POLOŹIŤ| >XFER|>PREPOJIŤ| PARK|ZAPARKOVAŤ| IN-NUMBER|V-ČÍSLE| NUMBER|ČÍSLO| -LENGTH|DĹŽKA| CALLERID|IDVOLAJÚCEHO| -CallerID|IDvolajúceho| CALL| HOVOR| PICKUP|PREVZIAŤ| CONFERENCE|KONFERENCIA| @@ -346,8 +344,8 @@ Refresh|Osviežiť| Send DTMF|Poslať DTMF| ORDER|PORADIE| on | na | -LOGOUT|ODHLÁSIŤ| -Channel|Kanál| +>LOGOUT|>ODHLÁSIŤ| + Channel| Kanál| Extensions|Pobočky| Conferences|Konferencie| Conference|Konferencia| @@ -357,8 +355,6 @@ Welcome|Vítame Vás| VOICEMAIL|HLASOVÁ SCHRÁNKA| NEW| NOVÁ| OLD| STARÁ| -STOP|ZASTAVIŤ| -START|SPUSTIŤ| Pause | Pauza | Resume|Pokračovať| Faster|Rýchlejšie| @@ -366,7 +362,6 @@ Slower|Pomalšie| Initializing|Inicializovať| Invalid|Nesprávny| Username|Užívateľské meno| -CUSTOM|UPRAVENÉ| Notes|Poznámka| First|Prvý| MI: |MI: | diff --git a/translations/tw_language.txt b/translations/tw_language.txt index 34bd27b0..5a576b6e 100644 --- a/translations/tw_language.txt +++ b/translations/tw_language.txt @@ -313,7 +313,7 @@ CB Comments|CB Comments| Title|職銜| Your Status|您目前的狀態| STATUS| 狀態| -RESET|重置| + RESET| 重置| CLEAR FORM|清除表單| SUBMIT|確認送出| Incoming|Incoming| @@ -322,7 +322,7 @@ Called|已撥號| Campaign|活動| Status|狀態| Inserted|已插入| - seconds|秒| + seconds| 秒| HELP|協助| Login|登入| User|使用者| @@ -330,15 +330,13 @@ Password|密碼| VERSION|版本| BUILD|版次| Server|主機| -RECORD|錄音| -HANGUP|掛斷| +RECORD |錄音 | +>HANGUP|>掛斷| >XFER|轉接| PARK|駐留| IN-NUMBER|IN-NUMMER| NUMBER|號碼| -LENGTH|長度| CALLERID|CALLERID| -CallerID|CallerID| CALL| 撥號| PICKUP|接起| CONFERENCE|會議| @@ -346,8 +344,8 @@ Refresh|更新| Send DTMF|傳送 DTMF| ORDER|次序| on | on | -LOGOUT|登出| -Channel|渠道| +>LOGOUT|>登出| + Channel| 渠道| Extensions|分機| Conferences|會議| Conference|會議| @@ -357,8 +355,6 @@ Welcome|歡迎| VOICEMAIL|語音信箱| NEW| 新| OLD| 舊| -STOP|停止| -START|開始| Pause | 暫停 | Resume|恢復| Faster|較快速| @@ -366,7 +362,6 @@ Slower|較慢速| Initializing|起始中| Invalid|無效| Username|Username| -CUSTOM|CUSTOM| Notes|注意| First|名| MI: |MI:| diff --git a/www/agc/conf_exten_check.php b/www/agc/conf_exten_check.php index fe7b63b5..36508e78 100644 --- a/www/agc/conf_exten_check.php +++ b/www/agc/conf_exten_check.php @@ -49,12 +49,13 @@ # 90908-1037 - Added DEAD call logging # 91130-2022 - Added code for manager override of in-group selection # 91228-1341 - Added API fields update functions +# 100109-1337 - Fixed Manual dial live call detection # -$version = '2.2.0-24'; -$build = '91228-1341'; +$version = '2.2.0-25'; +$build = '100109-1337'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=17; +$mysql_log_count=32; $one_mysql_log=0; require("dbconnect.php"); @@ -347,6 +348,42 @@ echo " $one_mysql_log=0; $retry_count++; } + ##### BEGIN DEAD logging section ##### + ### find whether the call the agent is on is hung up + $stmt="SELECT count(*) from vicidial_auto_calls where callerid='$Acallerid';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03029',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $AcalleridCOUNT=$row[0]; + + if ( ($AcalleridCOUNT < 1) and (eregi("INCALL",$Astatus)) and (strlen($Aagent_log_id) > 0) ) + { + $DEADcustomer++; + ### find whether the agent log record has already logged DEAD + $stmt="SELECT count(*) from vicidial_agent_log where agent_log_id='$Aagent_log_id' and ( (dead_epoch IS NOT NULL) or (dead_epoch > 10000) );"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03030',$user,$server_ip,$session_name,$one_mysql_log);} + $row=mysql_fetch_row($rslt); + $Aagent_log_idCOUNT=$row[0]; + + if ($Aagent_log_idCOUNT < 1) + { + $NEWdead_epoch = date("U"); + $deadNOW_TIME = date("Y-m-d H:i:s"); + $stmt="UPDATE vicidial_agent_log set dead_epoch='$NEWdead_epoch' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03031',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_live_agents set last_state_change='$deadNOW_TIME' where agent_log_id='$Aagent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'03032',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + ##### END DEAD logging section ##### } ### grab the API hangup and API dispo fields in vicidial_live_agents diff --git a/www/agc/vdc_db_query.php b/www/agc/vdc_db_query.php index 25c56a97..c44b0d5f 100644 --- a/www/agc/vdc_db_query.php +++ b/www/agc/vdc_db_query.php @@ -12,7 +12,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') +# - $ACTION - ('regCLOSER','regTERRITORY','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCaLL','manDiaLlogCALL','userLOGout','updateDISPO','updateLEAD','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns','alt_phone_change','AlertControl','AGENTSview','CALLSINQUEUEview','CALLSINQUEUEgrab','DiaLableLeaDsCounT','UpdateFields') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -86,6 +86,7 @@ # - $nodeletevdac - ('0','1') # - $agent_territories - ('ABC001','ABC002'...) # - $alt_num_status - ('0','1') +# - $DiaL_SecondS - ('0','1','2',...) # # CHANGELOG: # 50629-1044 - First build of script @@ -228,12 +229,13 @@ # 100103-1254 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status +# 100109-1336 - Fixed Manual dial live call detection # -$version = '2.2.0-137'; -$build = '100109-0745'; +$version = '2.2.0-138'; +$build = '100109-1336'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=290; +$mysql_log_count=296; $one_mysql_log=0; require("dbconnect.php"); @@ -411,6 +413,9 @@ if (isset($_GET["agent_territories"])) {$agent_territories=$_GET["agent_territ elseif (isset($_POST["agent_territories"])) {$agent_territories=$_POST["agent_territories"];} if (isset($_GET["alt_num_status"])) {$alt_num_status=$_GET["alt_num_status"];} elseif (isset($_POST["alt_num_status"])) {$alt_num_status=$_POST["alt_num_status"];} +if (isset($_GET["DiaL_SecondS"])) {$DiaL_SecondS=$_GET["DiaL_SecondS"];} + elseif (isset($_POST["DiaL_SecondS"])) {$DiaL_SecondS=$_POST["DiaL_SecondS"];} + header ("Content-type: text/html; charset=utf-8"); header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 @@ -2320,61 +2325,115 @@ if ($ACTION == 'manDiaLonly') ################################################################################ -### manDiaLlookCALL - for manual VICIDiaL dialing this will attempt to look up +### manDiaLlookCaLL - for manual VICIDiaL dialing this will attempt to look up ### the trunk channel that the call was placed on ################################################################################ if ($ACTION == 'manDiaLlookCaLL') -{ + { $MT[0]=''; $row=''; $rowx=''; -if (strlen($MDnextCID)<18) - { - echo "NO\n"; - echo "MDnextCID $MDnextCID is not valid\n"; - exit; - } -else - { - ##### look for the channel in the UPDATED vicidial_manager record of the call initiation - $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $VM_mancall_ct = mysql_num_rows($rslt); - if ($VM_mancall_ct > 0) + $call_good=0; + if (strlen($MDnextCID)<18) { - $row=mysql_fetch_row($rslt); - $uniqueid =$row[0]; - $channel =$row[1]; - echo "$uniqueid\n$channel"; - - $wait_sec=0; - $stmt = "select wait_epoch,wait_sec from vicidial_agent_log where agent_log_id='$agent_log_id';"; - if ($DB) {echo "$stmt\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} - $VDpr_ct = mysql_num_rows($rslt); - if ($VDpr_ct > 0) - { - $row=mysql_fetch_row($rslt); - $wait_sec = (($StarTtime - $row[0]) + $row[1]); - } - $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' where agent_log_id='$agent_log_id';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} - - $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + echo "NO\n"; + echo "MDnextCID $MDnextCID is not valid\n"; + exit; } else { - echo "NO\n"; + ##### look for the channel in the UPDATED vicidial_manager record of the call initiation + $stmt="SELECT uniqueid,channel FROM vicidial_manager where callerid='$MDnextCID' and server_ip='$server_ip' and status IN('UPDATED','DEAD') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00052',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancall_ct = mysql_num_rows($rslt); + if ($VM_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid =$row[0]; + $channel =$row[1]; + $call_output = "$uniqueid\n$channel\n"; + $call_good++; + } + else + { + ### after 10 seconds, start checking for call termination in the carrier log + if ( ($DiaL_SecondS > 0) and (preg_match("/0$/",$DiaL_SecondS)) ) + { + $stmt="SELECT uniqueid,channel,end_epoch FROM call_log where caller_code='$MDnextCID' and server_ip='$server_ip' order by start_time desc LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00291',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $VM_mancallX_ct = mysql_num_rows($rslt); + if ($VM_mancallX_ct > 0) + { + $row=mysql_fetch_row($rslt); + $uniqueid = $row[0]; + $channel = $row[1]; + $end_epoch = $row[2]; + + ### Local channel hung up, check carrier log for error + if ($end_epoch > 1000) + { + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) + { + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} + } + } + } + } + } + + if ($call_good > 0) + { + $wait_sec=0; + $dead_epochSQL = ''; + $stmt = "select wait_epoch,wait_sec,dead_epoch from vicidial_agent_log where agent_log_id='$agent_log_id';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00053',$user,$server_ip,$session_name,$one_mysql_log);} + $VDpr_ct = mysql_num_rows($rslt); + if ($VDpr_ct > 0) + { + $row=mysql_fetch_row($rslt); + $wait_sec = (($StarTtime - $row[0]) + $row[1]); + $now_dead_epoch = $row[2]; + if ( ($now_dead_epoch > 1000) and ($now_dead_epoch < $StarTtime) ) + {$dead_epochSQL = ",dead_epoch='$StarTtime'";} + } + $stmt="UPDATE vicidial_agent_log set wait_sec='$wait_sec',wait_epoch='$StarTtime',talk_epoch='$StarTtime',lead_id='$lead_id' $dead_epochSQL where agent_log_id='$agent_log_id';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00054',$user,$server_ip,$session_name,$one_mysql_log);} + + $stmt="UPDATE vicidial_auto_calls set uniqueid='$uniqueid',channel='$channel' where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + + echo "$call_output"; + } + else + {echo "NO\n$DiaL_SecondS\n";} } } -} @@ -4342,7 +4401,7 @@ if ($ACTION == 'VDADcheckINCOMING') ##### BEGIN special filtering and response for Vtiger account balance function ##### $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00294',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { @@ -4365,7 +4424,7 @@ if ($ACTION == 'VDADcheckINCOMING') $stmt="UPDATE vicidial_live_agents set external_timer_action='D1_DIAL',external_timer_action_message='3 minute warning for customer',external_timer_action_seconds='$durationLimitSEC' where user='$user';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00295',$user,$server_ip,$session_name,$one_mysql_log);} $vla_update_timer = mysql_affected_rows($link); $fp = fopen ("./call_url_log.txt", "a"); @@ -5623,7 +5682,7 @@ if ($ACTION == 'updateDISPO') $stmt = "SELECT enable_vtiger_integration FROM system_settings;"; $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00296',$user,$server_ip,$session_name,$one_mysql_log);} $ss_conf_ct = mysql_num_rows($rslt); if ($ss_conf_ct > 0) { diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 80917aa3..0aa557d8 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -172,7 +172,7 @@ # 80331-1433 - Added second transfer try for VICIDIAL transfers/hangups on manual dial calls # 80402-0121 - Fixes for manual dial transfers on some systems # 80407-2112 - Work on adding phone login load balancing across servers -# 80416-0559 - Added ability to log computer_ip at login, set the $PhoneSComPIP variable +# 80416-0559 - Added ability to log computer_ip at login, set the $PhonESComPIP variable # 80428-0413 - UTF8 changes and testing # 80505-0054 - Added multi-phones load-balanced alias option # 80507-0932 - Fixed Script display bug (+ instead of space) @@ -270,10 +270,11 @@ # 100103-1250 - Added 3 more conf-presets, list ID override presets and call start/dispo URLs # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting +# 100109-1338 - Fixed Manual dial live call detection # -$version = '2.2.0-248'; -$build = '100109-0801'; +$version = '2.2.0-249'; +$build = '100109-1338'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -404,7 +405,7 @@ $LogiNAJAX = '1'; # set to 1 to do lookups on campaigns for login $HidEMonitoRSessionS = '1'; # set to 1 to hide remote monitoring channels from "session calls" $hangup_all_non_reserved= '1'; # set to 1 to force hangup all non-reserved channels upon Hangup Customer $LogouTKicKAlL = '1'; # set to 1 to hangup all calls in session upon agent logout -$PhoneSComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login +$PhonESComPIP = '1'; # set to 1 to log computer IP to phone if blank, set to 2 to force log each login $DefaulTAlTDiaL = '0'; # set to 1 to enable ALT DIAL by default if enabled for the campaign $AgentAlert_allowed = '1'; # set to 1 to allow Agent alert option $disable_blended_checkbox='0'; # set to 1 to disable the BLENDED checkbox from the in-group chooser screen @@ -1719,7 +1720,7 @@ else { $no_empty_session_warnings=1; } - if ($PhoneSComPIP == '1') + if ($PhonESComPIP == '1') { if (strlen($computer_ip) < 4) { @@ -1729,7 +1730,7 @@ else if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01026',$VD_login,$server_ip,$session_name,$one_mysql_log);} } } - if ($PhoneSComPIP == '2') + if ($PhonESComPIP == '2') { $stmt="UPDATE phones SET computer_ip='$ip' where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} @@ -4113,7 +4114,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - var man_status = "Dial Alt Phone Number: MAIN PHONE or ALT PHONE or ADDRESS3 or FINISH LEAD"; + var man_status = "Dial Alt Phone Number: MAIN PHONE or ALT PHONE or ADDRESS3 or FINISH LEAD"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } } @@ -4556,7 +4557,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value; + manDiaLlook_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLlookCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&MDnextCID=" + CIDcheck + "&agent_log_id=" + agent_log_id + "&lead_id=" + document.vicidial_form.lead_id.value + "&DiaL_SecondS=" + MD_ring_secondS; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(manDiaLlook_query); @@ -4590,6 +4591,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { XDuniqueid = MDlookResponse_array[0]; XDchannel = MDlookResponse_array[1]; + var XDalert = MDlookResponse_array[2]; + + if (XDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + XDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (XDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') && (MD_ring_secondS < 10) ) { // bad grab of Local channel, try again @@ -4626,6 +4634,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { MDuniqueid = MDlookResponse_array[0]; MDchannel = MDlookResponse_array[1]; + var MDalert = MDlookResponse_array[2]; + + if (MDalert == 'ERROR') + { + var DiaLAlerTMessagE = "Call Rejected: " + MDchannel; + TimerActionRun("DiaLAlerT",DiaLAlerTMessagE); + } if ( (MDchannel.match(regMDL)) && (asterisk_version != '1.0.8') && (asterisk_version != '1.0.9') ) { // bad grab of Local channel, try again @@ -5757,7 +5772,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} all_record = 'NO'; all_record_count=0; var usegroupalias=0; - if (taskaltnum == 'ALTPhoneE') + if (taskaltnum == 'ALTPhonE') { var manDiaLonly_num = document.vicidial_form.alt_phone.value; lead_dial_number = document.vicidial_form.alt_phone.value; @@ -7381,7 +7396,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTPhoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -7419,7 +7434,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} reselect_alt_dial = 1; if (altdispo == 'ALTPH2') { - ManualDialOnly('ALTPhoneE'); + ManualDialOnly('ALTPhonE'); } else { @@ -9541,46 +9556,54 @@ else // ################################################################################ // Finish the wrapup timer early - function TimerActionRun() + function TimerActionRun(taskaction,taskdialalert) { - if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + if (taskaction == 'DiaLAlerT') { - document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICATION: " + timer_action_seconds + " seconds

" + timer_action_message + "
"; + document.getElementById("TimerContentSpan").innerHTML = "DIAL ALERT:

" + taskdialalert + "
"; showDiv('TimerSpan'); } + else + { + if ( (timer_action_message.length > 0) || (timer_action == 'MESSAGE_ONLY') ) + { + document.getElementById("TimerContentSpan").innerHTML = "TIMER NOTIFICATION: " + timer_action_seconds + " seconds

" + timer_action_message + "
"; - if (timer_action == 'WEBFORM') - { - WebFormRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + showDiv('TimerSpan'); + } + + if (timer_action == 'WEBFORM') + { + WebFormRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'WEBFORM2') + { + WebFormTwoRefresH('NO','YES'); + window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + } + if (timer_action == 'D1_DIAL') + { + DtMf_PreSet_a_DiaL(); + } + if (timer_action == 'D2_DIAL') + { + DtMf_PreSet_b_DiaL(); + } + if (timer_action == 'D3_DIAL') + { + DtMf_PreSet_c_DiaL(); + } + if (timer_action == 'D4_DIAL') + { + DtMf_PreSet_d_DiaL(); + } + if (timer_action == 'D5_DIAL') + { + DtMf_PreSet_e_DiaL(); + } } - if (timer_action == 'WEBFORM2') - { - WebFormTwoRefresH('NO','YES'); - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); - } - if (timer_action == 'D1_DIAL') - { - DtMf_PreSet_a_DiaL(); - } - if (timer_action == 'D2_DIAL') - { - DtMf_PreSet_b_DiaL(); - } - if (timer_action == 'D3_DIAL') - { - DtMf_PreSet_c_DiaL(); - } - if (timer_action == 'D4_DIAL') - { - DtMf_PreSet_d_DiaL(); - } - if (timer_action == 'D5_DIAL') - { - DtMf_PreSet_e_DiaL(); - } - timer_action = 'NONE'; } @@ -9844,7 +9867,7 @@ else } if ( (timer_action != 'NONE') && (timer_action.length > 3) && (timer_action_seconds <= VD_live_call_secondS) && (timer_action_seconds >= 0) ) { - TimerActionRun(); + TimerActionRun('',''); } if (HKdispo_display > 0) { @@ -10267,7 +10290,7 @@ else { document.getElementById("QuickXfer").innerHTML = "\"QUICK"; } - if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') ) + if ( (quick_transfer_button == 'PRESET_1') || (quick_transfer_button == 'PRESET_2') || (quick_transfer_button == 'PRESET_3') || (quick_transfer_button == 'PRESET_4') || (quick_transfer_button == 'PRESET_5') ) { document.getElementById("QuickXfer").innerHTML = "\"QUICK"; } @@ -10879,7 +10902,7 @@ if ($agent_display_dialable_leads > 0) - RESET | + RESET | SUBMIT



 
@@ -10889,7 +10912,7 @@ if ($agent_display_dialable_leads > 0) height=460>
TERRITORY SELECTION
Territory Selection
- RESET | + RESET | SUBMIT



 
@@ -10897,8 +10920,8 @@ if ($agent_display_dialable_leads > 0) - Channel - Channel + Channel + Channel MY CALLBACK ONLY
";}