diff --git a/agc_2-X/trunk/LANG_www/agc/astguiclient.php b/agc_2-X/trunk/LANG_www/agc/astguiclient.php index 6d39bae8..e6abfad0 100644 --- a/agc_2-X/trunk/LANG_www/agc/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#CALL DATE/TIMENUMBERLENGTH (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# CALL DATE/TIMENUMBERLENGTH (M:SS)
" + var in_log_HTML = "
#CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc/vdc_db_query.php index ef287987..40f6a5c5 100644 --- a/agc_2-X/trunk/LANG_www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CALL NOT PLACED\n"; + echo " CALL NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context is not valid\n"; exit; } @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If CALLBK, change vicidial_callback record to INACTIVE - if ($dispo == 'CALLBK') + if (eregi("CALLBK|CBHOLD", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc/vicidial.php b/agc_2-X/trunk/LANG_www/agc/vicidial.php index 9d3763bb..7d6acae2 100644 --- a/agc_2-X/trunk/LANG_www/agc/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_seconds = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_seconds = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" + var CB_HTML = "
#CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CALL NOT PLACED") + if (MDnextCID == " CALL NOT PLACED") { alert("call was not placed, there was an error:\n" + MDOnextResponse); } @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
CALL DISPOSITION
"; + var dispo_HTML = "
CALL DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { diff --git a/agc_2-X/trunk/LANG_www/agc_br/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_br/astguiclient.php index 8c11bcba..4526eb81 100644 --- a/agc_2-X/trunk/LANG_www/agc_br/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_br/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#DATA/HORA DA CHAMADANUMEROCOMPRIMENTO (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,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 CHAMADANUMEROCOMPRIMENTO (M:SS)
" + var in_log_HTML = "
#DATA/HORA DA CHAMADANUMERO ENTRANTECHAMADAERIDCOMPRIMENTO
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_br/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_br/vdc_db_query.php index a312b0bf..9290c1eb 100644 --- a/agc_2-X/trunk/LANG_www/agc_br/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_br/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INCHAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INCHAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CHAMADA NOT PLACED\n"; + echo " CHAMADA NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context não é válido\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "CHAMADA_LOG Inserido: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Inserido: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INCHAMADA in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INCHAMADA + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INCHAMADA + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INCHAMADA + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If CHAMADABK, change vicidial_callback record to INACTIVE - if ($dispo == 'CHAMADABK') + if (eregi("CALLBK|CBHVELHO", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_br/vicidial.php b/agc_2-X/trunk/LANG_www/agc_br/vicidial.php index 227202f0..0da1fd2b 100644 --- a/agc_2-X/trunk/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_br/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_segundos = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_segundos = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# DATA/HORA DA CHAMADANUMERO ENTRANTECALLERIDCOMPRIMENTO
" + var CB_HTML = "
#CHAMADABACK DATE/TIMENUMERONAMESTATUSCAMPAIGNLAST DATA/HORA DA CHAMADA COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'CHAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Desligar"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CHAMADA NOT PLACED") + if (MDnextCID == " CHAMADA NOT PLACED") { alert("A ligação não foi efetuada. Houve um erro.:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Desligar"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'CHAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CHAMADABACK DATE/TIMENUMERONAMESTATUSCAMPAIGNLAST DATA/HORA DA CHAMADA COMMENTS
CHAMADA DISPOSITION
"; + var dispo_HTML = "
CHAMADA DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'CHAMADABK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_de/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_de/astguiclient.php index 461b51ff..98164516 100644 --- a/agc_2-X/trunk/LANG_www/agc_de/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_de/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#ANRUFDATE/TIMEZAHLLÄNGE (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# ANRUFDATE/TIMEZAHLLÄNGE (M:SS)
" + var in_log_HTML = "
#ANRUFDATE/TIMEIN-ZAHLANRUFERIDLÄNGE
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_de/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_de/vdc_db_query.php index 9417bb0f..bf69e203 100644 --- a/agc_2-X/trunk/LANG_www/agc_de/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_de/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INANRUF + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INANRUF + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "ANRUF NOT PLACED\n"; + echo " ANRUF NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context ist unzulässig\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "ANRUF_LOG Eingesetzt: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Eingesetzt: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INANRUF in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INANRUF + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INANRUF + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INANRUF + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If ANRUFBK, change vicidial_callback record to INACTIVE - if ($dispo == 'ANRUFBK') + if (eregi("CALLBK|CBHALT", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_de/vicidial.php b/agc_2-X/trunk/LANG_www/agc_de/vicidial.php index 8c05a573..0e804c86 100644 --- a/agc_2-X/trunk/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_de/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -847,13 +848,13 @@ else if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_hopper where status IN('QUEUE','INCALL','DONE') and user ='$VD_login';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_live_agents where user ='$VD_login';"; if ($DB) {echo "$stmt\n";} @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_Sekunden = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_Sekunden = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# ANRUFDATE/TIMEIN-ZAHLCALLERIDLÄNGE
" + var CB_HTML = "
#ANRUFBACK DATE/TIMEZAHLNAMESTATUSCAMPAIGNLAST ANRUFDATE/TIME COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'ANRUFBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS ANRUFBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Hängezustand-Kunde\""; - if (campaign_recording == 'ALLANRUFS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "ANRUF NOT PLACED") + if (MDnextCID == " ANRUF NOT PLACED") { alert("Anruf wurde nicht gesetzt, es gab eine Störung:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Hängezustand-Kunde\""; - if (campaign_recording == 'ALLANRUFS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Ankommend: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'ANRUFBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS ANRUFBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Netz-Form\"\n"; - if (campaign_recording == 'ALLANRUFS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# ANRUFBACK DATE/TIMEZAHLNAMESTATUSCAMPAIGNLAST ANRUFDATE/TIME COMMENTS
ANRUF DISPOSITION
"; + var dispo_HTML = "
ANRUF DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'ANRUFBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_el/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_el/astguiclient.php index 1a77376a..2e48a6cc 100644 --- a/agc_2-X/trunk/LANG_www/agc_el/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_el/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΑΡΙΘΜΟΣΜΗΚΟΣ (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΑΡΙΘΜΟΣΜΗΚΟΣ (M:SS)
" + var in_log_HTML = "
#ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΣΕ-ΑΡΙΘΜΟΚΛΗΣΗERIDΜΗΚΟΣ
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_el/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_el/vdc_db_query.php index 0274d9e2..33a08dc9 100644 --- a/agc_2-X/trunk/LANG_www/agc_el/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_el/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INΚΛΗΣΗ + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INΚΛΗΣΗ + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "ΚΛΗΣΗ NOT PLACED\n"; + echo " ΚΛΗΣΗ NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context δεν ισχύει\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "ΚΛΗΣΗ_LOG Εισαγωγή : $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Εισαγωγή : $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INΚΛΗΣΗ in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INΚΛΗΣΗ + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INΚΛΗΣΗ + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INΚΛΗΣΗ + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If ΚΛΗΣΗBK, change vicidial_callback record to INACTIVE - if ($dispo == 'ΚΛΗΣΗBK') + if (eregi("CALLBK|CBHΠΑΛΑΙΟ", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_el/vicidial.php b/agc_2-X/trunk/LANG_www/agc_el/vicidial.php index 126d3070..f9986fe0 100644 --- a/agc_2-X/trunk/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_el/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_δευτερόλεπτα = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_δευτερόλεπτα = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣΣΕ-ΑΡΙΘΜΟCALLERIDΜΗΚΟΣ
" + var CB_HTML = "
#ΚΛΗΣΗBACK DATE/TIMEΑΡΙΘΜΟΣNAMEΚΑΤΑΣΤΑΣΗCAMPAIGNLAST ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣ COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'ΚΛΗΣΗBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS ΚΛΗΣΗBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"΄Κλείσιμο"; - if (campaign_recording == 'ALLΚΛΗΣΗS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "ΚΛΗΣΗ NOT PLACED") + if (MDnextCID == " ΚΛΗΣΗ NOT PLACED") { alert("η κλήση δεν τοποθετήθηκε, υπήρξε ένα λάθος:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"΄Κλείσιμο"; - if (campaign_recording == 'ALLΚΛΗΣΗS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Εισερχόμενο: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'ΚΛΗΣΗBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS ΚΛΗΣΗBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Σελίδα\n"; - if (campaign_recording == 'ALLΚΛΗΣΗS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# ΚΛΗΣΗBACK DATE/TIMEΑΡΙΘΜΟΣNAMEΚΑΤΑΣΤΑΣΗCAMPAIGNLAST ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣ COMMENTS
ΚΛΗΣΗ DISPOSITION
"; + var dispo_HTML = "
ΚΛΗΣΗ DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'ΚΛΗΣΗBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_en/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_en/astguiclient.php index 7da5ee3e..6ce6b5d0 100644 --- a/agc_2-X/trunk/LANG_www/agc_en/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_en/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#CALL DATE/TIMENUMBERLENGTH (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# CALL DATE/TIMENUMBERLENGTH (M:SS)
" + var in_log_HTML = "
#CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_en/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_en/vdc_db_query.php index ef287987..40f6a5c5 100644 --- a/agc_2-X/trunk/LANG_www/agc_en/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_en/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CALL NOT PLACED\n"; + echo " CALL NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context is not valid\n"; exit; } @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If CALLBK, change vicidial_callback record to INACTIVE - if ($dispo == 'CALLBK') + if (eregi("CALLBK|CBHOLD", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_en/vicidial.php b/agc_2-X/trunk/LANG_www/agc_en/vicidial.php index cfaf680d..a6e01659 100644 --- a/agc_2-X/trunk/LANG_www/agc_en/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_en/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_seconds = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_seconds = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" + var CB_HTML = "
#CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CALL NOT PLACED") + if (MDnextCID == " CALL NOT PLACED") { alert("call was not placed, there was an error:\n" + MDOnextResponse); } @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
CALL DISPOSITION
"; + var dispo_HTML = "
CALL DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { diff --git a/agc_2-X/trunk/LANG_www/agc_es/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_es/astguiclient.php index a0e69cf9..4d86b89b 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_es/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#FECHA/HORA DE LA LLAMADANÚMEROLONGITUD (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,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ÚMEROLONGITUD (M:SS)
" + var in_log_HTML = "
#FECHA/HORA DE LA LLAMADANÚMERO-ENTRANTELLAMADORIDLONGITUD
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php index feeb72be..cdfefd97 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INLLAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INLLAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "LLAMADA NOT PLACED\n"; + echo " LLAMADA NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context No es válido\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "LLAMADA_LOG Insertado: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Insertado: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INLLAMADA in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INLLAMADA + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INLLAMADA + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INLLAMADA + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If LLAMADABK, change vicidial_callback record to INACTIVE - if ($dispo == 'LLAMADABK') + if (eregi("CALLBK|CBHVIEJO", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php index d70ec0f4..95ffa8a2 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -847,13 +848,13 @@ else if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_hopper where status IN('QUEUE','INCALL','DONE') and user ='$VD_login';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_live_agents where user ='$VD_login';"; if ($DB) {echo "$stmt\n";} @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_segundos = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_segundos = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# FECHA/HORA DE LA LLAMADANÚMERO-ENTRANTELLAMADORIDLONGITUD
" + var CB_HTML = "
#LLAMADABACK DATE/TIMENÚMERONAMEESTADOCAMPAIGNLAST FECHA/HORA DE LA LLAMADA COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'LLAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS LLAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Colgar"; - if (campaign_recording == 'ALLLLAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "LLAMADA NOT PLACED") + if (MDnextCID == " LLAMADA NOT PLACED") { alert("la llamada no fue atendida, hubo un error:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Colgar"; - if (campaign_recording == 'ALLLLAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'LLAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS LLAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Formulario\n"; - if (campaign_recording == 'ALLLLAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# LLAMADABACK DATE/TIMENÚMERONAMEESTADOCAMPAIGNLAST FECHA/HORA DE LA LLAMADA COMMENTS
LLAMADA DISPOSITION
"; + var dispo_HTML = "
LLAMADA DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'LLAMADABK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_fr/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_fr/astguiclient.php index 41513012..1d294dd3 100644 --- a/agc_2-X/trunk/LANG_www/agc_fr/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_fr/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#DATE/HEURE D'APPELNOMBRELONGUEUR (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,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/HEURE D'APPELNOMBRELONGUEUR (M:SS)
" + var in_log_HTML = "
#DATE/HEURE D'APPELIN-NOMBREAPPELERIDLONGUEUR
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_fr/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_fr/vdc_db_query.php index e2584b87..00a742e8 100644 --- a/agc_2-X/trunk/LANG_www/agc_fr/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_fr/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INAPPEL + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INAPPEL + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "APPEL NOT PLACED\n"; + echo " APPEL NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context est inadmissible\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "APPEL_LOG Inséré: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Inséré: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INAPPEL in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INAPPEL + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INAPPEL + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INAPPEL + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If APPELBK, change vicidial_callback record to INACTIVE - if ($dispo == 'APPELBK') + if (eregi("CALLBK|CBHVIEUX", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php b/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php index 1ea3b1e2..92f42160 100644 --- a/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -847,13 +848,13 @@ else if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_hopper where status IN('QUEUE','INCALL','DONE') and user ='$VD_login';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_live_agents where user ='$VD_login';"; if ($DB) {echo "$stmt\n";} @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_secondes = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_secondes = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# DATE/HEURE D'APPELIN-NOMBRECALLERIDLONGUEUR
" + var CB_HTML = "
#APPELBACK DATE/TIMENOMBRENAMESTATUTCAMPAIGNLAST DATE/HEURE D'APPEL COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'APPELBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS APPELBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Client"; - if (campaign_recording == 'ALLAPPELS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "APPEL NOT PLACED") + if (MDnextCID == " APPEL NOT PLACED") { alert("l'appel n'a pas été placé, il n'y avait pas une erreur:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Client"; - if (campaign_recording == 'ALLAPPELS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Entrant: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'APPELBK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS APPELBACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Forme\n"; - if (campaign_recording == 'ALLAPPELS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# APPELBACK DATE/TIMENOMBRENAMESTATUTCAMPAIGNLAST DATE/HEURE D'APPEL COMMENTS
APPEL DISPOSITION
"; + var dispo_HTML = "
APPEL DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'APPELBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_it/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_it/astguiclient.php index 6e628fb4..81aebfef 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_it/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#DATE/TIME DI CHIAMATANUMEROLUNGHEZZA (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,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 DI CHIAMATANUMEROLUNGHEZZA (M:SS)
" + var in_log_HTML = "
#DATE/TIME DI CHIAMATAIN-NUMEROCHIAMATAERIDLUNGHEZZA
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php index 504486ca..7f82ff0e 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INCHIAMATA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INCHIAMATA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CHIAMATA NOT PLACED\n"; + echo " CHIAMATA NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context non è valido\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "CHIAMATA_LOG Inserito: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Inserito: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INCHIAMATA in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INCHIAMATA + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INCHIAMATA + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INCHIAMATA + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If CHIAMATABK, change vicidial_callback record to INACTIVE - if ($dispo == 'CHIAMATABK') + if (eregi("CALLBK|CBHVECCHIO", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php index 1ea5f5c2..280deaa9 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_secondi = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_secondi = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# DATE/TIME DI CHIAMATAIN-NUMEROCALLERIDLUNGHEZZA
" + var CB_HTML = "
#CHIAMATABACK DATE/TIMENUMERONAMESTATUSCAMPAIGNLAST DATE/TIME DI CHIAMATA COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'CHIAMATABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHIAMATABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Disconnetti"; - if (campaign_recording == 'ALLCHIAMATAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CHIAMATA NOT PLACED") + if (MDnextCID == " CHIAMATA NOT PLACED") { alert("chiamata non effettuata, c`è un errore:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Disconnetti"; - if (campaign_recording == 'ALLCHIAMATAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " In entrata: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'CHIAMATABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHIAMATABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Interfacccia\n"; - if (campaign_recording == 'ALLCHIAMATAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CHIAMATABACK DATE/TIMENUMERONAMESTATUSCAMPAIGNLAST DATE/TIME DI CHIAMATA COMMENTS
CHIAMATA DISPOSITION
"; + var dispo_HTML = "
CHIAMATA DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'CHIAMATABK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/LANG_www/agc_pt/astguiclient.php b/agc_2-X/trunk/LANG_www/agc_pt/astguiclient.php index d222bbd0..97029a76 100644 --- a/agc_2-X/trunk/LANG_www/agc_pt/astguiclient.php +++ b/agc_2-X/trunk/LANG_www/agc_pt/astguiclient.php @@ -53,7 +53,8 @@ # 60104-1347 - Added basic layout for favorites editing frame # 60105-1124 - Finished Favorites frame and added DB submission # 60112-1622 - Several formatting changes -# 60421-1043 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1357 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60619-1103 - Added variable filters to close security holes for login form # require("dbconnect.php"); @@ -87,8 +88,16 @@ $user_abb = "$user$user$user$user"; while ( (strlen($user_abb) > 4) and ($forever_stop < 200) ) {$user_abb = eregi_replace("^.","",$user_abb); $forever_stop++;} -$version = '1.1.11'; -$build = '60421-1043'; +$version = '1.1.12'; +$build = '60619-1103'; + +### security strip all non-alphanumeric characters out of the variables ### + $DB=ereg_replace("[^0-9a-z]","",$DB); + $phone_login=ereg_replace("[^0-9a-zA-Z]","",$phone_login); + $phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass); + $user=ereg_replace("[^0-9a-zA-Z]","",$user); + $pass=ereg_replace("[^0-9a-zA-Z]","",$pass); + if ($force_logout) { @@ -363,8 +372,8 @@ else while ($favorites_count > $o) { $stmt="SELECT fullname,protocol from phones where extension = '$favorites[$o]' and server_ip='$server_ip';"; - $rsltx=mysql_query($stmt, $link); - $rowx=mysql_fetch_row($rsltx); + $rslt=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rslt); $favorites_names[$o] = $rowx[0]; $favorites_listX .= "$rowx[1]/$favorites[$o],"; $o++; @@ -1516,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#DATE/TIME DA CHAMADANÚMEROCOMPRIMENTO (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1544,7 +1553,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ÚMEROCOMPRIMENTO (M:SS)
" + var in_log_HTML = "
#DATE/TIME DA CHAMADAIN-NÚMEROCHAMADAERIDCOMPRIMENTO
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/LANG_www/agc_pt/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_pt/vdc_db_query.php index db511ca0..560d8537 100644 --- a/agc_2-X/trunk/LANG_www/agc_pt/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_pt/vdc_db_query.php @@ -372,7 +372,7 @@ if ($ACTION == 'manDiaLnextCaLL') $affected_rows=1; $CBleadIDset=1; - $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where callback_id='$callback_id';"; + $stmt = "UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); } @@ -493,7 +493,7 @@ if ($ACTION == 'manDiaLnextCaLL') $called_count++; - ### flag the lead as called and change it's status to INCHAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', called_since_last_reset='Y', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -603,7 +603,7 @@ if ($ACTION == 'manDiaLskip') else { $called_count = ($called_count - 1); - ### flag the lead as called and change it's status to INCHAMADA + ### flag the lead as called and change it's status to INCALL $stmt = "UPDATE vicidial_list set status='$stage', called_count='$called_count',user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CHAMADA NOT PLACED\n"; + echo " CHAMADA NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context é inválido\n"; exit; } @@ -758,7 +758,7 @@ if ($stage == "start") # if ($affected_rows > 0) # { - # echo "CHAMADA_LOG Introduzido: $uniqueid|$channel|$NOW_TIME"; + # echo "CALL_LOG Introduzido: $uniqueid|$channel|$NOW_TIME"; # } # else # { @@ -979,7 +979,7 @@ if ($ACTION == 'VDADcheckINCOMING') if (strlen($call_server_ip)<7) {$call_server_ip = $server_ip;} echo "1\n" . $lead_id . '|' . $uniqueid . '|' . $callerid . '|' . $channel . '|' . $call_server_ip . "|\n"; - ### update the agent status to INCHAMADA in vicidial_live_agents + ### update the agent status to INCALL in vicidial_live_agents $stmt = "UPDATE vicidial_live_agents set status='INCALL',last_call_time='$NOW_TIME' where user='$user' and server_ip='$server_ip';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1021,19 +1021,19 @@ if ($ACTION == 'VDADcheckINCOMING') $called_count = trim("$row[30]"); } - ### update the lead status to INCHAMADA + ### update the lead status to INCALL $stmt = "UPDATE vicidial_list set status='INCALL', user='$user' where lead_id='$lead_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); - ### update the log status to INCHAMADA + ### update the log status to INCALL $stmt = "UPDATE vicidial_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' and uniqueid='$uniqueid';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); if (eregi("CLOSER",$campaign)) { - ### update the vicidial_closer_log user to INCHAMADA + ### update the vicidial_closer_log user to INCALL $stmt = "UPDATE vicidial_closer_log set user='$user', comments='AUTO', list_id='$list_id', status='INCALL' where lead_id='$lead_id' order by closecallid desc limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); @@ -1181,9 +1181,9 @@ if ($ACTION == 'VDADcheckINCOMING') $rslt=mysql_query($stmt, $link); ### If CHAMADABK, change vicidial_callback record to INACTIVE - if ($dispo == 'CHAMADABK') + if (eregi("CALLBK|CBHVELHO", $dispo)) { - $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' order by callback_id desc LIMIT 1;"; + $stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php b/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php index 5f6c2a90..84bd2e68 100644 --- a/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -177,7 +178,7 @@ $random = (rand(1000000, 9999999) + 10000000); $conf_silent_prefix = '7'; # vicidial_conferences prefix to enter silently $HKuser_level = '5'; # minimum vicidial user_level for HotKeys -#$campaign_login_list = '1'; # show drop-down list of campaigns at login +$campaign_login_list = '1'; # show drop-down list of campaigns at login $manual_dial_preview = '1'; # allow preview lead option when manual dial $multi_line_comments = '1'; # set to 1 to allow multi-line comment box $user_login_first = '0'; # set to 1 to have the vicidial_user login before the phone login @@ -847,13 +848,13 @@ else if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_hopper where status IN('QUEUE','INCALL','DONE') and user ='$VD_login';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; $stmt="DELETE from vicidial_live_agents where user ='$VD_login';"; if ($DB) {echo "$stmt\n";} @@ -1319,23 +1320,23 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var AgainCalLSecondS = ''; var AgaiNCalLCID = ''; var CB_count_check = 60; - var agentcallsstatus = '' - var campagentstatctmax = '' - var campagentstatct = '0' + var agentcallsstatus = ''; + var campagentstatctmax = ''; + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_segundos = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_segundos = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; var use_internal_dnc = '' @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# DATE/TIME DA CHAMADAIN-NÚMEROCALLERIDCOMPRIMENTO
" + var CB_HTML = "
#CHAMADABACK DATE/TIMENÚMERONAMESTATUSCAMPAIGNLAST DATE/TIME DA CHAMADA COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2675,7 +2676,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} VDIC_web_form_address = VICIDiaL_web_form_address; - if (LeaDPreVDispO == 'CHAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -2697,7 +2698,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Cliente"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CHAMADA NOT PLACED") + if (MDnextCID == " CHAMADA NOT PLACED") { alert("a chamada não foi colocada, não havia um erro:\n" + MDOnextResponse); } @@ -2902,7 +2903,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("HangupControl").innerHTML = "\"Cliente"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (campaign_script.length > 0) ) @@ -3116,7 +3117,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} lead_dial_number = document.vicidial_form.phone_number.value; document.getElementById("MainStatuSSpan").innerHTML = " Entrante: " + document.vicidial_form.phone_number.value + " UID: " + CIDcheck + "   " + VDIC_fronter; - if (LeaDPreVDispO == 'CHAMADABK') + if (LeaDPreVDispO == 'CALLBK') { document.getElementById("CusTInfOSpaN").innerHTML = " PREVIOUS CHAMADABACK "; document.getElementById("CusTInfOSpaN").style.background = CusTCB_bgcolor; @@ -3212,7 +3213,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("WebFormSpan").innerHTML = "\"Formulário\n"; - if (campaign_recording == 'ALLCHAMADAS') + if (campaign_recording == 'ALLCALLS') {all_record = 'YES';} if ( (view_scripts == 1) && (CalL_ScripT_id.length > 0) ) @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CHAMADABACK DATE/TIMENÚMERONAMESTATUSCAMPAIGNLAST DATE/TIME DA CHAMADA COMMENTS
CHAMADA DISPOSITION
"; + var dispo_HTML = "
CHAMADA DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) { @@ -3776,7 +3777,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("CusTInfOSpaN").innerHTML = ""; document.getElementById("CusTInfOSpaN").style.background = panel_bgcolor; - if ( (DispoChoice == 'CHAMADABK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} + if ( (DispoChoice == 'CALLBK') && (scheduled_callbacks > 0) ) {showDiv('CallBackSelectBox');} else { var xmlhttp=false; diff --git a/agc_2-X/trunk/translations/br_language.txt b/agc_2-X/trunk/translations/br_language.txt index 0416ba70..d530c40d 100644 --- a/agc_2-X/trunk/translations/br_language.txt +++ b/agc_2-X/trunk/translations/br_language.txt @@ -141,7 +141,7 @@ OUTBOUND CALLS|CHAMADAS SAINTES| INBOUND CALLS|CHAMADAS ENTRANTES| Refresh rate|Atualizar a taxa| MANUAL DIAL|DISCAGEM MANUAL| -CALL DATE/TIME|DATA/HORA DA CHAMADA| +CALL DATE\/TIME|DATA/HORA DA CHAMADA| LOCAL HANGUP|DESLIGAR LOCAL| PARKED CALLS|CHAMADAS EM ESPERA| PARKED BY|EM ESPERA POR| @@ -335,7 +335,7 @@ NUMBER|NUMERO| LENGTH|COMPRIMENTO| CALLERID|CALLERID| CallerID|CallerID| -CALL|CHAMADA| + CALL| CHAMADA| PICKUP|CAPTURAR| CONFERENCE|CONFERENCIA| Refresh|Atualizar| diff --git a/agc_2-X/trunk/translations/de_language.txt b/agc_2-X/trunk/translations/de_language.txt index 3851f105..6652a0a3 100644 --- a/agc_2-X/trunk/translations/de_language.txt +++ b/agc_2-X/trunk/translations/de_language.txt @@ -142,7 +142,7 @@ OUTBOUND CALLS|OUTBOUND ANRUFE| INBOUND CALLS|INBOUND ANRUFE| Refresh rate|Erneuern Sie Rate| MANUAL DIAL|MANUELLER VORWAHLKNOPF| -CALL DATE/TIME|ANRUFDATE/TIME| +CALL DATE\/TIME|ANRUFDATE/TIME| LOCAL HANGUP|LOKALER HÄNGEZUSTAND| PARKED CALLS|GEPARKTE ANRUFE| PARKED BY|VORBEI GEPARKT| @@ -338,7 +338,7 @@ NUMBER|ZAHL| LENGTH|LÄNGE| CALLERID|CALLERID| CallerID|CallerID| -CALL|ANRUF| + CALL| ANRUF| PICKUP|AUFNAHME| CONFERENCE|KONFERENZ| Refresh|ErneuernSie| diff --git a/agc_2-X/trunk/translations/el_language.txt b/agc_2-X/trunk/translations/el_language.txt index 388200d4..ac3723af 100644 --- a/agc_2-X/trunk/translations/el_language.txt +++ b/agc_2-X/trunk/translations/el_language.txt @@ -142,7 +142,7 @@ OUTBOUND CALLS|ΕΞΕΡΧΟΜΕΝΕΣ ΚΛΗΣΕΙΣ| INBOUND CALLS|ΕΙΣΕΡΧΟΜΕΝΕΣ ΚΛΗΣΕΙΣ| Refresh rate|Ρυθμός ανανέωσης| MANUAL DIAL|ΧΕΙΡ.ΚΛΗΣΗ| -CALL DATE/TIME|ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣ| +CALL DATE\/TIME|ΗΜΕΡΟΜΗΝΙΑ/ΧΡΟΝΟΣ ΚΛΗΣΗΣ| LOCAL HANGUP|ΤΟΠΙΚΟ ΚΛΕΙΣΙΜΟ ΤΗΛΕΦΩΝΟΥ| PARKED CALLS|ΣΤΑΘΜ.ΚΛΗΣΕΙΣ| PARKED BY|ΣΤΑΘΜΕΥΜΕΝΕΣ ΑΠΟ| @@ -336,7 +336,7 @@ NUMBER|ΑΡΙΘΜΟΣ| LENGTH|ΜΗΚΟΣ| CALLERID|CALLERID| CallerID|CallerID| -CALL|ΚΛΗΣΗ| + CALL| ΚΛΗΣΗ| PICKUP|ΕΠΑΝΑΛΕΙΨΗ| CONFERENCE|ΣΥΝΔΙΑΣΚΕΨΗ| Refresh|Ανανέωση| diff --git a/agc_2-X/trunk/translations/es_language.txt b/agc_2-X/trunk/translations/es_language.txt index f9415b09..d0cf9e11 100644 --- a/agc_2-X/trunk/translations/es_language.txt +++ b/agc_2-X/trunk/translations/es_language.txt @@ -141,7 +141,7 @@ OUTBOUND CALLS|LLAMADAS SALIENTES| INBOUND CALLS|LLAMADAS ENTRANTES| Refresh rate|Actualizar la tarifa| MANUAL DIAL|MARCADO MANUAL| -CALL DATE/TIME|FECHA/HORA DE LA LLAMADA| +CALL DATE\/TIME|FECHA/HORA DE LA LLAMADA| LOCAL HANGUP|Colgar Local| PARKED CALLS|LLAMADAS APARCADAS| PARKED BY|APARCAR POR| @@ -338,7 +338,7 @@ NUMBER|NÚMERO| LENGTH|LONGITUD| CALLERID|LLAMADORID| CallerID|LlamadorID| -CALL|LLAMADA| + CALL| LLAMADA| PICKUP|CAPTURAR| CONFERENCE|CONFERENCIA| Refresh|Recarga| diff --git a/agc_2-X/trunk/translations/fr_language.txt b/agc_2-X/trunk/translations/fr_language.txt index b8f807d8..17a2c53e 100644 --- a/agc_2-X/trunk/translations/fr_language.txt +++ b/agc_2-X/trunk/translations/fr_language.txt @@ -141,7 +141,7 @@ OUTBOUND CALLS|APPELS EN PARTANCE| INBOUND CALLS|APPELS D'ARRIVÉE| Refresh rate|La vitesse de régénération| MANUAL DIAL|CADRAN MANUEL| -CALL DATE/TIME|DATE/HEURE D'APPEL| +CALL DATE\/TIME|DATE/HEURE D'APPEL| LOCAL HANGUP|DÉCROCHEMENT LOCAL| PARKED CALLS|APPELS GARÉS| PARKED BY|GARÉ PRÈS| @@ -338,7 +338,7 @@ NUMBER|NOMBRE| LENGTH|LONGUEUR| CALLERID|CALLERID| CallerID|CallerID| -CALL|APPEL| + CALL| APPEL| PICKUP|COLLECTE| CONFERENCE|CONFÉRENCE| Refresh|Régénérez| diff --git a/agc_2-X/trunk/translations/it_language.txt b/agc_2-X/trunk/translations/it_language.txt index e6456017..ae666a3c 100644 --- a/agc_2-X/trunk/translations/it_language.txt +++ b/agc_2-X/trunk/translations/it_language.txt @@ -141,7 +141,7 @@ OUTBOUND CALLS|CHIAMATE OUTBOUND| INBOUND CALLS|CHIAMATE INBOUND| Refresh rate|Aggiorna i tempi| MANUAL DIAL|Chiamata Manuale| -CALL DATE/TIME|DATE/TIME DI CHIAMATA| +CALL DATE\/TIME|DATE/TIME DI CHIAMATA| LOCAL HANGUP|DISCONNETTI LOCALI| PARKED CALLS|CHIAMATE PARCHEGGIATE| PARKED BY|PARCHEGGIATO DA| @@ -338,7 +338,7 @@ NUMBER|NUMERO| LENGTH|LUNGHEZZA| CALLERID|CALLERID| CallerID|CallerID| -CALL|CHIAMATA| + CALL| CHIAMATA| PICKUP|RIPRENDI| CONFERENCE|CONFERENZA| Refresh|Aggiorna| diff --git a/agc_2-X/trunk/translations/pt_language.txt b/agc_2-X/trunk/translations/pt_language.txt index e338c0af..552d8a63 100644 --- a/agc_2-X/trunk/translations/pt_language.txt +++ b/agc_2-X/trunk/translations/pt_language.txt @@ -141,7 +141,7 @@ OUTBOUND CALLS|CHAMADAS OUTBOUND | INBOUND CALLS|CHAMADAS INBOUND| Refresh rate|Refresque a taxa| MANUAL DIAL|SELETOR MANUAL| -CALL DATE/TIME|DATE/TIME DA CHAMADA| +CALL DATE\/TIME|DATE/TIME DA CHAMADA| LOCAL HANGUP|HANGUP LOCAL| PARKED CALLS|CHAMADAS ESTACIONADAS| PARKED BY|ESTACIONADO PERTO| @@ -338,7 +338,7 @@ NUMBER|NÚMERO| LENGTH|COMPRIMENTO| CALLERID|CALLERID| CallerID|CallerID| -CALL|CHAMADA| + CALL| CHAMADA| PICKUP|COLETOR| CONFERENCE|CONFERÊNCIA| Refresh|Refresque| diff --git a/agc_2-X/trunk/www/agc/astguiclient.php b/agc_2-X/trunk/www/agc/astguiclient.php index 614ce146..e6abfad0 100644 --- a/agc_2-X/trunk/www/agc/astguiclient.php +++ b/agc_2-X/trunk/www/agc/astguiclient.php @@ -1525,7 +1525,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (out_calls > 0) { - var out_log_HTML = "" + var out_log_HTML = "
#CALL DATE/TIMENUMBERLENGTH (M:SS)
" while (loop_ct < out_calls) { loop_ct++; @@ -1553,7 +1553,7 @@ if ($enable_fast_refresh < 1) {echo "var refresh_interval = 1000;\n";} var conv_start=0; if (in_calls > 0) { - var in_log_HTML = "
# CALL DATE/TIMENUMBERLENGTH (M:SS)
" + var in_log_HTML = "
#CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" while (loop_ct < in_calls) { loop_ct++; diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index 948119ef..a4e8baf9 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -626,7 +626,7 @@ if ($ACTION == 'manDiaLonly') if ( (strlen($conf_exten)<1) || (strlen($campaign)<1) || (strlen($ext_context)<1) || (strlen($phone_number)<1) || (strlen($lead_id)<1) ) { $channel_live=0; - echo "CALL NOT PLACED\n"; + echo " CALL NOT PLACED\n"; echo "Conf Exten $conf_exten or campaign $campaign or ext_context $ext_context is not valid\n"; exit; } diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 9d3763bb..33bebdcd 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -111,6 +111,7 @@ # 60608-1453 - Added CLOSER campaign allowable in-groups limitations # 60609-1123 - Added add-number-to-DNC-list function and manual dial check DNC # 60619-1047 - Added variable filters to close security holes for login form +# 60804-1710 - fixed scheduled CALLBK for other languages build # require("dbconnect.php"); @@ -156,8 +157,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '1.1.85'; -$build = '60619-1047'; +$version = '1.1.86'; +$build = '60804-1710'; if ($force_logout) { @@ -1321,24 +1322,24 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_count_check = 60; var agentcallsstatus = '' var campagentstatctmax = '' - var campagentstatct = '0' + var campagentstatct = '0'; var manual_dial_in_progress = 0; var auto_dial_alt_dial = 0; var reselect_preview_dial = 0; var reselect_alt_dial = 0; var alt_dial_active = 0; var mdnLisT_id = '999'; - var VU_vicidial_transfers = '' - var agentonly_callbacks = '' - var agentcall_manual = '' - var manual_dial_preview = '' - var starting_alt_phone_dialing = '' - var alt_phone_dialing = '' - var wrapup_seconds = '' - var wrapup_message = '' + var VU_vicidial_transfers = ''; + var agentonly_callbacks = ''; + var agentcall_manual = ''; + var manual_dial_preview = ''; + var starting_alt_phone_dialing = ''; + var alt_phone_dialing = ''; + var wrapup_seconds = ''; + var wrapup_message = ''; var wrapup_counter = 0; var wrapup_waiting = 0; - var use_internal_dnc = '' + var use_internal_dnc = ''; var DiaLControl_auto_HTML = "\"Pause\"\"Resume\""; var DiaLControl_auto_HTML_ready = "\"Pause\"\"Resume\""; var DiaLControl_auto_HTML_OFF = "\"Pause\"\"Resume\""; @@ -2258,7 +2259,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var CB_calls = all_CBs_array[0]; var loop_ct=0; var conv_start=0; - var CB_HTML = "
# CALL DATE/TIMEIN-NUMBERCALLERIDLENGTH
" + var CB_HTML = "
#CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
" while (loop_ct < CB_calls) { loop_ct++; @@ -2889,7 +2890,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var MDOnextResponse_array=MDOnextResponse.split("\n"); MDnextCID = MDOnextResponse_array[0]; - if (MDnextCID == "CALL NOT PLACED") + if (MDnextCID == " CALL NOT PLACED") { alert("call was not placed, there was an error:\n" + MDOnextResponse); } @@ -3715,7 +3716,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { AgentDispoing = 1; var VD_statuses_ct_half = parseInt(VD_statuses_ct / 2); - var dispo_HTML = "
# CALLBACK DATE/TIMENUMBERNAMESTATUSCAMPAIGNLAST CALL DATE/TIME COMMENTS
CALL DISPOSITION
"; + var dispo_HTML = "
CALL DISPOSITION
"; var loop_ct = 0; while (loop_ct < VD_statuses_ct) {