From 7ec8917bdc219b6a6970675c9e6c9ba7a58feebe Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 10 Jul 2008 05:36:59 +0000 Subject: [PATCH] fixed vicidial.php bug when alt-dialing and clicking on the hangup button at the right time overwrites alt dial links. Shows most on high-latency web connections git-svn-id: svn://192.168.202.10@918 3d104415-ff17-0410-8863-d5cf3c621b8a --- docs/REQUIRED_APPS_INSTALL.txt | 24 ++++++++++++------------ www/agc/vicidial.php | 22 ++++++++++++++++------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/docs/REQUIRED_APPS_INSTALL.txt b/docs/REQUIRED_APPS_INSTALL.txt index 827e976e..df2c802a 100644 --- a/docs/REQUIRED_APPS_INSTALL.txt +++ b/docs/REQUIRED_APPS_INSTALL.txt @@ -505,24 +505,24 @@ rm -f /usr/lib/asterisk/modules/res_speech.so mkdir /usr/src/asterisk-1.4 cd /usr/src/asterisk-1.4 -wget http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.20.1.tar.gz -wget http://ftp.digium.com/pub/zaptel/releases/zaptel-1.4.9.tar.gz -wget http://ftp.digium.com/pub/libpri/releases/libpri-1.4.3.tar.gz -gunzip asterisk-1.4.20.1.tar.gz -tar xvf asterisk-1.4.20.1.tar -gunzip zaptel-1.4.9.tar.gz -tar xvf zaptel-1.4.9.tar -gunzip libpri-1.4.3.tar.gz -tar xvf libpri-1.4.3.tar -cd ./zaptel-1.4.9 +wget http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.21.1.tar.gz +wget http://ftp.digium.com/pub/zaptel/releases/zaptel-1.4.11.tar.gz +wget http://ftp.digium.com/pub/libpri/releases/libpri-1.4.4.tar.gz +gunzip asterisk-1.4.21.1.tar.gz +tar xvf asterisk-1.4.21.1.tar +gunzip zaptel-1.4.11.tar.gz +tar xvf zaptel-1.4.11.tar +gunzip libpri-1.4.4.tar.gz +tar xvf libpri-1.4.4.tar +cd ./zaptel-1.4.11 ./configure make make install -cd ../libpri-1.4.3 +cd ../libpri-1.4.4 make clean make make install -cd ../asterisk-1.4.20.1 +cd ../asterisk-1.4.21.1 wget http://www.eflo.net/files/enter.h wget http://www.eflo.net/files/leave.h mv -f enter.h apps/enter.h diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index f4a502d5..0c88c83f 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -1929,6 +1929,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; + var alt_dial_status_display = 0; var mdnLisT_id = ''; var VU_vicidial_transfers = ''; var agentonly_callbacks = ''; @@ -3001,6 +3002,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { alt_phone_dialing=starting_alt_phone_dialing; alt_dial_active = 0; + alt_dial_status_display = 0; open_dispo_screen=1; document.getElementById("MainStatuSSpan").innerHTML = "Dial Next Number"; } @@ -3017,6 +3019,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"; document.getElementById("MainStatuSSpan").innerHTML = man_status; } @@ -3397,8 +3400,12 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var status_display_number = phone_number_format(dispnum); - document.getElementById("MainStatuSSpan").innerHTML = " Calling: " + status_display_number + " UID: " + CIDcheck + "   Waiting for Ring... " + MD_ring_secondS + " seconds"; - // alert("channel not found yet:\n" + campaign); + if (alt_dial_status_display=='0') + { + // alert(document.getElementById("MainStatuSSpan").innerHTML); + document.getElementById("MainStatuSSpan").innerHTML = " Calling: " + status_display_number + " UID: " + CIDcheck + "   Waiting for Ring... " + MD_ring_secondS + " seconds"; + // alert("channel not found yet:\n" + campaign); + } } else { @@ -3866,6 +3873,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // Send the Manual Dial Only - dial the previewed lead function ManualDialOnly(taskaltnum) { + alt_dial_status_display = 0; all_record = 'NO'; all_record_count=0; if (taskaltnum == 'ALTPhoneE') @@ -3943,10 +3951,12 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var dispnum = manDiaLonly_num; var status_display_number = phone_number_format(dispnum); - document.getElementById("MainStatuSSpan").innerHTML = " Calling: " + status_display_number + " UID: " + MDnextCID + "   Waiting for Ring..."; - - document.getElementById("HangupControl").innerHTML = "\"Hangup"; - + if (alt_dial_status_display=='0') + { + document.getElementById("MainStatuSSpan").innerHTML = " Calling: " + status_display_number + " UID: " + MDnextCID + "   Waiting for Ring..."; + + document.getElementById("HangupControl").innerHTML = "\"Hangup"; + } if ( (LIVE_campaign_recording == 'ALLCALLS') || (LIVE_campaign_recording == 'ALLFORCE') ) {all_record = 'YES';}